wms-parent-manage/mt-pms-api
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

批次生产加工个别接口修改

Browse Source
This commit is contained in:
hy2250089 2019-12-15 16:44:27 +08:00
parent 2ace6dc2f3
commit 333f63482e
12 changed files with 8110 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -3,6 +3,7 @@
.metadata
bin/
tmp/
logs/
*.tmp
*.bak
*.swp
@ -11,6 +12,7 @@ local.properties
.settings/
.loadpath
.recommenders
.idea/
# External tool builders
.externalToolBuilders/
@ -56,3 +58,6 @@ local.properties
.scala_dependencies
.worksheet
/.idea/libraries/Maven__com_deer_wms_intercept_1_0_0_SNAPSHOT.xml
/.idea/libraries/Maven__com_deer_wms_intercept_1_0_0_SNAPSHOT.xml
/.idea/libraries/Maven__com_deer_wms_project_seed_1_0_0_SNAPSHOT.xml

6
.idea/libraries/Maven__com_deer_wms_intercept_1_0_0_SNAPSHOT.xml
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.deer:wms-intercept:1.0.0-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-intercept/1.0.0-SNAPSHOT/wms-intercept-1.0.0-SNAPSHOT.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-intercept/1.0.0-SNAPSHOT/wms-intercept-1.0.0-20191202.122736-1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-intercept/1.0.0-SNAPSHOT/wms-intercept-1.0.0-SNAPSHOT-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-intercept/1.0.0-SNAPSHOT/wms-intercept-1.0.0-20191202.122736-1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-intercept/1.0.0-SNAPSHOT/wms-intercept-1.0.0-SNAPSHOT-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-intercept/1.0.0-SNAPSHOT/wms-intercept-1.0.0-20191202.122736-1-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/Maven__com_deer_wms_project_seed_1_0_0_SNAPSHOT.xml
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.deer:wms-project-seed:1.0.0-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-project-seed/1.0.0-SNAPSHOT/wms-project-seed-1.0.0-SNAPSHOT.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-project-seed/1.0.0-SNAPSHOT/wms-project-seed-1.0.0-20191206.084126-3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-project-seed/1.0.0-SNAPSHOT/wms-project-seed-1.0.0-SNAPSHOT-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-project-seed/1.0.0-SNAPSHOT/wms-project-seed-1.0.0-20191206.084126-3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-project-seed/1.0.0-SNAPSHOT/wms-project-seed-1.0.0-SNAPSHOT-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/deer/wms-project-seed/1.0.0-SNAPSHOT/wms-project-seed-1.0.0-20191206.084126-3-sources.jar!/" />
</SOURCES>
</library>
</component>

707
.idea/workspace.xml
View File

