master
xhj 11 months ago
parent 403461a6d0
commit 75cff9277e

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: cn.hutool:hutool-all:5.8.15">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../Program Files/apache-maven-3.8.7/repository/cn/hutool/hutool-all/5.8.15/hutool-all-5.8.15.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/../../Program Files/apache-maven-3.8.7/repository/cn/hutool/hutool-all/5.8.15/hutool-all-5.8.15-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../Program Files/apache-maven-3.8.7/repository/cn/hutool/hutool-all/5.8.15/hutool-all-5.8.15-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: com.google.guava:guava:20.0">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../Program Files/apache-maven-3.8.7/repository/com/google/guava/guava/20.0/guava-20.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/../../Program Files/apache-maven-3.8.7/repository/com/google/guava/guava/20.0/guava-20.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../Program Files/apache-maven-3.8.7/repository/com/google/guava/guava/20.0/guava-20.0-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.modelmapper:modelmapper:2.3.5">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../Program Files/apache-maven-3.8.7/repository/org/modelmapper/modelmapper/2.3.5/modelmapper-2.3.5.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$PROJECT_DIR$/../../Program Files/apache-maven-3.8.7/repository/org/modelmapper/modelmapper/2.3.5/modelmapper-2.3.5-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../Program Files/apache-maven-3.8.7/repository/org/modelmapper/modelmapper/2.3.5/modelmapper-2.3.5-sources.jar!/" />
</SOURCES>
</library>
</component>

@ -4,7 +4,41 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="a2c22d75-c3b6-48b6-93b4-6a3444d9a247" name="Default Changelist" comment="修正" /> <list default="true" id="a2c22d75-c3b6-48b6-93b4-6a3444d9a247" name="Default Changelist" comment="修正批量表导入时原表分段为空 图纸计划判断重复">
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/fd/DmCzjbb.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/fd/TpbController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/fd/DmCzjbbMapper.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/fd/DmCzjbbMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/fd/DmXqdwcjcdMapper.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/fd/DmCzjbbService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/fd/impl/DmCzfddybServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/fd/impl/DmCzjbbServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/fd/impl/DmXqdwcjcdServiceImpl.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/fd/impl/TpImpl.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__cn_hutool_hutool_all_5_8_15.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_google_guava_guava_20_0.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_modelmapper_modelmapper_2_3_5.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.mvn/wrapper/maven-wrapper.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.mvn/wrapper/maven-wrapper.properties" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/gj_erp.iml" beforeDir="false" afterPath="$PROJECT_DIR$/gj_erp.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/fd/DmCzfddyb.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/fd/DmCzfddyb.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/fd/DmXqdwcjcd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/fd/DmXqdwcjcd.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/fd/ExcelExport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/fd/ExcelExport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/fd/FdBean.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/fd/FdBean.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/fd/TppsQk.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/bean/fd/TppsQk.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/fd/DmCzfddybController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/fd/DmCzfddybController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jcsj/BomUploadController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/controller/jcsj/DmBomController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/listeners/ExcelFdListener.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/listeners/ExcelFdListener.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/fd/DmCzfddybMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/fd/DmCzfddybMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/fd/DmXqdwcjcdMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/fd/DmXqdwcjcdMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/fd/TpbMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/mapper/fd/TpbMapper.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/fd/DmCzfddybService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/fd/DmCzfddybService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/fd/DmXqdwcjcdService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/fd/DmXqdwcjcdService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/fd/TpImpl.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java" afterDir="false" />
</list>
<list id="1843e6b0-3c18-45b6-89c7-e9efbe3d4674" name="Revert &quot;finish&quot;" comment="Revert &quot;finish&quot;" /> <list id="1843e6b0-3c18-45b6-89c7-e9efbe3d4674" name="Revert &quot;finish&quot;" comment="Revert &quot;finish&quot;" />
<list id="4d943a56-b745-4db0-8fd5-bbd1f49b8f76" name="Revert &quot;finish&quot;-2" comment="Revert &quot;finish&quot;&#10;&#10;This reverts commit e413da9b" /> <list id="4d943a56-b745-4db0-8fd5-bbd1f49b8f76" name="Revert &quot;finish&quot;-2" comment="Revert &quot;finish&quot;&#10;&#10;This reverts commit e413da9b" />
<list id="fe06e205-ba59-4998-bbc5-8fab0fa434d9" name="Revert &quot;TEST&quot;" comment="Revert &quot;TEST&quot;1" /> <list id="fe06e205-ba59-4998-bbc5-8fab0fa434d9" name="Revert &quot;TEST&quot;" comment="Revert &quot;TEST&quot;1" />
@ -46,35 +80,35 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent">{ <component name="PropertiesComponent"><![CDATA[{
&quot;keyToString&quot;: { "keyToString": {
&quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;, "RequestMappingsPanelOrder0": "0",
&quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;, "RequestMappingsPanelOrder1": "1",
&quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;, "RequestMappingsPanelWidth0": "75",
&quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;, "RequestMappingsPanelWidth1": "75",
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;, "RunOnceActivity.ShowReadmeOnStart": "true",
&quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;, "WebServerToolWindowFactoryState": "false",
&quot;last_opened_file_path&quot;: &quot;D:/rpkj/app/xzerp&quot;, "last_opened_file_path": "D:/rpkj/gj_erp/src/main/java/com/dsic/gj_erp/mapper",
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;, "node.js.detected.package.eslint": "true",
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;, "node.js.detected.package.tslint": "true",
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;, "node.js.selected.package.eslint": "(autodetect)",
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;, "node.js.selected.package.tslint": "(autodetect)",
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;, "nodejs_package_manager_path": "npm",
&quot;settings.editor.selected.configurable&quot;: &quot;reference.settingsdialog.IDE.editor.colors&quot;, "settings.editor.selected.configurable": "reference.settingsdialog.IDE.editor.colors",
&quot;spring.configuration.checksum&quot;: &quot;e66d70b2c05a7b57c5785db699821511&quot;, "spring.configuration.checksum": "e66d70b2c05a7b57c5785db699821511",
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot; "vue.rearranger.settings.migration": "true"
} }
}</component> }]]></component>
<component name="ReactorSettings"> <component name="ReactorSettings">
<option name="notificationShown" value="true" /> <option name="notificationShown" value="true" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="E:\runpeng\gj_erp_new\src\main\resources\mappers\sy" /> <recent name="D:\rpkj\gj_erp\src\main\java\com\dsic\gj_erp\mapper" />
<recent name="E:\runpeng\gj_erp_new\src\main\java\com\dsic\gj_erp\service\jhgk\impl" /> <recent name="D:\rpkj\gj_erp\src\main\java\com\dsic\gj_erp\service" />
<recent name="E:\runpeng\gj_erp_new\src\main\java\com\dsic\gj_erp\service\jhgk" /> <recent name="D:\rpkj\gj_erp\src\main\java\com\dsic\gj_erp\dao" />
<recent name="E:\runpeng\gj_erp_new\src\main\resources\mappers\jhgk" /> <recent name="D:\rpkj\gj_erp\src\main\java\com\dsic\gj_erp\controller" />
<recent name="E:\runpeng\gj_erp_new\src\main\java\com\dsic\gj_erp\mapper\jhgk" /> <recent name="D:\rpkj\gj_erp\src\main\java\com\dsic\gj_erp\bean" />
</key> </key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="D:\rpkj\gj_erp\src\main\resources\mappers\pgd" /> <recent name="D:\rpkj\gj_erp\src\main\resources\mappers\pgd" />
@ -83,11 +117,11 @@
<recent name="com.dsic.gj_erp.bean.jhgk" /> <recent name="com.dsic.gj_erp.bean.jhgk" />
</key> </key>
<key name="CopyClassDialog.RECENTS_KEY"> <key name="CopyClassDialog.RECENTS_KEY">
<recent name="com.dsic.gj_erp.listeners" />
<recent name="com.dsic.gj_erp.service.jhgk" /> <recent name="com.dsic.gj_erp.service.jhgk" />
<recent name="com.dsic.gj_erp.service.jhgk.impl" /> <recent name="com.dsic.gj_erp.service.jhgk.impl" />
<recent name="com.dsic.gj_erp.mapper.jhgk" /> <recent name="com.dsic.gj_erp.mapper.jhgk" />
<recent name="com.dsic.gj_erp.controller.jhgk" /> <recent name="com.dsic.gj_erp.controller.jhgk" />
<recent name="com.dsic.gj_erp.bean.jhgk" />
</key> </key>
</component> </component>
<component name="RunManager" selected="Spring Boot.GjErpApplication"> <component name="RunManager" selected="Spring Boot.GjErpApplication">
@ -157,7 +191,7 @@
</method> </method>
</configuration> </configuration>
<configuration name="GjErpApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot"> <configuration name="GjErpApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<option name="ACTIVE_PROFILES" value="dev" /> <option name="ACTIVE_PROFILES" />
<module name="gj_erp" /> <module name="gj_erp" />
<option name="SPRING_BOOT_MAIN_CLASS" value="com.dsic.gj_erp.GjErpApplication" /> <option name="SPRING_BOOT_MAIN_CLASS" value="com.dsic.gj_erp.GjErpApplication" />
<method v="2"> <method v="2">
@ -174,8 +208,8 @@
</list> </list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="应用程序.CodeGenerator" />
<item itemvalue="应用程序.Test" /> <item itemvalue="应用程序.Test" />
<item itemvalue="应用程序.CodeGenerator" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
@ -248,6 +282,21 @@
<workItem from="1702519220001" duration="21252000" /> <workItem from="1702519220001" duration="21252000" />
<workItem from="1702862516311" duration="643000" /> <workItem from="1702862516311" duration="643000" />
<workItem from="1702863187731" duration="1169000" /> <workItem from="1702863187731" duration="1169000" />
<workItem from="1702864499851" duration="8050000" />
<workItem from="1703380445000" duration="143000" />
<workItem from="1703384251964" duration="7000" />
<workItem from="1703726681507" duration="2565000" />
<workItem from="1705402844627" duration="9500000" />
<workItem from="1705988207468" duration="30000" />
<workItem from="1705990564816" duration="1967000" />
<workItem from="1706003508159" duration="16691000" />
<workItem from="1706508922628" duration="599000" />
<workItem from="1706575143988" duration="3511000" />
<workItem from="1709086080735" duration="1241000" />
<workItem from="1709170750002" duration="3374000" />
<workItem from="1710147332954" duration="1226000" />
<workItem from="1714271581876" duration="1256000" />
<workItem from="1719045769593" duration="1112000" />
</task> </task>
<task id="LOCAL-00001" summary="finish"> <task id="LOCAL-00001" summary="finish">
<created>1695345779307</created> <created>1695345779307</created>
@ -382,12 +431,65 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1701677326544</updated> <updated>1701677326544</updated>
</task> </task>
<option name="localTasksCounter" value="20" /> <task id="LOCAL-00020" summary="修正">
<created>1702864544748</created>
<option name="number" value="00020" />
<option name="presentableId" value="LOCAL-00020" />
<option name="project" value="LOCAL" />
<updated>1702864544748</updated>
</task>
<task id="LOCAL-00021" summary="修正">
<created>1702864594372</created>
<option name="number" value="00021" />
<option name="presentableId" value="LOCAL-00021" />
<option name="project" value="LOCAL" />
<updated>1702864594372</updated>
</task>
<task id="LOCAL-00022" summary="修正">
<created>1703830233868</created>
<option name="number" value="00022" />
<option name="presentableId" value="LOCAL-00022" />
<option name="project" value="LOCAL" />
<updated>1703830233868</updated>
</task>
<task id="LOCAL-00023" summary="修正">
<created>1705988229646</created>
<option name="number" value="00023" />
<option name="presentableId" value="LOCAL-00023" />
<option name="project" value="LOCAL" />
<updated>1705988229646</updated>
</task>
<task id="LOCAL-00024" summary="修正">
<created>1705991921674</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1705991921674</updated>
</task>
<task id="LOCAL-00025" summary="修正批量表导入时原表分段为空 图纸计划判断重复">
<created>1706086143777</created>
<option name="number" value="00025" />
<option name="presentableId" value="LOCAL-00025" />
<option name="project" value="LOCAL" />
<updated>1706086143777</updated>
</task>
<option name="localTasksCounter" value="26" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
<option name="version" value="3" /> <option name="version" value="3" />
</component> </component>
<component name="Vcs.Log.History.Properties">
<option name="COLUMN_ID_ORDER">
<list>
<option value="Default.Root" />
<option value="Default.Author" />
<option value="Default.Date" />
<option value="Default.Subject" />
<option value="Space.CommitStatus" />
</list>
</option>
</component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES"> <option name="TAB_STATES">
<map> <map>
@ -396,6 +498,36 @@
<State /> <State />
</value> </value>
</entry> </entry>
<entry key="e3cea6c1-25e6-41da-947e-0ff9281ebcb1">
<value>
<State>
<option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
<option name="FILTERS">
<map>
<entry key="branch">
<value>
<list>
<option value="HEAD" />
</list>
</value>
</entry>
<entry key="roots">
<value>
<list>
<option value="$PROJECT_DIR$" />
</list>
</value>
</entry>
</map>
</option>
</State>
</value>
</entry>
</map>
</option>
<option name="OPEN_GENERIC_TABS">
<map>
<entry key="e3cea6c1-25e6-41da-947e-0ff9281ebcb1" value="TOOL_WINDOW" />
</map> </map>
</option> </option>
</component> </component>
@ -413,53 +545,10 @@
<MESSAGE value="派工单创建" /> <MESSAGE value="派工单创建" />
<MESSAGE value="bom copy" /> <MESSAGE value="bom copy" />
<MESSAGE value="修正" /> <MESSAGE value="修正" />
<option name="LAST_COMMIT_MESSAGE" value="修正" /> <MESSAGE value="修正批量表导入时原表分段为空 图纸计划判断重复" />
<option name="LAST_COMMIT_MESSAGE" value="修正批量表导入时原表分段为空 图纸计划判断重复" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCbxxpServiceImpl.java</url>
<line>57</line>
<option name="timeStamp" value="1" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java</url>
<line>168</line>
<option name="timeStamp" value="2" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java</url>
<line>106</line>
<option name="timeStamp" value="3" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-method">
<url>file://$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java</url>
<line>116</line>
<properties class="com.dsic.gj_erp.service.pgd.impl.PgdQmjhServiceImpl">
<option name="EMULATED" value="true" />
<option name="WATCH_EXIT" value="false" />
</properties>
<option name="timeStamp" value="4" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-method">
<url>file://$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdQmjhServiceImpl.java</url>
<line>43</line>
<properties class="com.dsic.gj_erp.service.pgd.impl.PgdQmjhServiceImpl" method="saveQmPgdXd">
<option name="WATCH_EXIT" value="false" />
</properties>
<option name="timeStamp" value="6" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-method">
<url>file://$PROJECT_DIR$/src/main/java/com/dsic/gj_erp/service/pgd/PgdQmjhService.java</url>
<line>22</line>
<properties class="com.dsic.gj_erp.service.pgd.PgdQmjhService" method="saveQmPgdXd">
<option name="WATCH_EXIT" value="false" />
</properties>
<option name="timeStamp" value="7" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
<watches-manager> <watches-manager>
<configuration name="SpringBootApplicationConfigurationType"> <configuration name="SpringBootApplicationConfigurationType">
<watch expression="((HashMap)param_1).entrySet().toArray()[2]" custom="java.util.HashMap" /> <watch expression="((HashMap)param_1).entrySet().toArray()[2]" custom="java.util.HashMap" />