@ -4,7 +4,20 @@
<option name="GROUP_BY_SEVERITY" value="true" />
</component>
<component name="ChangeListManager">
<list default="true" id="3fd1674b-533b-4c0c-9ac3-bba39e6841ef" name="Default" comment="" />
<list default="true" id="3fd1674b-533b-4c0c-9ac3-bba39e6841ef" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_deer_wms_intercept_1_0_0_SNAPSHOT.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_deer_wms_intercept_1_0_0_SNAPSHOT.xml" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_deer_wms_project_seed_1_0_0_SNAPSHOT.xml" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_deer_wms_project_seed_1_0_0_SNAPSHOT.xml" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/logs/spring.log" afterPath="$PROJECT_DIR$/logs/spring.log" />
<change beforePath="$PROJECT_DIR$/wms-produce-manage/.gitignore" afterPath="$PROJECT_DIR$/wms-produce-manage/.gitignore" />
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessHaveProcess.java" afterPath="" />
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java" />
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessService.java" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessService.java" />
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java" />
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBomController.java" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBomController.java" />
<change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java" />
</list>
<ignored path="$PROJECT_DIR$/wms-ware-task/target/" />
<ignored path="$PROJECT_DIR$/wms-file/target/" />
<ignored path="$PROJECT_DIR$/wms-api/target/" />
@ -49,16 +62,117 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/wms-produce-manage/pom.xml">
<file leaf-file-name="MaterialsInfoController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="236">
<caret line="38" column="38" lean-forward="false" selection-start-line="38" selection-start-column="38" selection-end-line="38" selection-end-column="38" />
<state relative-caret-position="95">
<caret line="110" column="84" lean-forward="false" selection-start-line="110" selection-start-column="79" selection-end-line="110" selection-end-column="84" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ProductProcessController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="137">
<caret line="93" column="76" lean-forward="false" selection-start-line="93" selection-start-column="76" selection-end-line="93" selection-end-column="76" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ProductProcessParams.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="94">
<caret line="12" column="33" lean-forward="false" selection-start-line="12" selection-start-column="33" selection-end-line="12" selection-end-column="33" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#318#319#0" expanded="true" />
<element signature="e#368#369#0" expanded="true" />
<element signature="e#412#413#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wms-produce-manage/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="263">
<caret line="14" column="6" lean-forward="false" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ProductProcessVo.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessVo.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="17" column="47" lean-forward="false" selection-start-line="17" selection-start-column="47" selection-end-line="17" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ProcessBomController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBomController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="91" column="67" lean-forward="false" selection-start-line="91" selection-start-column="67" selection-end-line="91" selection-end-column="67" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="MachiningProductController.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MachiningProductController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-133">
<caret line="42" column="51" lean-forward="false" selection-start-line="42" selection-start-column="51" selection-end-line="42" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ProductProcessService.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="15" column="27" lean-forward="false" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="27" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ProductProcessServiceImpl.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="367">
<caret line="49" column="43" lean-forward="false" selection-start-line="49" selection-start-column="43" selection-end-line="49" selection-end-column="43" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
@ -71,7 +185,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>MaterialsDTO</find>
<find>bar</find>
<find>findby</find>
<find>materialsOutgoingLogDTOService</find>
@ -101,6 +214,7 @@
<find>productProcessDto</find>
<find>mt_erp</find>
<find>com.deer.wms.project.seed.core.service.AbstractService</find>
<find>logging.ipdb.path</find>
</findStrings>
<replaceStrings>
<replace>ProductBatchDetectDet</replace>
@ -126,10 +240,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterials.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsMapper.xml" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/constant/ProduceManagePublicMethod.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomParams.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessBomService.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBomServiceImpl.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProductProcessBomMapper.java" />
@ -145,7 +255,6 @@
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessParams.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneProcessMapper.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProcessService.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBomController.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcess.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMapper.xml" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsInfoMapper.xml" />
@ -153,30 +262,35 @@
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessBomService.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessBomServiceImpl.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProcessBomMapper.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBomController.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessBomMapper.xml" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessService.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessHaveProcess.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneProcessController.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcess.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/PmsApplication.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/configurer/ProduceManageMybatisConfigurer.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/pom.xml" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/configurer/ProduceManageSwaggerConfigurer.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MachiningProductController.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/resources/config/application-pro.properties" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/resources/config/application-dev.properties" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/configurer/ProduceManageWebMvcConfigurer.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/SupperlierService.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/SupplierManage.java" />
<option value="$PROJECT_DIR$/wms-project-seed/src/main/java/com/deer/wms/project/seed/core/result/Result.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/SupperlierController.java" />
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBomController.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/pom.xml" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessBomMapper.xml" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsOutgoingLogServiceImpl.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsOutgoingLogController.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/resources/config/application-dev.properties" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessHaveProcess.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessService.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBomController.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java" />
<option value="$PROJECT_DIR$/wms-produce-manage/.gitignore" />
<option value="$PROJECT_DIR$/.gitignore" />
</list>
</option>
</component>
@ -189,10 +303,6 @@
<component name="MavenProjectNavigator">
<treeState>
<expand>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="wms-parent" type="9519ce18:MavenProjectsStructure$ProjectNode" />
</path>
<path>
<item name="" type="16c1761:MavenProjectsStructure$RootNode" />
<item name="wms-produce-manage" type="9519ce18:MavenProjectsStructure$ProjectNode" />
@ -262,6 +372,8 @@
</navigator>
<panes>
<pane id="Scope" />
<pane id="AndroidView" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<expand>
@ -269,13 +381,16 @@
<item name="wms-parent" type="b2602c69:ProjectViewProjectNode" />
<item name="mt-pms-api" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="wms-parent" type="b2602c69:ProjectViewProjectNode" />
<item name="mt-pms-api" type="462c0819:PsiDirectoryNode" />
<item name="wms-produce-manage" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scratches" />
<pane id="PackagesPane" />
<pane id="AndroidView" />
</panes>
</component>
<component name="PropertiesComponent">
@ -332,7 +447,7 @@
</RuleState>
</list>
</option>
<option name="contentProportion" value="0.18146718" />
<option name="contentProportion" value="0.06795367" />
</component>
<component name="RunManager" selected="Spring Boot.PmsApplication">
<configuration default="true" type="Applet" factoryName="Applet">
@ -642,12 +757,23 @@
<workItem from="1575180062734" duration="12838000" />
<workItem from="1575295797380" duration="2505000" />
<workItem from="1575344271961" duration="55000" />
<workItem from="1575353487509" duration="53000" />
<workItem from="1575353487509" duration="398000" />
<workItem from="1575691236800" duration="3264000" />
<workItem from="1575894447631" duration="1787000" />
<workItem from="1575943263214" duration="1623000" />
<workItem from="1576034621927" duration="748000" />
<workItem from="1576133794028" duration="766000" />
<workItem from="1576152738862" duration="595000" />
<workItem from="1576200363878" duration="825000" />
<workItem from="1576204862662" duration="216000" />
<workItem from="1576205284511" duration="13084000" />
<workItem from="1576246177892" duration="5538000" />
<workItem from="1576376449417" duration="12971000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="422368000" />
<option name="totallyTimeSpent" value="464130000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@ -663,7 +789,7 @@
<editor active="true" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47108844" sideWeight="0.5030257" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13464448" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@ -673,16 +799,17 @@
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24315068" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Run Dashboard" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4516129" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Run Dashboard" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29761904" sideWeight="0.4969743" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.42517006" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4387755" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21785174" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2980333" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980332" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="true" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
@ -691,7 +818,6 @@
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24315068" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.049657535" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
@ -704,7 +830,7 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="11" />
<option name="time" value="13" />
</breakpoint-manager>
<watches-manager />
</component>
@ -713,180 +839,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="855">
<caret line="62" column="8" lean-forward="false" selection-start-line="62" selection-start-column="8" selection-end-line="62" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/tk/mybatis/mapper/3.4.0/mapper-3.4.0-sources.jar!/tk/mybatis/mapper/common/base/insert/InsertMapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="399">
<caret line="44" column="25" lean-forward="false" selection-start-line="44" selection-start-column="25" selection-end-line="44" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcess.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<caret line="5" column="24" lean-forward="false" selection-start-line="5" selection-start-column="15" selection-end-line="5" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcess.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<caret line="5" column="33" lean-forward="false" selection-start-line="5" selection-start-column="33" selection-end-line="5" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachiningProduct.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
<caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfo.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
<caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsStockInfoParams.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsStockInfo.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="14" column="33" lean-forward="false" selection-start-line="14" selection-start-column="33" selection-end-line="14" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-system-manage/src/main/java/com/deer/wms/system/manage/interceptor/OperLogInterceptor.java" />
<entry file="file://$PROJECT_DIR$/wms-base-system/src/main/java/com/deer/wms/base/system/web/MtDictController.java" />
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MachingProductDto.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27">
<caret line="16" column="5" lean-forward="false" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="103">
<caret line="161" column="24" lean-forward="false" selection-start-line="161" selection-start-column="24" selection-end-line="161" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot-autoconfigure/1.5.6.RELEASE/spring-boot-autoconfigure-1.5.6.RELEASE.jar!/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="36" column="13" lean-forward="false" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/resources/config/application-gjx.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-57">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/resources/config/application-test.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="513">
<caret line="66" column="0" lean-forward="false" selection-start-line="66" selection-start-column="0" selection-end-line="66" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MachiningProductMapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<caret line="11" column="50" lean-forward="false" selection-start-line="11" selection-start-column="50" selection-end-line="11" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-project-seed/src/main/java/com/deer/wms/project/seed/core/mapper/Mapper.java" />
<entry file="file://$PROJECT_DIR$/wms-api/src/main/java/com/deer/wms/api/ApiApplication.java" />
<entry file="file://$PROJECT_DIR$/wms-api/pom.xml" />
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/resources/config/application.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="23" lean-forward="false" selection-start-line="0" selection-start-column="23" selection-end-line="0" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/constant/ProduceManageConstant.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="112">
<caret line="20" column="54" lean-forward="false" selection-start-line="20" selection-start-column="54" selection-end-line="20" selection-end-column="54" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneStockProductController.java" />
<entry file="file://$PROJECT_DIR$/wms-api/src/main/java/com/deer/wms/api/configurer/ApiMybatisConfigurer.java" />
<entry file="file://$PROJECT_DIR$/wms-api/src/main/java/com/deer/wms/api/configurer/ApiSwaggerConfigurer.java" />
<entry file="file://$PROJECT_DIR$/wms-api/src/main/java/com/deer/wms/api/configurer/FlowableConfig.java" />
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/configurer/ProduceManageMybatisConfigurer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="14" column="44" lean-forward="false" selection-start-line="14" selection-start-column="44" selection-end-line="14" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
<caret line="28" column="0" lean-forward="false" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/configurer/ProduceManageSwaggerConfigurer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="52">
<caret line="41" column="35" lean-forward="false" selection-start-line="41" selection-start-column="35" selection-end-line="41" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-api/src/main/resources/config/application.properties" />
<entry file="file://$PROJECT_DIR$/wms-api/src/main/resources/config/application-dev.properties" />
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MachiningProductServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-401">
<caret line="24" column="27" lean-forward="false" selection-start-line="24" selection-start-column="27" selection-end-line="24" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-intercept/src/main/java/com/deer/wms/intercept/intercept/AccessIntercept.java" />
<entry file="file://$PROJECT_DIR$/wms-intercept/src/main/java/com/deer/wms/intercept/annotation/Authority.java" />
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MachiningProductController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
<caret line="42" column="51" lean-forward="false" selection-start-line="42" selection-start-column="51" selection-end-line="42" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/resources/config/application-pro.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="31" column="30" lean-forward="true" selection-start-line="31" selection-start-column="22" selection-end-line="31" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/resources/config/application-dev.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="30" column="32" lean-forward="true" selection-start-line="30" selection-start-column="32" selection-end-line="30" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/configurer/ProduceManageWebMvcConfigurer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="145">
@ -894,13 +846,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/PmsApplication.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="117">
<caret line="15" column="30" lean-forward="true" selection-start-line="15" selection-start-column="30" selection-end-line="15" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/SupperlierService.java" />
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/SupplierManage.java">
<provider selected="true" editor-type-id="text-editor">
@ -960,15 +905,335 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/SupperlierController.java" />
<entry file="file://$PROJECT_DIR$/wms-produce-manage/pom.xml">
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.10.RELEASE/spring-web-4.3.10.RELEASE.jar!/org/springframework/web/bind/annotation/RestController.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="236">
<caret line="38" column="38" lean-forward="false" selection-start-line="38" selection-start-column="38" selection-end-line="38" selection-end-column="38" />
<state relative-caret-position="209">
<caret line="19" column="18" lean-forward="false" selection-start-line="19" selection-start-column="18" selection-end-line="19" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.10.RELEASE/spring-web-4.3.10.RELEASE.jar!/org/springframework/web/bind/annotation/RequestMapping.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="18" column="18" lean-forward="false" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.13/swagger-annotations-1.5.13.jar!/io/swagger/annotations/Api.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<caret line="16" column="18" lean-forward="false" selection-start-line="16" selection-start-column="18" selection-end-line="16" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/com/deer/wms-intercept/1.0.0-SNAPSHOT/wms-intercept-1.0.0-SNAPSHOT.jar!/com/deer/wms/intercept/annotation/Authority.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171">
<caret line="16" column="22" lean-forward="false" selection-start-line="16" selection-start-column="22" selection-end-line="16" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomParams.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="665">
<caret line="257" column="25" lean-forward="false" selection-start-line="232" selection-start-column="4" selection-end-line="257" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBomController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="175" column="47" lean-forward="false" selection-start-line="175" selection-start-column="47" selection-end-line="175" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1653">
<caret line="99" column="46" lean-forward="true" selection-start-line="99" selection-start-column="46" selection-end-line="99" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MachiningProductMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2375">
<caret line="125" column="48" lean-forward="false" selection-start-line="125" selection-start-column="48" selection-end-line="125" selection-end-column="48" />
<folding>
<marker date="1572755954269" expanded="true" signature="5393:6167" ph="SELECT mappb... mt_alone_machining_product" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessBomParams.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessBomService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="15" column="21" lean-forward="false" selection-start-line="15" selection-start-column="21" selection-end-line="15" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProcessBomMapper.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="124">
<caret line="10" column="34" lean-forward="true" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessBomServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="132">
<caret line="32" column="67" lean-forward="true" selection-start-line="32" selection-start-column="67" selection-end-line="32" selection-end-column="67" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessBomMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2052">
<caret line="15" column="36" lean-forward="false" selection-start-line="15" selection-start-column="36" selection-end-line="15" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MaterialsInfoParams.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="jar://$MAVEN_REPOSITORY$/com/deer/wms-project-seed/1.0.0-SNAPSHOT/wms-project-seed-1.0.0-SNAPSHOT.jar!/com/deer/wms/project/seed/core/service/QueryParams.class">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<caret line="7" column="22" lean-forward="false" selection-start-line="7" selection-start-column="22" selection-end-line="7" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsOutgoingLogService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="20" column="9" lean-forward="false" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsOutgoingLogController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1463">
<caret line="97" column="123" lean-forward="false" selection-start-line="97" selection-start-column="123" selection-end-line="97" selection-end-column="123" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MaterialsOutgoingLogServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
<caret line="37" column="31" lean-forward="false" selection-start-line="37" selection-start-column="31" selection-end-line="37" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MaterialsInfoService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
<caret line="14" column="27" lean-forward="false" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MaterialsInfoMapper.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="111" column="13" lean-forward="true" selection-start-line="111" selection-start-column="13" selection-end-line="111" selection-end-column="13" />
<folding>
<marker date="1572451771408" expanded="true" signature="2427:4804" ph="SELECT mater... mt_alone_materials_info" />
<marker date="1572451771408" expanded="true" signature="2530:2626" ph="SELECT m.mat... mt_alone_materials_info" />
<marker date="1572451771408" expanded="true" signature="5045:5141" ph="SELECT m.mat... mt_alone_materials_info" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/pom.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="244">
<caret line="31" column="50" lean-forward="true" selection-start-line="31" selection-start-column="50" selection-end-line="31" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/resources/config/application.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/resources/config/application-gjx.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="388">
<caret line="67" column="25" lean-forward="true" selection-start-line="67" selection-start-column="25" selection-end-line="67" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/resources/config/application-dev.properties">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1235">
<caret line="71" column="40" lean-forward="true" selection-start-line="71" selection-start-column="40" selection-end-line="71" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/PmsApplication.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
<caret line="8" column="24" lean-forward="true" selection-start-line="8" selection-start-column="24" selection-end-line="8" selection-end-column="24" />
<folding>
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcess.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
<caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductAndProcess.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="15" column="36" lean-forward="false" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="36" />
<folding>
<element signature="e#334#335#0" expanded="false" />
<element signature="e#371#372#0" expanded="false" />
<element signature="e#439#440#0" expanded="false" />
<element signature="e#491#492#0" expanded="false" />
<element signature="e#544#545#0" expanded="false" />
<element signature="e#576#577#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/Test.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="7" column="13" lean-forward="false" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessVo.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="17" column="47" lean-forward="false" selection-start-line="17" selection-start-column="47" selection-end-line="17" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessService.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="15" column="27" lean-forward="false" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="27" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="367">
<caret line="49" column="43" lean-forward="false" selection-start-line="49" selection-start-column="43" selection-end-line="49" selection-end-column="43" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MachiningProductController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-133">
<caret line="42" column="51" lean-forward="false" selection-start-line="42" selection-start-column="51" selection-end-line="42" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MaterialsInfoController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
<caret line="110" column="84" lean-forward="false" selection-start-line="110" selection-start-column="79" selection-end-line="110" selection-end-column="84" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="137">
<caret line="93" column="76" lean-forward="false" selection-start-line="93" selection-start-column="76" selection-end-line="93" selection-end-column="76" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBomController.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="91" column="67" lean-forward="false" selection-start-line="91" selection-start-column="67" selection-end-line="91" selection-end-column="67" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="94">
<caret line="12" column="33" lean-forward="false" selection-start-line="12" selection-start-column="33" selection-end-line="12" selection-end-column="33" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#318#319#0" expanded="true" />
<element signature="e#368#369#0" expanded="true" />
<element signature="e#412#413#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wms-produce-manage/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="263">
<caret line="14" column="6" lean-forward="false" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml" />
</component>
<component name="masterDetails">
<states>