Binary file not shown.

@ -1,2 +0,0 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

@ -32,13 +32,27 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: cn.afterturn:easypoi-base:3.2.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
<orderEntry type="library" name="Maven: cn.afterturn:easypoi-web:3.2.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: cn.afterturn:easypoi-annotation:3.2.0" level="project" />
<orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.53" level="project" />
<orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.6.0" level="project" /> <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.6.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.2" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.2" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.microsoft.sqlserver:mssql-jdbc:7.4.1.jre8" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Maven: com.microsoft.sqlserver:mssql-jdbc:7.4.1.jre8" level="project" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.21" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" /> <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.6" level="project" />
<orderEntry type="library" name="Maven: jakarta.transaction:jakarta.transaction-api:1.3.3" level="project" /> <orderEntry type="library" name="Maven: jakarta.transaction:jakarta.transaction-api:1.3.3" level="project" />
<orderEntry type="library" name="Maven: jakarta.persistence:jakarta.persistence-api:2.2.3" level="project" /> <orderEntry type="library" name="Maven: jakarta.persistence:jakarta.persistence-api:2.2.3" level="project" />
@ -57,9 +71,7 @@
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-orm:5.2.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-orm:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.2.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-aspects:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.4.RELEASE" level="project" />
@ -82,17 +94,15 @@
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.38" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.38" level="project" />
<orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.38" level="project" /> <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.38" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.9.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.10.RELEASE" level="project" /> <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.10.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" /> <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.20" level="project" /> <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.20" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.3.4.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.3.4.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" /> <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
@ -104,7 +114,6 @@
<orderEntry type="library" name="Maven: com.mysema.commons:mysema-commons-lang:0.2.4" level="project" /> <orderEntry type="library" name="Maven: com.mysema.commons:mysema-commons-lang:0.2.4" level="project" />
<orderEntry type="library" name="Maven: com.infradna.tool:bridge-method-annotation:1.13" level="project" /> <orderEntry type="library" name="Maven: com.infradna.tool:bridge-method-annotation:1.13" level="project" />
<orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" /> <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.querydsl:querydsl-apt:4.3.1" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: com.querydsl:querydsl-apt:4.3.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.querydsl:querydsl-codegen:4.3.1" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: com.querydsl:querydsl-codegen:4.3.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.mysema.codegen:codegen:0.6.8" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: com.mysema.codegen:codegen:0.6.8" level="project" />
@ -119,7 +128,6 @@
<orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" /> <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" /> <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
<orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" /> <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
@ -159,7 +167,7 @@
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:4.1.52.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:4.1.52.Final" level="project" />
<orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.52.Final" level="project" /> <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.52.Final" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2" level="project" /> <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.2" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.15" level="project" /> <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.25" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.4.RELEASE" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.3.4.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.4.RELEASE" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.3.4.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.4.RELEASE" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.3.4.RELEASE" level="project" />
@ -184,8 +192,6 @@
<orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.3.3" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-junit-jupiter:3.3.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.9.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.2.9.RELEASE" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.springframework:spring-test:5.2.9.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.xmlunit:xmlunit-core:2.7.0" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13" level="project" />
@ -198,6 +204,7 @@
<orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" /> <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.0.0" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:4.0.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.0.1" level="project" /> <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:3.0.1" level="project" />
<orderEntry type="library" name="Maven: org.modelmapper:modelmapper:2.3.5" level="project" /> <orderEntry type="library" name="Maven: org.modelmapper:modelmapper:3.1.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:21.0" level="project" />
</component> </component>
</module> </module>

@ -2,44 +2,79 @@ package com.dsic.gj_erp.bean.fd;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Getter; import io.swagger.annotations.ApiModel;
import lombok.Setter; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Getter import java.io.Serializable;
@Setter
public class DmCzfddyb {
private String czbh;//船只编号
private String fdh;//分段号 /**
* <p>
*
* </p>
*
* @author xhj
* @since 2023-05-08
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="DmCzfddyb对象", description="")
public class DmCzfddyb implements Serializable {
private String qy;//所属区域 private static final long serialVersionUID=1L;
private Integer frow;//行 @ApiModelProperty(value = "船只编号")
private String czbh;
private Integer fcol;//列 @ApiModelProperty(value = "分段号")
private String fdh;
private String zydw;//作业单位 @ApiModelProperty(value = "所属区域")
private String qy;
private String zycj;//作业车间 @ApiModelProperty(value = "行")
private Integer frow;
private String stjhrq;//上胎计划期 @ApiModelProperty(value = "列")
private Integer fcol;
private String zzjhrq;//总组计划期 @ApiModelProperty(value = "作业单位")
private String zydw;
private String dzjhrq;//大组计划期 @ApiModelProperty(value = "作业车间")
private String zycj;
private String xzjhrq;//小组计划期 @ApiModelProperty(value = "上胎计划期")
private String stjhrq;
private String kgrq;//开工日期 @ApiModelProperty(value = "总组计划期")
private String zzjhrq;
private String wgrq;//完工日期 @ApiModelProperty(value = "大组计划期")
private String dzjhrq;
private Integer tpzs;//托盘总数 @ApiModelProperty(value = "小组计划期")
private String xzjhrq;
private String zt;//"状态" @ApiModelProperty(value = "开工日期")
private String kgrq;
private String bz;//备注 @ApiModelProperty(value = "完工日期")
private String wgrq;
@ApiModelProperty(value = "托盘总数")
private Integer tpzs;
@ApiModelProperty(value = "状态")
private String zt;
@ApiModelProperty(value = "备注")
private String bz;
@TableId(value = "id", type = IdType.ASSIGN_UUID) @TableId(value = "id", type = IdType.ASSIGN_UUID)
private String id; private String id;
} }

@ -0,0 +1,254 @@
package com.dsic.gj_erp.bean.fd;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
* <p>
*
* </p>
*
* @author xhj
* @since 2023-05-08
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="DmCzjbb对象", description="船只基本表")
public class DmCzjbb implements Serializable {
private static final long serialVersionUID=1L;
private String fjqzcjs;
private String cjs;
private String clbs10;
private String yqbs02;
private String zfzy;
private String yzbs;
private String xsrq;
private String gxcjbs;
private String yqbs06;
private String ph;
private String cwfzrq;
private String yqbs04;
private String clbs11;
private String clbs09;
private String dyjdy;
private String yqbs03;
private String txzl1;
private String ph6;
private String lrry;
private String gjfkyz;
private String ph3;
private String yqbs05;
private String czmc;
private String yqbs;
private String czjc;
private String clbs12;
private String txgy3;
private String txcz;
private String gcqy1;
private String hcbs01;
private String yqbs09;
private String pjfs;
private String hcbs03;
private String jswgbs;
private String txzl2;
private String yqxebs;
private String lrrq;
private Integer gjxtws;
private String gcqy;
private String ph4;
private String azqy3;
private String yqbs12;
private String txjdy;
private String yqbs08;
private String yqdetqryTx;
private String yqbs10;
private String hcbs02;
private String txgy2;
private String sctrq;
private String xmbh;
private String shrq;
private Integer sl;
private String gjfjpkfs;
private String wgbs;
private String hcbs04;
private String ph1;
private String sctrqbz;
private String yqbs07;
private String yqbs11;
private String gxhqby;
private String hcbs10;
private String clbs03;
private String azqy2;
private String qcbs;
private String ph7;
private String clbs01;
private String gjfjthxz;
private String hcbs05;
private String jssxrq;
@TableId(value = "czbh", type = IdType.ASSIGN_UUID)
private String czbh;
private String qcbs1;
private String hcbs07;
private String hcbs09;
private String gxfjbz;
private String txgy1;
private String clbs02;
private String cdmc;
private String cwzt;
private String cimsBs;
private String kgrq;
private String cwfzsm;
private String gxhbbs;
private String sfqy;
private String hcbs06;
private String hcbs08;
private Double gcxs;
private String yqdetqrqTx;
private String cjmc;
private String azqy1;
private Double gzjxs;
private String qzjgrq;
private String zztczbh;
private String ycbs;
private String ph2;
private String clbs05;
private String kgrqbz;
private String hcbs11;
private String xscz;
private String gjgxbz;
private String clbs07;
private String bz;
private String yqbs01;
private String qcbs2;
private String xl;
private String txzl3;
private String jssxsm;
private String ph8;
private String ph5;
private String clbs06;
private String hcbs12;
private String clbs04;
private String gjjdy;
private String clbs08;
}