7542
logs/spring.log
View File

File diff suppressed because it is too large Load Diff

2
wms-produce-manage/.gitignore vendored
View File

@ -1,11 +1,13 @@
##ignore this file##
/target/
target/ 
logs/
.classpath
.project
.factorypath
.settings
.apt_generated
.idea
### IntelliJ IDEA ###
.idea

12
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessHaveProcess.java → wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductAndProcess.java
View File

@ -8,9 +8,19 @@ import java.util.ArrayList;
* @Date: 2019/10/30 22:52
* @Version 1.0
*/
public class ProductProcessHaveProcess extends ProductProcess {
public class ProductAndProcess {
private ProductProcess productProcess;
private static MtAloneProcess[] processes;
public ProductProcess getProductProcess() {
return productProcess;
}
public void setProductProcess(ProductProcess productProcess) {
this.productProcess = productProcess;
}
public static MtAloneProcess[] getProcesses() {
return processes;
}

10
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessParams.java
View File

@ -2,9 +2,19 @@ package com.deer.wms.produce.manage.model;
import com.deer.wms.project.seed.core.service.QueryParams;
import java.util.Date;
/**
* Created by guo on 2019/09/24.
*/
public class ProductProcessParams extends QueryParams {
private Date createDate;
public Date getCreateDate() {
return createDate;
}
public void setCreateDate(Date createDate) {
this.createDate = createDate;
}
}

4
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProductProcessService.java
View File

@ -1,8 +1,8 @@
package com.deer.wms.produce.manage.service;
import com.deer.wms.intercept.common.data.CurrentUser;
import com.deer.wms.produce.manage.model.ProductAndProcess;
import com.deer.wms.produce.manage.model.ProductProcess;
import com.deer.wms.produce.manage.model.ProductProcessHaveProcess;
import com.deer.wms.produce.manage.model.ProductProcessParams;
import com.deer.wms.produce.manage.model.ProductProcessVo;
import com.deer.wms.project.seed.core.service.Service;
@ -17,5 +17,5 @@ public interface ProductProcessService extends Service<ProductProcess, Integer>
void save(ProductProcess productProcess, CurrentUser currentUser);
void addAndUpdateProProcAndProc(ProductProcessHaveProcess productProcessHaveProcess, CurrentUser currentUser);
void saveProdAndProc(ProductAndProcess productAndProcess, CurrentUser currentUser);
}

44
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java
View File

@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@ -58,48 +59,29 @@ public class ProductProcessServiceImpl extends AbstractService<ProductProcess, I
}
@Override
public void addAndUpdateProProcAndProc(ProductProcessHaveProcess productProcessHaveProcess, CurrentUser currentUser) {
public void saveProdAndProc(ProductAndProcess productAndProcess, CurrentUser currentUser) {
//首先保存批次产品加工信息
ProductProcess productProcess = new ProductProcess();
ProductProcess productProcess = productAndProcess.getProductProcess();
Date date = new Date();
productProcess.setOperatorId(1);
productProcess.setOperatorId(currentUser.getUserId());
productProcess.setCreateTime(date);
productProcess.setUpdateTime(date);
productProcess.setVersion("1.1");
productProcess.setStatus(ProduceManageConstant.STATUS_AVAILABLE);
productProcess.setSalesNumber(productProcessHaveProcess.getSalesNumber());
productProcess.setWorkOrderCode(ProduceManagePublicMethod.creatUniqueCode("PCJGD"));
productProcess.setWorkOrderName(productProcessHaveProcess.getWorkOrderName());
productProcess.setDeliveryCode(productProcessHaveProcess.getDeliveryCode());
productProcess.setPlanBeginTime(productProcessHaveProcess.getPlanBeginTime());
productProcess.setPlanFinishTime(productProcessHaveProcess.getPlanFinishTime());
productProcess.setClientId(productProcessHaveProcess.getClientId());
productProcess.setClientName(productProcessHaveProcess.getClientName());
productProcess.setContractCode(productProcessHaveProcess.getContractCode());
productProcess.setContractName(productProcessHaveProcess.getContractName());
productProcess.setProductProcessCode(productProcessHaveProcess.getProductProcessCode());
productProcess.setProductProcessName0(productProcessHaveProcess.getProductProcessName0());
productProcess.setSpecification(productProcessHaveProcess.getSpecification());
productProcess.setProcessPrice(productProcessHaveProcess.getProcessPrice());
productProcess.setLen(productProcessHaveProcess.getLen());
productProcess.setBatchCode(productProcessHaveProcess.getBatchCode());
productProcess.setBatchOrderCode(productProcessHaveProcess.getBatchOrderCode());
productProcess.setShrinkage((productProcessHaveProcess.getDetectionLen()/productProcessHaveProcess.getLen())*100+"%");
productProcess.setPiNum(productProcessHaveProcess.getPiNum());
productProcess.setProcessContent(productProcessHaveProcess.getProcessContent());
productProcess.setMerchandiserId(productProcessHaveProcess.getMerchandiserId());
productProcess.setMerchandiserName(productProcessHaveProcess.getMerchandiserName());
productProcess.setMemo(productProcessHaveProcess.getMemo());
productProcess.setShrinkage((productProcess.getDetectionLen()/productProcess.getLen())*100+"%");
productProcess.setReviewStatus(ProduceManageConstant.REVIEW_STATUS_FORREVIEW);
productProcess.setProductAnnexCode(productProcessHaveProcess.getProductAnnexCode());
productProcess.setCompanyId(1);
productProcess.setCompanyId(currentUser.getCompanyId());
productProcessMapper.insert(productProcess);
//其次保存由前端获取的工序信息
MtAloneProcess[] processes = ProductProcessHaveProcess.getProcesses();
for (int i = 0; i < processes.length; i++) {
processService.save(processes[i]);
}
MtAloneProcess[] processes = productAndProcess.getProcesses();
if(null != processes) {
List<MtAloneProcess> processesList = new ArrayList<>(processes.length);
Collections.addAll(processesList, processes);
processService.save(processesList);
}
}
}

1
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProcessBomController.java
View File

@ -128,7 +128,6 @@ public class ProcessBomController {
/**
* hy
*
* 根据选择的产品名称来展示产品其他数据和工序数据
* @param params
* @param currentUser

50
wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java
View File

@ -3,8 +3,8 @@ package com.deer.wms.produce.manage.web;
import com.deer.wms.intercept.annotation.Authority;
import com.deer.wms.intercept.annotation.User;
import com.deer.wms.intercept.common.data.CurrentUser;
import com.deer.wms.produce.manage.model.ProductAndProcess;
import com.deer.wms.produce.manage.model.ProductProcess;
import com.deer.wms.produce.manage.model.ProductProcessHaveProcess;
import com.deer.wms.produce.manage.model.ProductProcessParams;
import com.deer.wms.produce.manage.model.ProductProcessVo;
import com.deer.wms.produce.manage.service.ProcessBomService;
@ -16,6 +16,8 @@ import com.deer.wms.project.seed.core.result.ResultGenerator;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -39,6 +41,7 @@ public class ProductProcessController {
private ProcessBomService processBomService;
/**
* hy
* 生成某种产品某一批次的生产加工单
* 需要调用对应产品bom
* @param productProcess
@ -79,15 +82,27 @@ public class ProductProcessController {
return ResultGenerator.genSuccessResult(productProcess);
}
@OperateLog(description = "生产计划分页查询", type = "查询")
@ApiOperation(value = "生产计划列表分页", notes = "生产计划列表分页")
/**
* hy
* 批次生产加工单分页查询
* @param params
* @param currentUser
* @return
*/
@ApiOperation(value = "批次生产加工单分页查询", notes = "批次生产加工单分页查询")
@ApiImplicitParams({
@ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String", required = false),
@ApiImplicitParam(name = "companyId", value = "公司id", paramType = "query", dataType = "int", required = false)
})
@OperateLog(description = "批次生产加工单分页查询", type = "查询")
@GetMapping("/list")
public Result list(ProductProcessParams params, @ApiIgnore @User CurrentUser currentUser) {
if(currentUser==null){
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
}
//if(currentUser==null){
// return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
//}
params.setCompanyId(currentUser.getCompanyId());
params.setCompanyId(1);
PageHelper.startPage(params.getPageNum(), params.getPageSize());
List<ProductProcessVo> list = productProcessService.findList(params);
PageInfo pageInfo = new PageInfo(list);
@ -95,21 +110,24 @@ public class ProductProcessController {
}
/**
*新建批次产品加工完毕时，点击提交同时保存产品加工和工序信息
* hy
* @param productProcessHaveProcess
* 新建批次产品加工完毕时，点击提交同时保存产品加工和工序信息
* @param productAndProcess
* @param currentUser
* @return
*/
@OperateLog(description = "批次生产加工及工序保存更新", type = "保存更新")
@ApiOperation(value = "批次生产加工及工序保存更新", notes = "批次生产加工及工序保存更新")
@PostMapping("/addAndUpdateProProcAndProc")
public Result addAndUpdateProProcAndProc(@RequestBody ProductProcessHaveProcess productProcessHaveProcess, @ApiIgnore @User CurrentUser currentUser) {
//if(currentUser==null){
// return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
//}
@ApiImplicitParams({
@ApiImplicitParam(name = "productAndProcess", value = "批次生产加工及工序", paramType = "body", dataType = "ProductAndProcess", required = true)
})
@OperateLog(description = "批次生产加工及工序保存", type = "保存")
@PostMapping("/saveProdAndProc")
public Result saveProdAndProc(@RequestBody ProductAndProcess productAndProcess, @ApiIgnore @User CurrentUser currentUser) {
if(currentUser==null){
return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
}
productProcessService.addAndUpdateProProcAndProc(productProcessHaveProcess, currentUser);
productProcessService.saveProdAndProc(productAndProcess, currentUser);
return ResultGenerator.genSuccessResult();
}