@ -2,15 +2,27 @@ package com.dsic.gj_erp.bean.fd;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Getter; import io.swagger.annotations.ApiModel;
import lombok.Setter; import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable; import java.io.Serializable;
@Getter /**
@Setter * <p>
*
* </p>
*
* @author xhj
* @since 2023-06-16
*/
@Data
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="DmXqdwcjcd对象", description="")
public class DmXqdwcjcd implements Serializable { public class DmXqdwcjcd implements Serializable {
private static final long serialVersionUID=1L; private static final long serialVersionUID=1L;
private String cdmc; private String cdmc;
private String dwbm; private String dwbm;
@ -28,4 +40,5 @@ public class DmXqdwcjcd implements Serializable {
private String fzry; private String fzry;
} }

@ -1,12 +1,17 @@
package com.dsic.gj_erp.bean.fd; package com.dsic.gj_erp.bean.fd;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Getter; import lombok.Data;
import lombok.Setter;
@Getter /**
@Setter * ExcelExport:
*
* @author xhj
* @date 2023/05/08
*/
@Data
public class ExcelExport { public class ExcelExport {
@ExcelProperty(index = 0) @ExcelProperty(index = 0)
private String column000; private String column000;
@ExcelProperty(index = 1) @ExcelProperty(index = 1)
@ -250,4 +255,5 @@ public class ExcelExport {
@ExcelProperty(index = 120) @ExcelProperty(index = 120)
private String column120; private String column120;
} }

@ -1,10 +1,14 @@
package com.dsic.gj_erp.bean.fd; package com.dsic.gj_erp.bean.fd;
import lombok.Getter; import lombok.Data;
import lombok.Setter;
@Getter /**
@Setter * FdBean:
*
* @author xhj
* @date 2023/05/14
*/
@Data
public class FdBean { public class FdBean {
private String fdh; private String fdh;
private String color; private String color;

@ -1,13 +1,18 @@
package com.dsic.gj_erp.bean.fd; package com.dsic.gj_erp.bean.fd;
import lombok.Getter; import lombok.Data;
import lombok.Setter;
import java.math.BigDecimal; import java.math.BigDecimal;
@Getter /**
@Setter * TppsQk:
*
* @author xhj
* @date 2023/05/13
*/
@Data
public class TppsQk { public class TppsQk {
private String czbh; private String czbh;
private String fdh; private String fdh;
private String tpbh; private String tpbh;
@ -15,23 +20,40 @@ public class TppsQk {
private BigDecimal xqsl; private BigDecimal xqsl;
private BigDecimal pssl; private BigDecimal pssl;
private BigDecimal psbfb; private BigDecimal psbfb;
private String ygpprq; private String ygpprq;
private String fkpprq; private String fkpprq;
private String yjtgq; private String yjtgq;
private String jhxqrq; private String jhxqrq;
private String qfpsrq; private String qfpsrq;
private String qfpsrq1; private String qfpsrq1;
private String qfxqrq; private String qfxqrq;
private String sjpsrq;// 实际配送期
// 实际配送期
private String sjpsrq;
private String sjpsrqmin; private String sjpsrqmin;
private String sjpsrqmax; private String sjpsrqmax;
private String minjprkrq; // 集配入库日期
// 集配入库日期
private String minjprkrq;
private String maxjprkrq; private String maxjprkrq;
private String fdxqrq;//分段需求日期 //分段需求日期
private String zyzzcjmc;//作业车间及场地 private String fdxqrq;
//作业车间及场地
private String zyzzcjmc;
private String zyzzssbm; private String zyzzssbm;
private BigDecimal pssl0; private BigDecimal pssl0;
private BigDecimal pssl5; private BigDecimal pssl5;
private BigDecimal pssl10; private BigDecimal pssl10;
private BigDecimal pssl15; private BigDecimal pssl15;
} }

@ -1,13 +1,14 @@
package com.dsic.gj_erp.controller.fd; package com.dsic.gj_erp.controller.fd;
import com.alibaba.excel.EasyExcel; import com.alibaba.excel.EasyExcel;
import com.dsic.gj_erp.annotation.AuthFunction;
import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.fd.ExcelExport; import com.dsic.gj_erp.bean.fd.ExcelExport;
import com.dsic.gj_erp.exception.CustomException; import com.dsic.gj_erp.exception.CustomException;
import com.dsic.gj_erp.listeners.ExcelFdListener; import com.dsic.gj_erp.listeners.ExcelFdListener;
import com.dsic.gj_erp.service.fd.DmCzfddybService; import com.dsic.gj_erp.service.fd.DmCzfddybService;
import io.swagger.annotations.Authorization; import org.springframework.beans.factory.annotation.Autowired;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -15,16 +16,27 @@ import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/**
* <p>
*
* </p>
*
* @author xhj
* @since 2023-05-08
*/
@RestController @RestController
@RequestMapping("/api/dmCzfddyb") @RequestMapping("/api/dmCzfddyb")
@AllArgsConstructor
public class DmCzfddybController { public class DmCzfddybController {
private final DmCzfddybService dmCzfddybService;
@Autowired
DmCzfddybService dmCzfddybService;
@PostMapping("/upload") @PostMapping("/upload")
@Authorization("") @AuthFunction
@ResponseBody @ResponseBody
public ResultBean upload(@RequestParam("file") MultipartFile file , String czbh, String isupload, HttpServletRequest req) throws Exception, CustomException { public ResultBean upload(@RequestParam("file") MultipartFile file , String czbh, String isupload, HttpServletRequest req) throws Exception, CustomException {
System.out.println(czbh);
ExcelFdListener objectListener = new ExcelFdListener(); ExcelFdListener objectListener = new ExcelFdListener();
EasyExcel.read(file.getInputStream(), ExcelExport.class, objectListener).sheet(0).headRowNumber(0).doRead(); EasyExcel.read(file.getInputStream(), ExcelExport.class, objectListener).sheet(0).headRowNumber(0).doRead();
List<ExcelExport> objList = objectListener.getObjectList(); List<ExcelExport> objList = objectListener.getObjectList();
@ -33,33 +45,34 @@ public class DmCzfddybController {
} }
@PostMapping("/getCzFdBase") @PostMapping("/getCzFdBase")
@Authorization("") @AuthFunction
public ResultBean getCzFdBase( HttpServletRequest req,@RequestBody Map<String, Object> map) { public ResultBean getCzFdBase( HttpServletRequest req,@RequestBody Map<String, Object> map) throws Exception, CustomException {
Map rmap = dmCzfddybService.getCzFdBase(req,map); Map rmap = dmCzfddybService.getCzFdBase(req,map);
return new ResultBean(rmap); return new ResultBean(rmap);
} }
@PostMapping("/getList") @PostMapping("/getList")
@Authorization("") @AuthFunction
public ResultBean getList( HttpServletRequest req,@RequestBody Map<String, Object> map) throws Exception { public ResultBean getList( HttpServletRequest req,@RequestBody Map<String, Object> map) throws Exception, CustomException {
Map rmap = dmCzfddybService.getList(map); Map rmap = dmCzfddybService.getList(map);
return new ResultBean(rmap); return new ResultBean(rmap);
} }
@PostMapping("/getTpBase") @PostMapping("/getTpBase")
@Authorization("") @AuthFunction
public ResultBean getTpBase( HttpServletRequest req,@RequestBody Map<String, Object> map) throws Exception { public ResultBean getTpBase( HttpServletRequest req,@RequestBody Map<String, Object> map) throws Exception, CustomException {
Map rmap = dmCzfddybService.getTpBase(req,map); Map rmap = dmCzfddybService.getTpBase(req,map);
return new ResultBean(rmap); return new ResultBean(rmap);
} }
@PostMapping("/getListFdMx") @PostMapping("/getListFdMx")
@Authorization("") @AuthFunction
public ResultBean getListFdMx( HttpServletRequest req,@RequestBody Map<String, Object> map) throws Exception { public ResultBean getListFdMx( HttpServletRequest req,@RequestBody Map<String, Object> map) throws Exception, CustomException {
Map rmap = dmCzfddybService.getListFdMx(map); Map rmap = dmCzfddybService.getListFdMx(map);
return new ResultBean(rmap); return new ResultBean(rmap);
} }
} }

@ -0,0 +1,46 @@
package com.dsic.gj_erp.controller.fd;
import com.dsic.gj_erp.annotation.AuthFunction;
import com.dsic.gj_erp.bean.ResultBean;
import com.dsic.gj_erp.bean.fd.TppsQk;
import com.dsic.gj_erp.exception.CustomException;
import com.dsic.gj_erp.service.fd.impl.TpImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
/**
* <p>
*
* </p>
*
* @author xhj
* @since 2023-05-08
*/
@RestController
@RequestMapping("/api/tpb")
public class TpbController {
@Autowired
TpImpl tpImpl;
@PostMapping("/findTPxqjh")
@AuthFunction
public ResultBean findTPxqjh(HttpServletRequest req, @RequestBody Map<String, Object> map) throws Exception, CustomException {
List<Map> list = tpImpl.findTPxqjh(map);
return new ResultBean(list);
}
@PostMapping("/findTppsQk")
@AuthFunction
public ResultBean findTppsQk(HttpServletRequest req, @RequestBody Map<String, Object> map) throws Exception, CustomException {
List<TppsQk> list = tpImpl.findTppsQk(map);
return new ResultBean(list);
}
}

@ -12,7 +12,6 @@ import com.dsic.gj_erp.mapper.jcsj.DmBomMapper;
import com.dsic.gj_erp.service.jcsj.DmBomService; import com.dsic.gj_erp.service.jcsj.DmBomService;
import com.dsic.gj_erp.service.jcsj.DmTltpdfService; import com.dsic.gj_erp.service.jcsj.DmTltpdfService;
import com.dsic.gj_erp.service.jcsj.impl.BomUploadServiceImpl; import com.dsic.gj_erp.service.jcsj.impl.BomUploadServiceImpl;
import io.swagger.annotations.Authorization;
import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.text.PDFTextStripper; import org.apache.pdfbox.text.PDFTextStripper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

@ -15,7 +15,6 @@ import com.dsic.gj_erp.service.jcsj.DmTltpdfService;
import com.dsic.gj_erp.service.jcsj.impl.BomUploadServiceImpl; import com.dsic.gj_erp.service.jcsj.impl.BomUploadServiceImpl;
import com.dsic.gj_erp.service.sy.SYService; import com.dsic.gj_erp.service.sy.SYService;
import com.dsic.gj_erp.util.FileUtil; import com.dsic.gj_erp.util.FileUtil;
import io.swagger.annotations.Authorization;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.text.PDFTextStripper; import org.apache.pdfbox.text.PDFTextStripper;

@ -9,7 +9,11 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/**
* Excel
*/
public class ExcelFdListener extends AnalysisEventListener<ExcelExport> { public class ExcelFdListener extends AnalysisEventListener<ExcelExport> {
private static final int BATCH_COUNT = 5; private static final int BATCH_COUNT = 5;
List<ExcelExport> objectList = new ArrayList<>(); List<ExcelExport> objectList = new ArrayList<>();
@ -20,7 +24,7 @@ public class ExcelFdListener extends AnalysisEventListener<ExcelExport> {
@Override @Override
public void invoke(ExcelExport excelDemo, AnalysisContext analysisContext) { public void invoke(ExcelExport excelDemo, AnalysisContext analysisContext) {
//每解析一行数据,就会调用该方法一次 //每解析一行数据,就会调用该方法一次
//正常在这里调用数据处理得办法 //正常在这里调用数据处理得办法
//一条数据添加到暂时存储的存储结构中 //一条数据添加到暂时存储的存储结构中

@ -3,5 +3,14 @@ package com.dsic.gj_erp.mapper.fd;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsic.gj_erp.bean.fd.DmCzfddyb; import com.dsic.gj_erp.bean.fd.DmCzfddyb;
/**
* <p>
* Mapper
* </p>
*
* @author xhj
* @since 2023-05-08
*/
public interface DmCzfddybMapper extends BaseMapper<DmCzfddyb> { public interface DmCzfddybMapper extends BaseMapper<DmCzfddyb> {
} }

@ -0,0 +1,16 @@
package com.dsic.gj_erp.mapper.fd;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsic.gj_erp.bean.fd.DmCzjbb;
/**
* <p>
* Mapper
* </p>
*
* @author xhj
* @since 2023-05-08
*/
public interface DmCzjbbMapper extends BaseMapper<DmCzjbb> {
}

@ -0,0 +1,127 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsic.xzerp.dao.fd.DmCzjbbMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.dsic.xzerp.bean.fd.DmCzjbb">
<id column="czbh" property="czbh" />
<result column="fjqzcjs" property="fjqzcjs" />
<result column="cjs" property="cjs" />
<result column="clbs10" property="clbs10" />
<result column="yqbs02" property="yqbs02" />
<result column="zfzy" property="zfzy" />
<result column="yzbs" property="yzbs" />
<result column="xsrq" property="xsrq" />
<result column="gxcjbs" property="gxcjbs" />
<result column="yqbs06" property="yqbs06" />
<result column="ph" property="ph" />
<result column="cwfzrq" property="cwfzrq" />
<result column="yqbs04" property="yqbs04" />
<result column="clbs11" property="clbs11" />
<result column="clbs09" property="clbs09" />
<result column="dyjdy" property="dyjdy" />
<result column="yqbs03" property="yqbs03" />
<result column="txzl1" property="txzl1" />
<result column="ph6" property="ph6" />
<result column="lrry" property="lrry" />
<result column="gjfkyz" property="gjfkyz" />
<result column="ph3" property="ph3" />
<result column="yqbs05" property="yqbs05" />
<result column="czmc" property="czmc" />
<result column="yqbs" property="yqbs" />
<result column="czjc" property="czjc" />
<result column="clbs12" property="clbs12" />
<result column="txgy3" property="txgy3" />
<result column="txcz" property="txcz" />
<result column="gcqy1" property="gcqy1" />
<result column="hcbs01" property="hcbs01" />
<result column="yqbs09" property="yqbs09" />
<result column="pjfs" property="pjfs" />
<result column="hcbs03" property="hcbs03" />
<result column="jswgbs" property="jswgbs" />
<result column="txzl2" property="txzl2" />
<result column="yqxebs" property="yqxebs" />
<result column="lrrq" property="lrrq" />
<result column="gjxtws" property="gjxtws" />
<result column="gcqy" property="gcqy" />
<result column="ph4" property="ph4" />
<result column="azqy3" property="azqy3" />
<result column="yqbs12" property="yqbs12" />
<result column="txjdy" property="txjdy" />
<result column="yqbs08" property="yqbs08" />
<result column="yqdetqry_tx" property="yqdetqryTx" />
<result column="yqbs10" property="yqbs10" />
<result column="hcbs02" property="hcbs02" />
<result column="txgy2" property="txgy2" />
<result column="sctrq" property="sctrq" />
<result column="xmbh" property="xmbh" />
<result column="shrq" property="shrq" />
<result column="sl" property="sl" />
<result column="gjfjpkfs" property="gjfjpkfs" />
<result column="wgbs" property="wgbs" />
<result column="hcbs04" property="hcbs04" />
<result column="ph1" property="ph1" />
<result column="sctrqbz" property="sctrqbz" />
<result column="yqbs07" property="yqbs07" />
<result column="yqbs11" property="yqbs11" />
<result column="gxhqby" property="gxhqby" />
<result column="hcbs10" property="hcbs10" />
<result column="clbs03" property="clbs03" />
<result column="azqy2" property="azqy2" />
<result column="qcbs" property="qcbs" />
<result column="ph7" property="ph7" />
<result column="clbs01" property="clbs01" />
<result column="gjfjthxz" property="gjfjthxz" />
<result column="hcbs05" property="hcbs05" />
<result column="jssxrq" property="jssxrq" />
<result column="qcbs1" property="qcbs1" />
<result column="hcbs07" property="hcbs07" />
<result column="hcbs09" property="hcbs09" />
<result column="gxfjbz" property="gxfjbz" />
<result column="txgy1" property="txgy1" />
<result column="clbs02" property="clbs02" />
<result column="cdmc" property="cdmc" />
<result column="cwzt" property="cwzt" />
<result column="cims_bs" property="cimsBs" />
<result column="kgrq" property="kgrq" />
<result column="cwfzsm" property="cwfzsm" />
<result column="gxhbbs" property="gxhbbs" />
<result column="sfqy" property="sfqy" />
<result column="hcbs06" property="hcbs06" />
<result column="hcbs08" property="hcbs08" />
<result column="gcxs" property="gcxs" />
<result column="yqdetqrq_tx" property="yqdetqrqTx" />
<result column="cjmc" property="cjmc" />
<result column="azqy1" property="azqy1" />
<result column="gzjxs" property="gzjxs" />
<result column="qzjgrq" property="qzjgrq" />
<result column="zztczbh" property="zztczbh" />
<result column="ycbs" property="ycbs" />
<result column="ph2" property="ph2" />
<result column="clbs05" property="clbs05" />
<result column="kgrqbz" property="kgrqbz" />
<result column="hcbs11" property="hcbs11" />
<result column="xscz" property="xscz" />
<result column="gjgxbz" property="gjgxbz" />
<result column="clbs07" property="clbs07" />
<result column="bz" property="bz" />
<result column="yqbs01" property="yqbs01" />
<result column="qcbs2" property="qcbs2" />
<result column="xl" property="xl" />
<result column="txzl3" property="txzl3" />
<result column="jssxsm" property="jssxsm" />
<result column="ph8" property="ph8" />
<result column="ph5" property="ph5" />
<result column="clbs06" property="clbs06" />
<result column="hcbs12" property="hcbs12" />
<result column="clbs04" property="clbs04" />
<result column="gjjdy" property="gjjdy" />
<result column="clbs08" property="clbs08" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
fjqzcjs, cjs, clbs10, yqbs02, zfzy, yzbs, xsrq, gxcjbs, yqbs06, ph, cwfzrq, yqbs04, clbs11, clbs09, dyjdy, yqbs03, txzl1, ph6, lrry, gjfkyz, ph3, yqbs05, czmc, yqbs, czjc, clbs12, txgy3, txcz, gcqy1, hcbs01, yqbs09, pjfs, hcbs03, jswgbs, txzl2, yqxebs, lrrq, gjxtws, gcqy, ph4, azqy3, yqbs12, txjdy, yqbs08, yqdetqry_tx, yqbs10, hcbs02, txgy2, sctrq, xmbh, shrq, sl, gjfjpkfs, wgbs, hcbs04, ph1, sctrqbz, yqbs07, yqbs11, gxhqby, hcbs10, clbs03, azqy2, qcbs, ph7, clbs01, gjfjthxz, hcbs05, jssxrq, czbh, qcbs1, hcbs07, hcbs09, gxfjbz, txgy1, clbs02, cdmc, cwzt, cims_bs, kgrq, cwfzsm, gxhbbs, sfqy, hcbs06, hcbs08, gcxs, yqdetqrq_tx, cjmc, azqy1, gzjxs, qzjgrq, zztczbh, ycbs, ph2, clbs05, kgrqbz, hcbs11, xscz, gjgxbz, clbs07, bz, yqbs01, qcbs2, xl, txzl3, jssxsm, ph8, ph5, clbs06, hcbs12, clbs04, gjjdy, clbs08
</sql>
</mapper>

@ -3,5 +3,14 @@ package com.dsic.gj_erp.mapper.fd;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsic.gj_erp.bean.fd.DmXqdwcjcd; import com.dsic.gj_erp.bean.fd.DmXqdwcjcd;
/**
* <p>
* Mapper
* </p>
*
* @author xhj
* @since 2023-06-16
*/
public interface DmXqdwcjcdMapper extends BaseMapper<DmXqdwcjcd> { public interface DmXqdwcjcdMapper extends BaseMapper<DmXqdwcjcd> {
} }

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsic.xzerp.dao.fd.DmXqdwcjcdMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.dsic.xzerp.bean.fd.DmXqdwcjcd">
<id column="cdid" property="cdid" />
<result column="cdmc" property="cdmc" />
<result column="dwbm" property="dwbm" />
<result column="bz" property="bz" />
<result column="dh" property="dh" />
<result column="cdlx" property="cdlx" />
<result column="cjmc" property="cjmc" />
<result column="fzry" property="fzry" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
cdmc, dwbm, bz, dh, cdid, cdlx, cjmc, fzry
</sql>
</mapper>

@ -7,7 +7,16 @@ import com.dsic.gj_erp.bean.fd.TppsQk;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/**
* <p>
* Mapper
* </p>
*
* @author xhj
* @since 2023-05-08
*/
public interface TpbMapper extends BaseMapper<DmCzfddyb> { public interface TpbMapper extends BaseMapper<DmCzfddyb> {
List<Map> findTPxqjh(Map map); List<Map> findTPxqjh(Map map);
List<TppsQk> findTppsQk(Map map); List<TppsQk> findTppsQk(Map map);
} }

@ -1,257 +1,31 @@
package com.dsic.gj_erp.service.fd; package com.dsic.gj_erp.service.fd;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.bean.fd.DmCzfddyb;
import com.dsic.gj_erp.bean.fd.*; import com.dsic.gj_erp.bean.fd.ExcelExport;
import com.dsic.gj_erp.bean.jcsj.DmCbxxp;
import com.dsic.gj_erp.bean.sy.SyDictItem;
import com.dsic.gj_erp.bean.sy.SyDzbmp;
import com.dsic.gj_erp.mapper.fd.DmCzfddybMapper;
import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
import com.dsic.gj_erp.service.sy.SyDictItemService;
import com.dsic.gj_erp.service.sy.impl.SyDzbmpService;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
@Service /**
@AllArgsConstructor * <p>
public class DmCzfddybService extends ServiceImpl<DmCzfddybMapper,DmCzfddyb> { *
* </p>
*
* @author xhj
* @since 2023-05-08
*/
public interface DmCzfddybService extends IService<DmCzfddyb> {
private final SyDictItemService syDictItemService; Map uploadFd(HttpServletRequest httpRequest, List<ExcelExport> excelList, String czbh, String isupload) throws Exception;
private final TpImpl tpImpl; Map getCzFdBase(HttpServletRequest req,Map map) ;
private final DmCbxxpService czjbbService;
private final DmXqdwcjcdService dmXqdwcjcdService;
private final SyDzbmpService syDzbmpService;
@Transactional(rollbackFor = Exception.class) Map getList(Map map) throws Exception;
public Map uploadFd(HttpServletRequest httpRequest, List<ExcelExport> excelList, String czbh, String isupload) throws Exception { Map getTpBase( HttpServletRequest req,Map map) throws Exception;
Map rMap = new HashMap();
czbh=czbh+"#";
if ("01".equals(isupload)) {
// 查询是否 有值
List<DmCzfddyb> czbh1 = this.list(new QueryWrapper<DmCzfddyb>().eq("czbh", czbh));
if (czbh1.size() > 0) {
rMap.put("zt", "01");
return rMap;
}
}
this.remove(new QueryWrapper<DmCzfddyb>().eq("CZBH", czbh));
List<DmCzfddyb> addList = new ArrayList<>();
int row = 0;
for (int i = 0; i < excelList.size(); i++) {
ExcelExport e = excelList.get(i);
Class cls = e.getClass();
Field[] fields = cls.getDeclaredFields();
for (int j = 0; j < fields.length; j++) {
String fdh = "";
int col;
Field f = fields[j];
f.setAccessible(true);
try {
fdh = (String) f.get(e);
} catch (IllegalAccessException ex) {
throw new RuntimeException(ex);
}
if (StringUtils.isNotBlank(fdh)) {
DmCzfddyb czfddyb = new DmCzfddyb();
czfddyb.setCzbh(czbh);
czfddyb.setFdh(fdh);
czfddyb.setFrow(i);
String colName = f.getName();
col = Integer.parseInt(colName.substring(colName.length() - 3));
czfddyb.setFcol(col);
addList.add(czfddyb);
}
//System.out.println("属性名:" + f.getName() + " 属性值:" + );
}
}
this.saveBatch(addList);
return rMap;
}
public Map getCzFdBase(HttpServletRequest req, Map map) { Map getListFdMx(Map map) throws Exception;
Map rMap = new HashMap();
String bmbm = (String)req.getAttribute("bmbm");
List<DmCbxxp> czbhs;
if(StringUtils.isNotBlank(bmbm)&& bmbm.length()>2){
czbhs = czjbbService.list(new QueryWrapper<DmCbxxp>()
.select("replace(cbbm,'#','') AS cbbm")
.ne("isnull(wgbs,'N')","Y").eq(" isnull(cims_bs,'')","Y").
eq("left(gcqy,1)","0").
orderBy(true, true, "wgbs", "left(czbh,charindex('-',cbbm)-1)", "len(cbbm)", "czbh"
));
}else{
czbhs = czjbbService.list(new QueryWrapper<DmCbxxp>()
.select("replace(cbbm,'#','') AS cbbm")
.gt("charindex('-',cbbm)-1",0)
.orderBy(true, true, "wgbs", "left(cbbm,charindex('-',cbbm)-1)", "len(cbbm)", "cbbm"));
}
// 只显示海工名船 简称不等于空
rMap.put("czbhs", czbhs);
return rMap;
}
public Map getList(Map map) throws Exception {
Map returnMap = new HashMap();
List<ExcelExport> returnList = new ArrayList<>();
QueryWrapper<DmCzfddyb> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("CZBH", map.get("czbh")+"#");
List<DmCzfddyb> list = this.list(queryWrapper);
queryWrapper.select("max(frow) as frow ", "max(fcol)as fcol");
DmCzfddyb one = (DmCzfddyb) this.getOne(queryWrapper);
if (one != null) {
int row = one.getFrow();
int col = one.getFcol();
for (int i = 0; i <= row; i++) {
ExcelExport excelExport = new ExcelExport();
int tempi = i;
List<DmCzfddyb> collect = list.stream().filter(fst -> fst.getFrow() == tempi).collect(Collectors.toList());
for (int y = 0; y <= col; y++) {
int tempy = y;
DmCzfddyb czfddyb = collect.stream().filter(fst -> fst.getFcol() == tempy).findFirst().orElse(null);
if (null != czfddyb) {
PropertyDescriptor propertyDescriptor = new PropertyDescriptor("column" + String.format("%03d", czfddyb.getFcol()), excelExport.getClass());
Method setMethod = propertyDescriptor.getWriteMethod();
// 调用指定对象set方法
setMethod.invoke(excelExport, czfddyb.getFdh());
// System.out.println(object.getName());// 输出Jack Chen
}
}
returnList.add(excelExport);
}
returnMap.put("data", returnList);
returnMap.put("col", col);
}
return returnMap;
}
public Map getTpBase( HttpServletRequest req,Map map) throws Exception {
Map rMap = new HashMap();
String bmbm = (String)req.getAttribute("bmbm");
List<DmCbxxp> czbhs;
List<DmXqdwcjcd>cdmcs;
List<DmXqdwcjcd>cjmcs;
if(StringUtils.isNotBlank(bmbm)&& bmbm.length()>2){
czbhs = czjbbService.list(new QueryWrapper<DmCbxxp>()
.select("replace(czbh,'#','') AS czbh")
.in("yzbs", "N", "H").ne("isnull(czjc,'')", "")
.ne("isnull(wgbs,'N')","Y").eq(" isnull(cims_bs,'')","Y").
eq("left(gcqy,1)","0").
orderBy(true, true, "wgbs", "left(czbh,charindex('-',czbh)-1)", "len(czbh)", "czbh"
));
cdmcs=dmXqdwcjcdService.list(new QueryWrapper<DmXqdwcjcd>().eq("dwbm","P30000").orderBy(true,true,"cdmc"));
cjmcs=dmXqdwcjcdService.list(new QueryWrapper<DmXqdwcjcd>().select("DISTINCT cjmc as cjmc").eq("dwbm","P30000").orderBy(true,true,"cjmc"));
}else{
czbhs = czjbbService.list(new QueryWrapper<DmCbxxp>()
.select("replace(czbh,'#','') AS czbh")
.in("yzbs", "N", "H").ne("isnull(czjc,'')", "").
orderBy(true, true, "wgbs", "left(czbh,charindex('-',czbh)-1)", "len(czbh)", "czbh"
));
cdmcs=dmXqdwcjcdService.list();
cjmcs=dmXqdwcjcdService.list(new QueryWrapper<DmXqdwcjcd>().select("DISTINCT cjmc as cjmc"));
}
//作业阶段
List<SyDzbmp> zyjds = syDzbmpService.list(new QueryWrapper<SyDzbmp>().eq("bml", "ZYJD"));
//部件类别
List<SyDictItem> bjlbs = syDictItemService.list(new QueryWrapper<SyDictItem>().eq("bmlb", "TPLX"));
// List<Map> xqdws = mpZzdwjbbMapper.findxqdwAll();
List<SyDictItem> bmbms = syDictItemService.list(new QueryWrapper<SyDictItem>().eq("bmlb", "bmbm").in("bm","01","02","03","04"));
rMap.put("czbhs", czbhs);
rMap.put("zyjds", zyjds);
rMap.put("bjlbs", bjlbs);
// rMap.put("xqdws", xqdws);
rMap.put("bmbms", bmbms);
rMap.put("cdmcs", cdmcs);
rMap.put("cjmcs", cjmcs);
return rMap;
}
public Map getListFdMx(Map map) throws Exception {
// Map returnMap = new HashMap();
Map returnMap = this.getList(map);
List<TppsQk> tppsQks = tpImpl.findTppsQk(map);
Map<String, List<TppsQk>> collect = tppsQks.stream().collect(
Collectors.groupingBy(
score -> score.getFdh()+'-'+score.getTplx()
));
List<FdBean> fdBeans=new ArrayList<>();
for(Map.Entry<String, List<TppsQk>> entry : collect.entrySet()){
FdBean fdBean=new FdBean();
String mapKey = entry.getKey();
String color="";
String[] parts = mapKey.split("-");
String fdh=parts[0];
String tplx=parts[1];
// if(a.compareTo(b) < 1){
// System.out.println("a小于等于b");
// }
BigDecimal xqslSum=entry.getValue().stream().map(s-> s.getXqsl()).reduce(BigDecimal.ZERO,BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
BigDecimal psslSum=entry.getValue().stream().map(s-> s.getPssl()).reduce(BigDecimal.ZERO,BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
List<TppsQk> rqList=entry.getValue();
boolean flag=false;
// if(fdh.equals("ZL04")){
// rqList.get(0).setQfxqrq("2022/04/13");
// }
for(TppsQk q :rqList){
if(StringUtils.isNotBlank(q.getQfxqrq())){
flag=true;
}
}
if(xqslSum.compareTo(BigDecimal.ZERO)==0 ){
}else{
BigDecimal result =psslSum.divide(xqslSum,2,BigDecimal.ROUND_HALF_UP);
System.out.println("result = " + result +"xqsl"+xqslSum +"pssl"+psslSum+"fhd"+fdh);
if(result.compareTo(new BigDecimal("0.9"))> -1 ){ // result > =0.9
if("0201".equals(tplx)){
color="green";
}
}else if (result.compareTo(new BigDecimal("0.5"))>-1 && result.compareTo(new BigDecimal("0.9"))<1 ) {
if("0201".equals(tplx)){
color="yellow";
}
}else if( result.compareTo(new BigDecimal("0.5"))<1 && flag ){
if("0201".equals(tplx)){
color="red";
}
}
System.out.println("result = " + result +"xqsl"+xqslSum +"pssl"+psslSum+"fhd"+fdh+"COLOR"+color);
}
fdBean.setFdh(fdh);
fdBean.setTplx(tplx);
fdBean.setColor(color);
fdBeans.add(fdBean);
}
returnMap.put("fd", fdBeans);
returnMap.put("fdqk", tppsQks);
return returnMap;
}
} }

@ -0,0 +1,16 @@
package com.dsic.gj_erp.service.fd;
import com.baomidou.mybatisplus.extension.service.IService;
import com.dsic.gj_erp.bean.fd.DmCzjbb;
/**
* <p>
*
* </p>
*
* @author xhj
* @since 2023-05-08
*/
public interface DmCzjbbService extends IService<DmCzjbb> {
}

@ -1,10 +1,16 @@
package com.dsic.gj_erp.service.fd; package com.dsic.gj_erp.service.fd;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.IService;
import com.dsic.gj_erp.bean.fd.DmXqdwcjcd; import com.dsic.gj_erp.bean.fd.DmXqdwcjcd;
import com.dsic.gj_erp.mapper.fd.DmXqdwcjcdMapper;
import org.springframework.stereotype.Service;
@Service /**
public class DmXqdwcjcdService extends ServiceImpl<DmXqdwcjcdMapper, DmXqdwcjcd> { * <p>
*
* </p>
*
* @author xhj
* @since 2023-06-16
*/
public interface DmXqdwcjcdService extends IService<DmXqdwcjcd> {
} }

@ -0,0 +1,282 @@
package com.dsic.gj_erp.service.fd.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsic.gj_erp.bean.fd.*;
import com.dsic.gj_erp.bean.sy.SyDzbmp;
import com.dsic.gj_erp.mapper.fd.DmCzfddybMapper;
import com.dsic.gj_erp.service.fd.DmCzfddybService;
import com.dsic.gj_erp.service.fd.DmCzjbbService;
import com.dsic.gj_erp.service.fd.DmXqdwcjcdService;
import com.dsic.gj_erp.service.sy.impl.SyDzbmpService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletRequest;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* <p>
*
* </p>
*
* @author xhj
* @since 2023-05-08
*/
@Service
public class DmCzfddybServiceImpl extends ServiceImpl<DmCzfddybMapper, DmCzfddyb> implements DmCzfddybService {
@Autowired
DmCzjbbService czjbbService;
@Autowired
SyDzbmpService syDzbmpService;
// @Autowired
// DmZhbmpService dmZhbmpService;
// @Autowired
/// MpZzdwjbbService mpZzdwjbbService;
// @Autowired
// MpZzdwjbbMapper mpZzdwjbbMapper;
@Autowired
TpImpl tpImpl;
@Autowired
DmXqdwcjcdService dmXqdwcjcdService;
@Override
@Transactional(rollbackFor = Exception.class)
public Map uploadFd(HttpServletRequest httpRequest, List<ExcelExport> excelList, String czbh, String isupload) throws Exception {
Map rMap = new HashMap();
czbh=czbh+"#";
if ("01".equals(isupload)) {
// 查询是否 有值
List<DmCzfddyb> czbh1 = this.list(new QueryWrapper<DmCzfddyb>().eq("czbh", czbh));
if (czbh1.size() > 0) {
rMap.put("zt", "01");
return rMap;
}
}
this.remove(new QueryWrapper<DmCzfddyb>().eq("CZBH", czbh));
List<DmCzfddyb> addList = new ArrayList<>();
int row = 0;
for (int i = 0; i < excelList.size(); i++) {
ExcelExport e = excelList.get(i);
Class cls = e.getClass();
Field[] fields = cls.getDeclaredFields();
for (int j = 0; j < fields.length; j++) {
String fdh = "";
int col;
Field f = fields[j];
f.setAccessible(true);
try {
fdh = (String) f.get(e);
} catch (IllegalAccessException ex) {
throw new RuntimeException(ex);
}
if (StringUtils.isNotBlank(fdh)) {
DmCzfddyb czfddyb = new DmCzfddyb();
czfddyb.setCzbh(czbh);
czfddyb.setFdh(fdh);
czfddyb.setFrow(i);
String colName = f.getName();
col = Integer.parseInt(colName.substring(colName.length() - 3));
czfddyb.setFcol(col);
addList.add(czfddyb);
}
//System.out.println("属性名:" + f.getName() + " 属性值:" + );
}
}
this.saveBatch(addList);
return rMap;
}
@Override
public Map getCzFdBase( HttpServletRequest req,Map map) {
Map rMap = new HashMap();
String bmbm = (String)req.getAttribute("bmbm");
List<DmCzjbb> czbhs;
if(StringUtils.isNotBlank(bmbm)&& bmbm.length()>2){
czbhs = czjbbService.list(new QueryWrapper<DmCzjbb>()
.select("replace(czbh,'#','') AS czbh")
.in("yzbs", "N", "H").ne("isnull(czjc,'')", "")
.ne("isnull(wgbs,'N')","Y").eq(" isnull(cims_bs,'')","Y").
eq("left(gcqy,1)","0").
orderBy(true, true, "wgbs", "left(czbh,charindex('-',czbh)-1)", "len(czbh)", "czbh"
));
}else{
czbhs = czjbbService.list(new QueryWrapper<DmCzjbb>()
.select("replace(czbh,'#','') AS czbh")
.in("yzbs", "N", "H").ne("isnull(czjc,'')", "").
orderBy(true, true, "wgbs", "left(czbh,charindex('-',czbh)-1)", "len(czbh)", "czbh"
));
}
// 只显示海工名船 简称不等于空
rMap.put("czbhs", czbhs);
return rMap;
}
@Override
public Map getList(Map map) throws Exception {
Map returnMap = new HashMap();
List<ExcelExport> returnList = new ArrayList<>();
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq("CZBH", map.get("czbh")+"#");
List<DmCzfddyb> list = this.list(queryWrapper);
queryWrapper.select("max(frow) as frow ", "max(fcol)as fcol");
DmCzfddyb one = this.getOne(queryWrapper);
if (one != null) {
int row = one.getFrow();
int col = one.getFcol();
for (int i = 0; i <= row; i++) {
ExcelExport excelExport = new ExcelExport();
int tempi = i;
List<DmCzfddyb> collect = list.stream().filter(fst -> fst.getFrow() == tempi).collect(Collectors.toList());
for (int y = 0; y <= col; y++) {
int tempy = y;
DmCzfddyb czfddyb = collect.stream().filter(fst -> fst.getFcol() == tempy).findFirst().orElse(null);
if (null != czfddyb) {
PropertyDescriptor propertyDescriptor = new PropertyDescriptor("column" + String.format("%03d", czfddyb.getFcol()), excelExport.getClass());
Method setMethod = propertyDescriptor.getWriteMethod();
// 调用指定对象set方法
setMethod.invoke(excelExport, czfddyb.getFdh());
// System.out.println(object.getName());// 输出Jack Chen
}
}
returnList.add(excelExport);
}
returnMap.put("data", returnList);
returnMap.put("col", col);
}
return returnMap;
}
@Override
public Map getTpBase( HttpServletRequest req,Map map) throws Exception {
Map rMap = new HashMap();
String bmbm = (String)req.getAttribute("bmbm");
List<DmCzjbb> czbhs;
List<DmXqdwcjcd>cdmcs;
List<DmXqdwcjcd>cjmcs;
if(StringUtils.isNotBlank(bmbm)&& bmbm.length()>2){
czbhs = czjbbService.list(new QueryWrapper<DmCzjbb>()
.select("replace(czbh,'#','') AS czbh")
.in("yzbs", "N", "H").ne("isnull(czjc,'')", "")
.ne("isnull(wgbs,'N')","Y").eq(" isnull(cims_bs,'')","Y").
eq("left(gcqy,1)","0").
orderBy(true, true, "wgbs", "left(czbh,charindex('-',czbh)-1)", "len(czbh)", "czbh"
));
cdmcs=dmXqdwcjcdService.list(new QueryWrapper<DmXqdwcjcd>().eq("dwbm","P30000").orderBy(true,true,"cdmc"));
cjmcs=dmXqdwcjcdService.list(new QueryWrapper<DmXqdwcjcd>().select("DISTINCT cjmc as cjmc").eq("dwbm","P30000").orderBy(true,true,"cjmc"));
}else{
czbhs = czjbbService.list(new QueryWrapper<DmCzjbb>()
.select("replace(czbh,'#','') AS czbh")
.in("yzbs", "N", "H").ne("isnull(czjc,'')", "").
orderBy(true, true, "wgbs", "left(czbh,charindex('-',czbh)-1)", "len(czbh)", "czbh"
));
cdmcs=dmXqdwcjcdService.list();
cjmcs=dmXqdwcjcdService.list(new QueryWrapper<DmXqdwcjcd>().select("DISTINCT cjmc as cjmc"));
}
//作业阶段
List<SyDzbmp> zyjds = syDzbmpService.list(new QueryWrapper<SyDzbmp>().eq("bml", "ZYJD"));
//部件类别
// List<DmZhbmp> bjlbs = dmZhbmpService.list(new QueryWrapper<DmZhbmp>().eq("bmlb", "TPLX"));
// List<Map> xqdws = mpZzdwjbbMapper.findxqdwAll();
// List<DmZhbmp> bmbms = dmZhbmpService.list(new QueryWrapper<DmZhbmp>().eq("bmlb", "bmbm").in("bm","01","02","03","04"));
rMap.put("czbhs", czbhs);
rMap.put("zyjds", zyjds);
// rMap.put("bjlbs", bjlbs);
// rMap.put("xqdws", xqdws);
// rMap.put("bmbms", bmbms);
rMap.put("cdmcs", cdmcs);
rMap.put("cjmcs", cjmcs);
return rMap;
}
@Override
public Map getListFdMx(Map map) throws Exception {
// Map returnMap = new HashMap();
Map returnMap = this.getList(map);
List<TppsQk> tppsQks = tpImpl.findTppsQk(map);
// List<DmZhbmp> bjlbs = dmZhbmpService.list(new QueryWrapper<DmZhbmp>().eq("bmlb", "TPLX"));
Map<String, List<TppsQk>> collect = tppsQks.stream().collect(
Collectors.groupingBy(
score -> score.getFdh()+'-'+score.getTplx()
));
List<FdBean> fdBeans=new ArrayList<>();
for(Map.Entry<String, List<TppsQk>> entry : collect.entrySet()){
FdBean fdBean=new FdBean();
String mapKey = entry.getKey();
String color="";
String[] parts = mapKey.split("-");
String fdh=parts[0];
String tplx=parts[1];
// if(a.compareTo(b) < 1){
// System.out.println("a小于等于b");
// }
BigDecimal xqslSum=entry.getValue().stream().map(s-> s.getXqsl()).reduce(BigDecimal.ZERO,BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
BigDecimal psslSum=entry.getValue().stream().map(s-> s.getPssl()).reduce(BigDecimal.ZERO,BigDecimal::add).setScale(2, BigDecimal.ROUND_HALF_UP);
List<TppsQk> rqList=entry.getValue();
boolean flag=false;
// if(fdh.equals("ZL04")){
// rqList.get(0).setQfxqrq("2022/04/13");
// }
for(TppsQk q :rqList){
if(StringUtils.isNotBlank(q.getQfxqrq())){
flag=true;
}
}
if(xqslSum.compareTo(BigDecimal.ZERO)==0 ){
}else{
BigDecimal result =psslSum.divide(xqslSum,2,BigDecimal.ROUND_HALF_UP);
System.out.println("result = " + result +"xqsl"+xqslSum +"pssl"+psslSum+"fhd"+fdh);
if(result.compareTo(new BigDecimal("0.9"))> -1 ){ // result > =0.9
if("0201".equals(tplx)){
color="green";
}
}else if (result.compareTo(new BigDecimal("0.5"))>-1 && result.compareTo(new BigDecimal("0.9"))<1 ) {
if("0201".equals(tplx)){
color="yellow";
}
}else if( result.compareTo(new BigDecimal("0.5"))<1 && flag ){
if("0201".equals(tplx)){
color="red";
}
}
System.out.println("result = " + result +"xqsl"+xqslSum +"pssl"+psslSum+"fhd"+fdh+"COLOR"+color);
}
fdBean.setFdh(fdh);
fdBean.setTplx(tplx);
fdBean.setColor(color);
fdBeans.add(fdBean);
}
returnMap.put("fd", fdBeans);
returnMap.put("fdqk", tppsQks);
return returnMap;
}
}

@ -0,0 +1,20 @@
package com.dsic.gj_erp.service.fd.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsic.gj_erp.bean.fd.DmCzjbb;
import com.dsic.gj_erp.mapper.fd.DmCzjbbMapper;
import com.dsic.gj_erp.service.fd.DmCzjbbService;
import org.springframework.stereotype.Service;
/**
* <p>
*
* </p>
*
* @author xhj
* @since 2023-05-08
*/
@Service
public class DmCzjbbServiceImpl extends ServiceImpl<DmCzjbbMapper, DmCzjbb> implements DmCzjbbService {
}

@ -0,0 +1,20 @@
package com.dsic.gj_erp.service.fd.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsic.gj_erp.bean.fd.DmXqdwcjcd;
import com.dsic.gj_erp.mapper.fd.DmXqdwcjcdMapper;
import com.dsic.gj_erp.service.fd.DmXqdwcjcdService;
import org.springframework.stereotype.Service;
/**
* <p>
*
* </p>
*
* @author xhj
* @since 2023-06-16
*/
@Service
public class DmXqdwcjcdServiceImpl extends ServiceImpl<DmXqdwcjcdMapper, DmXqdwcjcd> implements DmXqdwcjcdService {
}

@ -1,23 +1,30 @@
package com.dsic.gj_erp.service.fd; package com.dsic.gj_erp.service.fd.impl;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.dsic.gj_erp.bean.fd.TppsQk; import com.dsic.gj_erp.bean.fd.TppsQk;
import com.dsic.gj_erp.mapper.fd.TpbMapper; import com.dsic.gj_erp.mapper.fd.TpbMapper;
import com.dsic.gj_erp.util.MyString; import com.dsic.gj_erp.util.MyString;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/**
* <p>
*
* </p>
*
* @author xhj
* @since 2023-05-08
*/
@Service @Service
@AllArgsConstructor
public class TpImpl { public class TpImpl {
private final TpbMapper tpbMapper; @Autowired
TpbMapper tpbMapper;
public List<Map> findTPxqjh(Map map) { public List<Map> findTPxqjh(Map map) {
List<Map> tPxqjhs = tpbMapper.findTPxqjh(map); List<Map> tPxqjhs = tpbMapper.findTPxqjh(map);
@ -58,48 +65,48 @@ public class TpImpl {
} }
public List<TppsQk> findTppsQk(Map map) { public List<TppsQk> findTppsQk(Map map) {
List<TppsQk> tppsQks = new ArrayList<>(); List<TppsQk> tppsQks = tpbMapper.findTppsQk(map);
// for (TppsQk t : tppsQks) { for (TppsQk t : tppsQks) {
//// if(t.getPssl().compareTo(new BigDecimal("100"))==0){ // if(t.getPssl().compareTo(new BigDecimal("100"))==0){
//// if(StringUtils.isNotBlank(t.getps)) // if(StringUtils.isNotBlank(t.getps))
////
//// }else
// //最小值 不为空 不用显示了
// //
// if (StringUtils.isNotBlank(t.getQfpsrq())) { // }else
// // t.setYjtgq(t.getQfpsrq1()); //最小值 不为空 不用显示了
//
// //最小的不爲空 用最大的 jprkrq if (StringUtils.isNotBlank(t.getQfpsrq())) {
// // t.setYjtgq(t.getQfpsrq1());
// } else if (StringUtils.isNotBlank(t.getMinjprkrq())){
// //最小的不爲空 用最大的 jprkrq
// Date date = DateUtil.parse(t.getMaxjprkrq());
// } else if (StringUtils.isNotBlank(t.getMinjprkrq())){
// t.setYgpprq(DateUtil.format( DateUtil.offsetDay(date, 2), "yyyy/MM/dd"));
// //System.out.println("date = " + t.getMaxjprkrq()+"111"+t.getYgpprq()); Date date = DateUtil.parse(t.getMaxjprkrq());
//
// } else if (StringUtils.isNotBlank(t.getFkpprq())) { //反馈配送 t.setYgpprq(DateUtil.format( DateUtil.offsetDay(date, 2), "yyyy/MM/dd"));
// t.setYjtgq(t.getFkpprq()); //System.out.println("date = " + t.getMaxjprkrq()+"111"+t.getYgpprq());
// } else if (StringUtils.isNotBlank(t.getYgpprq())) {
// t.setYjtgq(t.getYgpprq()); } else if (StringUtils.isNotBlank(t.getFkpprq())) { //反馈配送
// } else { t.setYjtgq(t.getFkpprq());
// t.setYjtgq(""); } else if (StringUtils.isNotBlank(t.getYgpprq())) {
// } t.setYjtgq(t.getYgpprq());
// if ("9999/99/99".equals(t.getSjpsrqmax())) { } else {
// t.setSjpsrqmax(""); t.setYjtgq("");
// } }
// if ("9999/99/99".equals(t.getSjpsrqmax())) {
// if(t.getXqsl().compareTo(t.getPssl())==0){ t.setSjpsrqmax("");
// }
// }else{
// t.setPssl0(((t.getPssl().add(t.getPssl0())).divide(t.getXqsl(), BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) ); if(t.getXqsl().compareTo(t.getPssl())==0){
// t.setPssl5(((t.getPssl().add(t.getPssl5())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) );
// t.setPssl10(((t.getPssl().add(t.getPssl10())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) ); }else{
// t.setPssl15(((t.getPssl().add(t.getPssl15())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) ); t.setPssl0(((t.getPssl().add(t.getPssl0())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) );
// } t.setPssl5(((t.getPssl().add(t.getPssl5())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) );
// t.setPssl10(((t.getPssl().add(t.getPssl10())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) );
// t.setPssl15(((t.getPssl().add(t.getPssl15())).divide(t.getXqsl(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100.0"))).setScale(2, BigDecimal.ROUND_HALF_UP) );
// } }
}
return tppsQks; return tppsQks;
} }
} }

@ -17,7 +17,6 @@ import com.dsic.gj_erp.mapper.jcsj.DmBomMapper;
import com.dsic.gj_erp.service.jcsj.*; import com.dsic.gj_erp.service.jcsj.*;
import com.dsic.gj_erp.service.jhgk.DmTzjhService; import com.dsic.gj_erp.service.jhgk.DmTzjhService;
import com.dsic.gj_erp.service.sy.SYService; import com.dsic.gj_erp.service.sy.SYService;
import io.swagger.annotations.Authorization;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.text.PDFTextStripper; import org.apache.pdfbox.text.PDFTextStripper;
@ -1690,8 +1689,8 @@ public class BomUploadServiceImpl {
// 根据套料图号得到组立信息。 // 根据套料图号得到组立信息。
public String getZL(String tzbh) { public String getZL(String tzbh) {
String bh = tzbh.substring(6, 8); String bh = tzbh.substring(6, 8); // 72
if (tzbh.substring(4, 5).equals("X")) { if (tzbh.substring(4, 5).equals("X")) { // 51
if ("XX".equalsIgnoreCase(bh)) { if ("XX".equalsIgnoreCase(bh)) {
return "小组立"; return "小组立";
} else if ("XD".equalsIgnoreCase(bh)) { } else if ("XD".equalsIgnoreCase(bh)) {
@ -1704,7 +1703,7 @@ public class BomUploadServiceImpl {
return "光电"; // todo return "光电"; // todo
} }
} }
String bh1 = tzbh.substring(7, 8); String bh1 = tzbh.substring(7, 8); // 81
if ("X".equalsIgnoreCase(bh1)) { if ("X".equalsIgnoreCase(bh1)) {
return "小组立"; return "小组立";
} }

Loading…
Cancel
Save