生产流程

# Conflicts:
#	.idea/workspace.xml

.idea/libraries/Maven__org_mapstruct_mapstruct_1_1_0_Final.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="Maven: org.mapstruct:mapstruct:1.1.0.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.1.0.Final/mapstruct-1.1.0.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.1.0.Final/mapstruct-1.1.0.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.1.0.Final/mapstruct-1.1.0.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>

.idea/workspace.xml

@@ -3,94 +3,25 @@
   <component name="AnalysisUIOptions">
     <option name="GROUP_BY_SEVERITY" value="true" />
   </component>
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="3fd1674b-533b-4c0c-9ac3-bba39e6841ef" name="Default" comment="mark">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/generator/CodeGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/generator/CodeGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-parent.iml" beforeDir="false" afterPath="$PROJECT_DIR$/wms-parent.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByAShelfMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByAShelfMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByAShelfMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByBakeClothMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByOrderInfoMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByOrderInfoMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByCoatingGlueMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByAShelfMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByAShelfMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByCoatingMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByOrderInfoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByOrderInfoMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByCoatingProgressMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByProductInfoMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByProductInfoMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByGoDyeFactoryMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByOrderInfoParams.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByOrderInfoParams.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByLogisticsMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByAShelfService.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByAShelfService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByOrderInfoMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByOrderInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByOrderInfoService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByProductInfoMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByAShelfServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByAShelfServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByRunClothMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByAShelfController.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByAShelfController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByTrimmingMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByOrderInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByOrderInfoController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/dao/MtAloneByWeavClothMapper.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByProductInfoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByProductInfoController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByAShelfMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByBakeClothMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByCoatingGlueMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByCoatingMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByCoatingProgressMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByGoDyeFactoryMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByLogisticsMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByOrderInfoMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByProductInfoMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByRunClothMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByTrimmingMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/mapper/MtAloneByWeavClothMapper.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByAShelf.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByAShelfParams.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByBakeCloth.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByBakeClothParams.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByCoating.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByCoatingGlue.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByCoatingGlueParams.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByCoatingParams.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByCoatingProgress.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByCoatingProgressParams.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByGoDyeFactory.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByGoDyeFactoryParams.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByLogistics.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByLogisticsParams.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByOrderInfo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByOrderInfoParams.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByProductInfo.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByProductInfoParams.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByRunCloth.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByRunClothParams.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByTrimming.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByTrimmingParams.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByWeavCloth.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/model/MtAloneByWeavClothParams.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByAShelfService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByBakeClothService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByCoatingGlueService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByCoatingProgressService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByCoatingService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByGoDyeFactoryService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByLogisticsService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByOrderInfoService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByProductInfoService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByRunClothService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByTrimmingService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/MtAloneByWeavClothService.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByAShelfServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByBakeClothServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByCoatingGlueServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByCoatingProgressServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByCoatingServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByGoDyeFactoryServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByLogisticsServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByOrderInfoServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByProductInfoServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByRunClothServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByTrimmingServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/service/impl/MtAloneByWeavClothServiceImpl.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByAShelfController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByBakeClothController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByCoatingController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByCoatingGlueController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByCoatingProgressController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByGoDyeFactoryController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByLogisticsController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByOrderInfoController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByProductInfoController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByRunClothController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByTrimmingController.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/clothflow/web/MtAloneByWeavClothController.java" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -156,6 +87,13 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="MavenImportPreferences">
+    <option name="generalSettings">
+      <MavenGeneralSettings>
+        <option name="mavenHome" value="$APPLICATION_HOME_DIR$/plugins/maven/lib/maven3" />
+      </MavenGeneralSettings>
+    </option>
+  </component>
   <component name="ProjectId" id="1g7xPULNnjVlBcQ5DdLGUGBm9kJ" />
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
@@ -213,7 +151,7 @@
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="restartRequiresConfirmation" value="false" />
-    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+    <property name="settings.editor.selected.configurable" value="editor.preferences.completion" />
   </component>
   <component name="RecentsManager">
     <key name="CreateClassDialog.RecentsKey">
@@ -243,7 +181,7 @@
       </set>
     </option>
   </component>
-  <component name="RunManager" selected="Spring Boot.PmsApplication">
+  <component name="RunManager" selected="Application.Test">
     <configuration default="true" type="Applet" factoryName="Applet">
       <option name="HTML_USED" value="false" />
       <option name="WIDTH" value="400" />
@@ -251,6 +189,19 @@
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
       <module />
     </configuration>
+    <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true">
+      <option name="arquillianRunConfiguration">
+        <value>
+          <option name="containerStateName" value="" />
+        </value>
+      </option>
+      <option name="TEST_OBJECT" value="CLASS" />
+      <properties />
+      <listeners />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="CodeGenerator (1)" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="generator.CodeGenerator" />
       <module name="wms-parent" />
@@ -279,20 +230,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="ProduceManagePublicMethod" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="com.deer.wms.produce.manage.constant.ProduceManagePublicMethod" />
-      <module name="wms-produce-manage" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="com.deer.wms.produce.manage.constant.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="ProductProcessBatchDetServiceImpl" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="com.deer.wms.produce.manage.service.impl.ProductProcessBatchDetServiceImpl" />
       <module name="wms-produce-manage" />
@@ -307,6 +244,20 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="Test" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.deer.wms.produce.manage.web.Test" />
+      <module name="wms-produce-manage" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.deer.wms.produce.manage.web.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration default="true" type="Application" factoryName="Application">
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <method v="2">
@@ -365,22 +316,21 @@
       </method>
     </configuration>
     <list>
-      <item itemvalue="Application.ProduceManagePublicMethod" />
       <item itemvalue="Application.ProductProcessBatchDetServiceImpl" />
       <item itemvalue="Application.CodeGenerator" />
       <item itemvalue="Application.CodeGenerator (1)" />
-      <item itemvalue="Spring Boot.PmsApplication" />
+      <item itemvalue="Application.Test" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Spring Boot.PmsApplication" />
+        <item itemvalue="Application.Test" />
         <item itemvalue="Application.CodeGenerator (1)" />
         <item itemvalue="Application.CodeGenerator" />
         <item itemvalue="Application.ProductProcessBatchDetServiceImpl" />
-        <item itemvalue="Application.ProduceManagePublicMethod" />
       </list>
     </recent_temporary>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -576,6 +526,8 @@
       <workItem from="1597715559594" duration="2738000" />
       <workItem from="1597734009753" duration="14000" />
       <workItem from="1597734148841" duration="568000" />
+      <workItem from="1597971890218" duration="12735000" />
+      <workItem from="1597989143534" duration="10955000" />
     </task>
     <task id="LOCAL-00001" summary="mark">
       <created>1597716938734</created>
@@ -604,7 +556,7 @@
     </todo-panel>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="2" />
+    <option name="version" value="3" />
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="mark" />
@@ -623,44 +575,72 @@
       <screen x="0" y="0" width="1920" height="1050" />
     </state>
     <state x="513" y="309" key="#com.intellij.fileTypes.FileTypeChooser/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597710642111" />
+    <state x="510" y="134" key="#com.intellij.ide.util.MemberChooser" timestamp="1598080677329">
+      <screen x="0" y="23" width="1280" height="732" />
+    </state>
+    <state x="765" y="223" key="#com.intellij.ide.util.MemberChooser/0.0.1920.1040@0.0.1920.1040" timestamp="1597999710196" />
+    <state x="510" y="133" key="#com.intellij.ide.util.MemberChooser/0.23.1280.728@0.23.1280.728" timestamp="1598069502140" />
+    <state x="510" y="134" key="#com.intellij.ide.util.MemberChooser/0.23.1280.729@0.23.1280.729" timestamp="1598067919088" />
+    <state x="510" y="134" key="#com.intellij.ide.util.MemberChooser/0.23.1280.732@0.23.1280.732" timestamp="1598080677329" />
     <state x="389" y="0" key="CommitChangelistDialog2" timestamp="1597718387821">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="389" y="0" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1597718387821" />
     <state x="389" y="39" key="CommitChangelistDialog2/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717639469" />
-    <state x="621" y="200" key="FileChooserDialogImpl" timestamp="1597734021850">
+    <state x="621" y="198" key="FileChooserDialogImpl" timestamp="1597989841097">
-      <screen x="0" y="0" width="1920" height="1050" />
+      <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="621" y="198" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1597481488476" />
+    <state x="621" y="198" key="FileChooserDialogImpl/0.0.1920.1040@0.0.1920.1040" timestamp="1597989841097" />
     <state x="621" y="200" key="FileChooserDialogImpl/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597734021850" />
     <state x="730" y="396" key="Gitee.ShareDialog" timestamp="1597481505655">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="730" y="396" key="Gitee.ShareDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1597481505655" />
-    <state width="1921" height="28" key="GridCell.Tab.0.bottom" timestamp="1597717630394">
+    <state width="1877" height="275" key="GridCell.Tab.0.bottom" timestamp="1598000181099">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state width="1921" height="28" key="GridCell.Tab.0.bottom/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630394" />
-    <state width="1921" height="28" key="GridCell.Tab.0.center" timestamp="1597717630394">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state width="1921" height="28" key="GridCell.Tab.0.center/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630394" />
-    <state width="1921" height="28" key="GridCell.Tab.0.left" timestamp="1597717630393">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state width="1921" height="28" key="GridCell.Tab.0.left/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630393" />
-    <state width="1921" height="28" key="GridCell.Tab.0.right" timestamp="1597717630394">
-      <screen x="0" y="0" width="1920" height="1050" />
-    </state>
-    <state width="1921" height="28" key="GridCell.Tab.0.right/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630394" />
-    <state x="366" y="78" key="SettingsEditor" timestamp="1597481540846">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
+    <state width="1877" height="275" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1598000181099" />
+    <state width="1921" height="28" key="GridCell.Tab.0.bottom/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630394" />
+    <state width="1877" height="275" key="GridCell.Tab.0.center" timestamp="1598000181098">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state width="1877" height="275" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1598000181098" />
+    <state width="1921" height="28" key="GridCell.Tab.0.center/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630394" />
+    <state width="1877" height="275" key="GridCell.Tab.0.left" timestamp="1598000181098">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state width="1877" height="275" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1598000181098" />
+    <state width="1921" height="28" key="GridCell.Tab.0.left/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630393" />
+    <state width="1877" height="275" key="GridCell.Tab.0.right" timestamp="1598000181098">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state width="1877" height="275" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1598000181098" />
+    <state width="1921" height="28" key="GridCell.Tab.0.right/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717630394" />
+    <state x="490" y="174" key="Maven.ArtifactSearchDialog" timestamp="1597988929076">
+      <screen x="0" y="0" width="1920" height="1040" />
+    </state>
+    <state x="490" y="174" key="Maven.ArtifactSearchDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1597988929076" />
+    <state x="244" y="31" key="SettingsEditor" timestamp="1598070794880">
+      <screen x="0" y="23" width="1280" height="730" />
+    </state>
     <state x="366" y="78" key="SettingsEditor/0.0.1920.1040@0.0.1920.1040" timestamp="1597481540846" />
+    <state x="244" y="31" key="SettingsEditor/0.23.1280.730@0.23.1280.730" timestamp="1598070794880" />
     <state x="452" y="193" key="Vcs.Push.Dialog.v2" timestamp="1597717645717">
       <screen x="0" y="0" width="1920" height="1050" />
     </state>
     <state x="452" y="193" key="Vcs.Push.Dialog.v2/0.0.1920.1050/-1920.0.1920.1050@0.0.1920.1050" timestamp="1597717645717" />
+    <state x="121" y="23" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1598079461206">
+      <screen x="0" y="23" width="1280" height="732" />
+    </state>
+    <state x="121" y="23" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser/0.23.1280.732@0.23.1280.732" timestamp="1598079461206" />
+    <state x="424" y="165" key="refactoring.ChangeSignatureDialog" timestamp="1598081009986">
+      <screen x="0" y="23" width="1280" height="732" />
+    </state>
+    <state x="424" y="165" key="refactoring.ChangeSignatureDialog/0.23.1280.732@0.23.1280.732" timestamp="1598081009986" />
+    <state x="305" y="77" key="search.everywhere.popup" timestamp="1598075207299">
+      <screen x="0" y="23" width="1280" height="730" />
+    </state>
+    <state x="305" y="77" key="search.everywhere.popup/0.23.1280.730@0.23.1280.730" timestamp="1598075207299" />
   </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />

pom.xml

@@ -31,6 +31,7 @@
         <mybatis.plus.version>3.0.5</mybatis.plus.version>
         <hutool.version>4.1.19</hutool.version>
         <fastjson.version>1.2.22</fastjson.version>
+        <org.mapstruct.version>1.3.0.Final</org.mapstruct.version>
     </properties>
 
 
@@ -241,6 +242,19 @@
             <version>1.0.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
+
+        <!-- MapStruct -->
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-jdk8</artifactId>
+            <version>${org.mapstruct.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-processor</artifactId>
+            <version>${org.mapstruct.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -262,7 +276,7 @@
         </resources>
     </build>
 
-    <repositories>
+    <!--<repositories>
         <repository>
             <id>nexus</id>
             <name>local private nexus</name>
@@ -287,6 +301,6 @@
                 <enabled>true</enabled>
             </snapshots>
         </pluginRepository>
-    </pluginRepositories>
+    </pluginRepositories>-->
 
 </project>

wms-parent.iml

@@ -10,6 +10,15 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-system-manage:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-file:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-message:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-bill-manage:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-report:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: eu.bitwalker:UserAgentUtils:1.20" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-base-system:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.3.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct-processor:1.3.0.Final" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-project-seed:1.0.0-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.squareup.okhttp:okhttp:2.7.5" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.squareup.okio:okio:1.6.0" level="project" />
@@ -95,7 +104,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:jconsole:1.8.0">
         <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_251/lib/jconsole.jar!/" />
+          <root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_221.jdk/Contents/Home/lib/jconsole.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -104,7 +113,7 @@
     <orderEntry type="module-library">
       <library name="Maven: com.alibaba:tools:1.8.0">
         <CLASSES>
-          <root url="jar://C:/Program Files/Java/jdk1.8.0_251/lib/tools.jar!/" />
+          <root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_221.jdk/Contents/Home/lib/tools.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -128,7 +137,6 @@
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" 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.mapstruct:mapstruct:1.1.0.Final" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.10.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.13" level="project" />
     <orderEntry type="library" name="Maven: org.apache.poi:poi:3.13" level="project" />
@@ -159,5 +167,14 @@
     <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.25" level="project" />
     <orderEntry type="module" module-name="wms-produce-manage" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-system-manage:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-file:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-message:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-bill-manage:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-report:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: eu.bitwalker:UserAgentUtils:1.20" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.deer:wms-base-system:1.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.3.0.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct-processor:1.3.0.Final" level="project" />
   </component>
 </module>

wms-produce-manage/pom.xml

@@ -33,6 +33,16 @@
             <version>${project.version}</version>
             <!--<scope>compile</scope>-->
         </dependency>
+        <dependency>
+            <groupId>com.deer</groupId>
+            <artifactId>wms-system-manage</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.deer</groupId>
+            <artifactId>wms-base-system</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
     </dependencies>
     <build>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/constant/ProduceManagePublicMethod.java

@@ -42,4 +42,9 @@ public class ProduceManagePublicMethod {
         String code = creatBatchDetCode(new Date(), 10, "1",  "1");
        System.out.println("----------"+code);
    }
+
+   public static String getUUID(){
+       String uuid = UUID.randomUUID().toString().replace("-", "");
+       return uuid;
+   }
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByAShelfMapper.java

@@ -2,5 +2,9 @@ package com.deer.wms.produce.manage.dao;
 
 import com.deer.wms.produce.manage.model.MtAloneByAShelf;
 import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
 public interface MtAloneByAShelfMapper extends Mapper<MtAloneByAShelf> {
+    List<MtAloneByAShelf> getAllByShelfStatus(MtAloneByAShelf aShelfStatus);
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByCoatingGlueMapper.java

@@ -2,5 +2,9 @@ package com.deer.wms.produce.manage.dao;
 
 import com.deer.wms.produce.manage.model.MtAloneByCoatingGlue;
 import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
 public interface MtAloneByCoatingGlueMapper extends Mapper<MtAloneByCoatingGlue> {
+    List<MtAloneByCoatingGlue> getAllByCompany(Integer companyId);
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByOrderInfoMapper.java

@@ -1,6 +1,12 @@
 package com.deer.wms.produce.manage.dao;
 
 import com.deer.wms.produce.manage.model.MtAloneByOrderInfo;
+import com.deer.wms.produce.manage.model.MtAloneByOrderInfoParams;
 import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
 public interface MtAloneByOrderInfoMapper extends Mapper<MtAloneByOrderInfo> {
+    List<MtAloneByOrderInfo> findList(MtAloneByOrderInfoParams params);
+
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByProductInfoMapper.java

@@ -1,6 +1,16 @@
 package com.deer.wms.produce.manage.dao;
 
 import com.deer.wms.produce.manage.model.MtAloneByProductInfo;
+import com.deer.wms.produce.manage.model.MtAloneByProductInfoParams;
+import com.deer.wms.produce.manage.model.MtAloneByProductInfoVo;
 import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
 public interface MtAloneByProductInfoMapper extends Mapper<MtAloneByProductInfo> {
+    void deleteByOrderInfoId(Integer id);
+
+    List<MtAloneByProductInfo> findByOrderInfoId(Integer id);
+
+    MtAloneByProductInfoVo initiationProcess(MtAloneByProductInfoParams params);
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByWeavClothMapper.java

@@ -1,6 +1,11 @@
 package com.deer.wms.produce.manage.dao;
 
 import com.deer.wms.produce.manage.model.MtAloneByWeavCloth;
+import com.deer.wms.produce.manage.model.MtAloneByWeavClothParams;
 import com.deer.wms.project.seed.core.mapper.Mapper;
+
+import java.util.List;
+
 public interface MtAloneByWeavClothMapper extends Mapper<MtAloneByWeavCloth> {
+    List<MtAloneByWeavCloth> greyCloth(MtAloneByWeavClothParams params);
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneProcessMapper.java

@@ -17,5 +17,7 @@ public interface MtAloneProcessMapper extends Mapper<MtAloneProcess> {
 
     List<MtAloneProcessDo> findDetectProcessByBatchDet(ProductProcessBatchDetParams params);
 
+    List<MtAloneProcess> getSupplier(MtAloneProcessParams mtAloneProcessParams);
+
     //List<Integer> processStepListByProdprocid(ProductProcessParams params);
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByAShelfMapper.xml

@@ -14,4 +14,11 @@
     <result column="a_shelf_name" jdbcType="VARCHAR" property="aShelfName" />
     <result column="note" jdbcType="VARCHAR" property="note" />
   </resultMap>
+
+  <select id="getAllByShelfStatus" parameterType="com.deer.wms.produce.manage.model.MtAloneByAShelf" resultMap="BaseResultMap">
+    SELECT *
+    FROM mt_alone_by_a_shelf
+    WHERE a_shelf_status = #{aShelfStatus}
+    AND company_id = #{companyId}
+  </select>
 </mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByCoatingGlueMapper.xml

@@ -16,4 +16,10 @@
     <result column="spec" jdbcType="VARCHAR" property="spec" />
     <result column="note" jdbcType="VARCHAR" property="note" />
   </resultMap>
+  <select id="getAllByCompany" parameterType="Integer" resultMap="BaseResultMap">
+    SELECT *
+    FROM mt_alone_by_coating_glue
+    WHERE gule_status = 0
+    AND company_id = #{companyId}
+  </select>
 </mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByOrderInfoMapper.xml

@@ -28,4 +28,28 @@
     <result column="description" jdbcType="VARCHAR" property="description" />
     <result column="note" jdbcType="VARCHAR" property="note" />
   </resultMap>
+
+
+  <select id="findList" resultMap="BaseResultMap">
+    SELECT id,operator_id,create_time,update_time,creator_id,updater_id,order_status,order_name,order_code,follow_id,follow_name,
+    schedule,carry_out_time,client_id,client_code,client_name,client_tel,ship_time,description,note
+    FROM mt_alone_by_order_info
+    <where>
+      <if test="keywords != null and keywords != ''">
+        order_code LIKE CONCAT('%', #{keywords}, '%')
+        OR client_code LIKE CONCAT('%', #{keywords}, '%')
+        OR order_name LIKE CONCAT('%', #{keywords}, '%')
+      </if>
+      <if test="beginTime!=null and beginTime!=''">
+        <![CDATA[  AND DATE_FORMAT(create_time, '%Y-%m-%d')>=  DATE_FORMAT(#{beginTime}, '%Y-%m-%d')   ]]>
+      </if>
+      <if test="endTime!=null and endTime!=''">
+        <![CDATA[  AND DATE_FORMAT(create_time, '%Y-%m-%d') <= DATE_FORMAT(#{endTime}, '%Y-%m-%d')    ]]>
+      </if>
+      <if test="companyId != null">
+        AND mappb.company_id = #{companyId}
+      </if>
+      AND order_status = 0
+    </where>
+  </select>
 </mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByProductInfoMapper.xml

@@ -34,4 +34,28 @@
     <result column="deliver_goods" jdbcType="INTEGER" property="deliverGoods" />
     <result column="complete" jdbcType="INTEGER" property="complete" />
   </resultMap>
+
+  <resultMap id="BaseResultMapAndOrder" type="com.deer.wms.produce.manage.model.MtAloneByOrderInfo" extends="BaseResultMap">
+    <result column="order_code" jdbcType="VARCHAR" property="orderCode" />
+    <result column="client_code" jdbcType="VARCHAR" property="clientCode" />
+  </resultMap>
+
+  <delete id="deleteByOrderInfoId" parameterType="Integer">
+    delete FROM mt_alone_by_product_info
+    WHERE order_info_id = #{id}
+  </delete>
+
+  <select id="findByOrderInfoId" parameterType="Integer" resultMap="BaseResultMap">
+    SELECT *
+    FROM mt_alone_by_product_info
+    WHERE order_info_id = #{id}
+    AND product_status = 0
+  </select>
+
+  <select id="initiationProcess" resultType="com.deer.wms.produce.manage.model.MtAloneByProductInfoVo" parameterType="com.deer.wms.produce.manage.model.MtAloneByProductInfoParams">
+    SELECT mabpi.*,maboi.*
+    FROM mt_alone_by_product_info mabpi
+    LEFT JOIN mt_alone_by_order_info maboi ON mabpi.order_info_id = maboi.id
+    WHERE mabpi.id = #{params.id}
+  </select>
 </mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByWeavClothMapper.xml

@@ -28,4 +28,12 @@
     <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
     <result column="note" jdbcType="VARCHAR" property="note" />
   </resultMap>
+
+  <select id="greyCloth" parameterType="com.deer.wms.produce.manage.model.MtAloneByWeavClothParams" resultMap="BaseResultMap">
+    SELECT *
+    FROM mt_alone_by_weav_cloth
+    WHERE is_stock = #{params.isStock}
+    AND company_id = #{params.companyId}
+    AND product_id = #{params.productId}
+  </select>
 </mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMapper.xml

@@ -172,4 +172,10 @@
         </where> ORDER BY process.process_step ASC
     </select>
 
+    <select id="getSupplier" resultMap="BaseResultMap" parameterType="com.deer.wms.produce.manage.model.MtAloneProcessParams">
+       SELECT *
+       FROM mt_alone_processor
+       WHERE company_id = #{companyId}
+    </select>
+
 </mapper>

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapstruct/MtAloneByOrderInfoMapping.java

@@ -0,0 +1,16 @@
+package com.deer.wms.produce.manage.mapstruct;
+
+import com.deer.wms.produce.manage.model.MtAloneByOrderInfo;
+import com.deer.wms.produce.manage.model.MtAloneByOrderInfoVo;
+import org.mapstruct.Mapper;
+
+/**
+ * @Author weihongyang
+ * @Date 2020/8/21 16:24
+ * @Version 1.0
+ */
+@Mapper
+public interface MtAloneByOrderInfoMapping {
+
+    MtAloneByOrderInfoVo MtAloneByOrderInfoToMtAloneByOrderInfoVo(MtAloneByOrderInfo mtAloneByOrderInfo);
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByCoatingGlue.java

@@ -25,6 +25,12 @@ public class MtAloneByCoatingGlue {
     @Column(name = "gule_status")
     private Integer guleStatus;
 
+    /**
+     * 绑定公司id
+     */
+    @Column(name = "company_id")
+    private Integer companyId;
+
     /**
      * 胶水类型，数字字典code，内容：打底胶水，面涂胶水，其它胶水
      */
@@ -117,6 +123,14 @@ public class MtAloneByCoatingGlue {
         return guleStatus;
     }
 
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
     /**
      * 设置状态		0处理中，1处理完成，2逻辑删除
      *

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByOrderInfo.java

@@ -1,5 +1,7 @@
 package com.deer.wms.produce.manage.model;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
 import java.util.Date;
 import javax.persistence.*;
 
@@ -521,4 +523,11 @@ public class MtAloneByOrderInfo {
     public void setNote(String note) {
         this.note = note;
     }
+
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByOrderInfoParams.java

@@ -2,8 +2,60 @@ package com.deer.wms.produce.manage.model;
 
 import com.deer.wms.project.seed.core.service.QueryParams;
 
+import java.util.List;
+
 /**
 * Created by  on 2020/08/18.
 */
 public class MtAloneByOrderInfoParams extends QueryParams {
+
+    private String beginTime;
+
+    private String endTime;
+
+    private Integer id;
+
+    private MtAloneByOrderInfo mtAloneByOrderInfo;
+
+    private List<MtAloneByProductInfo> mtAloneByProductInfoList;
+
+    public String getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(String beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public MtAloneByOrderInfo getMtAloneByOrderInfo() {
+        return mtAloneByOrderInfo;
+    }
+
+    public void setMtAloneByOrderInfo(MtAloneByOrderInfo mtAloneByOrderInfo) {
+        this.mtAloneByOrderInfo = mtAloneByOrderInfo;
+    }
+
+    public List<MtAloneByProductInfo> getMtAloneByProductInfoList() {
+        return mtAloneByProductInfoList;
+    }
+
+    public void setMtAloneByProductInfoList(List<MtAloneByProductInfo> mtAloneByProductInfoList) {
+        this.mtAloneByProductInfoList = mtAloneByProductInfoList;
+    }
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByOrderInfoVo.java

@@ -0,0 +1,21 @@
+package com.deer.wms.produce.manage.model;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Author weihongyang
+ * @Date 2020/8/21 15:09
+ * @Version 1.0
+ */
+public class MtAloneByOrderInfoVo extends MtAloneByOrderInfo{
+    private List<MtAloneByProductInfo> mtAloneByProductInfos;
+
+    public List<MtAloneByProductInfo> getMtAloneByProductInfos() {
+        return mtAloneByProductInfos;
+    }
+
+    public void setMtAloneByProductInfos(List<MtAloneByProductInfo> mtAloneByProductInfos) {
+        this.mtAloneByProductInfos = mtAloneByProductInfos;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByProductInfo.java

@@ -112,6 +112,11 @@ public class MtAloneByProductInfo {
      */
     private String note;
 
+    /**
+     * 发起流程
+     */
+    private String initiationProcess;
+
     /**
      * 现货     是否 全部ok		1 true，2 false
      */
@@ -501,6 +506,14 @@ public class MtAloneByProductInfo {
         this.note = note;
     }
 
+    public String getInitiationProcess() {
+        return initiationProcess;
+    }
+
+    public void setInitiationProcess(String initiationProcess) {
+        this.initiationProcess = initiationProcess;
+    }
+
     /**
      * 获取现货     是否 全部ok		1 true，2 false
      *

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByProductInfoParams.java

@@ -6,4 +6,13 @@ import com.deer.wms.project.seed.core.service.QueryParams;
 * Created by  on 2020/08/18.
 */
 public class MtAloneByProductInfoParams extends QueryParams {
+    private Integer id;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByProductInfoVo.java

@@ -0,0 +1,28 @@
+package com.deer.wms.produce.manage.model;
+
+/**
+ * @Author weihongyang
+ * @Date 2020/8/24 9:40
+ * @Version 1.0
+ */
+public class MtAloneByProductInfoVo extends MtAloneByProductInfo{
+    private String orderCode;
+
+    private String clientCode;
+
+    public String getOrderCode() {
+        return orderCode;
+    }
+
+    public void setOrderCode(String orderCode) {
+        this.orderCode = orderCode;
+    }
+
+    public String getClientCode() {
+        return clientCode;
+    }
+
+    public void setClientCode(String clientCode) {
+        this.clientCode = clientCode;
+    }
+}

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByWeavClothParams.java

@@ -6,4 +6,23 @@ import com.deer.wms.project.seed.core.service.QueryParams;
 * Created by  on 2020/08/18.
 */
 public class MtAloneByWeavClothParams extends QueryParams {
+    private Integer isStock;
+
+    private Integer productId;
+
+    public Integer getIsStock() {
+        return isStock;
+    }
+
+    public void setIsStock(Integer isStock) {
+        this.isStock = isStock;
+    }
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByAShelfService.java

@@ -1,7 +1,6 @@
 package com.deer.wms.produce.manage.service;
 
 import com.deer.wms.produce.manage.model.MtAloneByAShelf;
-import com.deer.wms.produce.manage.model.MtAloneByAShelfParams;
 
 import com.deer.wms.project.seed.core.service.Service;
 import java.util.List;
@@ -11,6 +10,6 @@ import java.util.List;
  */
 public interface MtAloneByAShelfService extends Service<MtAloneByAShelf, Integer> {
 
-
+    List<MtAloneByAShelf> getAllByShelfStatus(MtAloneByAShelf mtAloneByAShelf);
 
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByCoatingGlueService.java

@@ -12,5 +12,5 @@ import java.util.List;
 public interface MtAloneByCoatingGlueService extends Service<MtAloneByCoatingGlue, Integer> {
 
 
-
+    List<MtAloneByCoatingGlue> getAllByCompany(Integer companyId);
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByOrderInfoService.java

@@ -3,6 +3,7 @@ package com.deer.wms.produce.manage.service;
 import com.deer.wms.produce.manage.model.MtAloneByOrderInfo;
 import com.deer.wms.produce.manage.model.MtAloneByOrderInfoParams;
 
+import com.deer.wms.produce.manage.model.MtAloneByOrderInfoVo;
 import com.deer.wms.project.seed.core.service.Service;
 import java.util.List;
 
@@ -12,5 +13,7 @@ import java.util.List;
 public interface MtAloneByOrderInfoService extends Service<MtAloneByOrderInfo, Integer> {
 
 
+    List<MtAloneByOrderInfo> findList(MtAloneByOrderInfoParams params);
 
+    MtAloneByOrderInfo findByIdStatus(Integer id);
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByProductInfoService.java

@@ -3,6 +3,7 @@ package com.deer.wms.produce.manage.service;
 import com.deer.wms.produce.manage.model.MtAloneByProductInfo;
 import com.deer.wms.produce.manage.model.MtAloneByProductInfoParams;
 
+import com.deer.wms.produce.manage.model.MtAloneByProductInfoVo;
 import com.deer.wms.project.seed.core.service.Service;
 import java.util.List;
 
@@ -12,5 +13,9 @@ import java.util.List;
 public interface MtAloneByProductInfoService extends Service<MtAloneByProductInfo, Integer> {
 
 
+    void deleteByOrderInfoId(Integer id);
 
+    List<MtAloneByProductInfo> findByOrderInfoId(Integer id);
+
+    MtAloneByProductInfoVo initiationProcess(MtAloneByProductInfoParams params);
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByWeavClothService.java

@@ -12,5 +12,5 @@ import java.util.List;
 public interface MtAloneByWeavClothService extends Service<MtAloneByWeavCloth, Integer> {
 
 
-
+    List<MtAloneByWeavCloth> greyCloth(MtAloneByWeavClothParams params);
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProcessService.java

@@ -24,5 +24,7 @@ public interface MtAloneProcessService extends Service<MtAloneProcess, Integer>
 
     List<MtAloneProcessDo> findDetectProcessByBatchDet(ProductProcessBatchDetParams params);
 
+    List<MtAloneProcess> getSupplier(MtAloneProcessParams mtAloneProcessParams);
+
     //List<Integer> processStepListByProdprocid(ProductProcessParams params);
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByAShelfServiceImpl.java

@@ -2,7 +2,6 @@ package com.deer.wms.produce.manage.service.impl;
 
 import com.deer.wms.produce.manage.dao.MtAloneByAShelfMapper;
 import com.deer.wms.produce.manage.model.MtAloneByAShelf;
-import com.deer.wms.produce.manage.model.MtAloneByAShelfParams;
 import com.deer.wms.produce.manage.service.MtAloneByAShelfService;
 
 import com.deer.wms.project.seed.core.service.AbstractService;
@@ -22,5 +21,8 @@ public class MtAloneByAShelfServiceImpl extends AbstractService<MtAloneByAShelf,
     private MtAloneByAShelfMapper mtAloneByAShelfMapper;
 
 
-
+    @Override
+    public List<MtAloneByAShelf> getAllByShelfStatus(MtAloneByAShelf mtAloneByAShelf) {
+        return mtAloneByAShelfMapper.getAllByShelfStatus(mtAloneByAShelf);
+    }
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByCoatingGlueServiceImpl.java

@@ -22,5 +22,8 @@ public class MtAloneByCoatingGlueServiceImpl extends AbstractService<MtAloneByCo
     private MtAloneByCoatingGlueMapper mtAloneByCoatingGlueMapper;
 
 
-
+    @Override
+    public List<MtAloneByCoatingGlue> getAllByCompany(Integer companyId) {
+        return mtAloneByCoatingGlueMapper.getAllByCompany(companyId);
+    }
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByOrderInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.deer.wms.produce.manage.service.impl;
 import com.deer.wms.produce.manage.dao.MtAloneByOrderInfoMapper;
 import com.deer.wms.produce.manage.model.MtAloneByOrderInfo;
 import com.deer.wms.produce.manage.model.MtAloneByOrderInfoParams;
+import com.deer.wms.produce.manage.model.MtAloneByOrderInfoVo;
 import com.deer.wms.produce.manage.service.MtAloneByOrderInfoService;
 
 import com.deer.wms.project.seed.core.service.AbstractService;
@@ -22,5 +23,9 @@ public class MtAloneByOrderInfoServiceImpl extends AbstractService<MtAloneByOrde
     private MtAloneByOrderInfoMapper mtAloneByOrderInfoMapper;
 
 
+    @Override
+    public List<MtAloneByOrderInfo> findList(MtAloneByOrderInfoParams params) {
+        return mtAloneByOrderInfoMapper.findList(params);
+    }
 
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByProductInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.deer.wms.produce.manage.service.impl;
 import com.deer.wms.produce.manage.dao.MtAloneByProductInfoMapper;
 import com.deer.wms.produce.manage.model.MtAloneByProductInfo;
 import com.deer.wms.produce.manage.model.MtAloneByProductInfoParams;
+import com.deer.wms.produce.manage.model.MtAloneByProductInfoVo;
 import com.deer.wms.produce.manage.service.MtAloneByProductInfoService;
 
 import com.deer.wms.project.seed.core.service.AbstractService;
@@ -22,5 +23,18 @@ public class MtAloneByProductInfoServiceImpl extends AbstractService<MtAloneByPr
     private MtAloneByProductInfoMapper mtAloneByProductInfoMapper;
 
 
+    @Override
+    public void deleteByOrderInfoId(Integer id) {
+        mtAloneByProductInfoMapper.deleteByOrderInfoId(id);
+    }
 
+    @Override
+    public List<MtAloneByProductInfo> findByOrderInfoId(Integer id) {
+        return mtAloneByProductInfoMapper.findByOrderInfoId(id);
+    }
+
+    @Override
+    public MtAloneByProductInfoVo initiationProcess(MtAloneByProductInfoParams params) {
+        return mtAloneByProductInfoMapper.initiationProcess(params);
+    }
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByWeavClothServiceImpl.java

@@ -22,4 +22,8 @@ public class MtAloneByWeavClothServiceImpl extends AbstractService<MtAloneByWeav
     private MtAloneByWeavClothMapper mtAloneByWeavClothMapper;
 
 
+    @Override
+    public List<MtAloneByWeavCloth> greyCloth(MtAloneByWeavClothParams params) {
+        return mtAloneByWeavClothMapper.greyCloth(params);
+    }
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java

@@ -122,6 +122,11 @@ public class MtAloneProcessServiceImpl extends AbstractService<MtAloneProcess, I
         return mtAloneProcessMapper.findDetectProcessByBatchDet(params);
     }
 
+    @Override
+    public List<MtAloneProcess> getSupplier(MtAloneProcessParams mtAloneProcessParams) {
+        return mtAloneProcessMapper.getSupplier(mtAloneProcessParams);
+    }
+
     //@Override
     //public List<Integer> processStepListByProdprocid(ProductProcessParams params) {
     //    return mtAloneProcessMapper.processStepListByProdprocid(params);

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByAShelfController.java

@@ -29,7 +29,7 @@ import java.util.List;
 /**
 * Created by  on 2020/08/18.
 */
-@Api(description = "xxx接口")
+@Api(description = "A字架接口")
 @RestController
 @RequestMapping("/mt/alone/by/a/shelfs")
 public class MtAloneByAShelfController {
@@ -90,4 +90,19 @@ public class MtAloneByAShelfController {
         return ResultGenerator.genSuccessResult(pageInfo);
     }
 
+    /**
+     * 查询全部可用的a子架
+     */
+    @PostMapping("/get/all/by/shelf/status")
+    public Result getAllByShelfStatus(@ApiIgnore @User CurrentUser currentUser){
+        if(currentUser==null){
+            return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
+        }
+        MtAloneByAShelf mtAloneByAShelf = new MtAloneByAShelf();
+        mtAloneByAShelf.setCompanyId(currentUser.getCompanyId());
+        mtAloneByAShelf.setaShelfStatus(0);
+        List<MtAloneByAShelf> list = mtAloneByAShelfService.getAllByShelfStatus(mtAloneByAShelf);
+        return ResultGenerator.genSuccessResult(list);
+    }
+
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByCoatingGlueController.java

@@ -30,7 +30,7 @@ import java.util.List;
 /**
 * Created by  on 2020/08/18.
 */
-@Api(description = "xxx接口")
+@Api(description = "胶水接口")
 @RestController
 @RequestMapping("/mt/alone/by/coating/glues")
 public class MtAloneByCoatingGlueController {
@@ -90,4 +90,15 @@ public class MtAloneByCoatingGlueController {
         return ResultGenerator.genSuccessResult(pageInfo);
     }
 
+    /**
+     * 查询全部胶水   条件公司id
+     */
+    @GetMapping("/get/all/by/company")
+    public Result getAllByCompany(@ApiIgnore @User CurrentUser currentUser) {
+        if (currentUser == null) {
+            return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR, "未登录错误", null);
+        }
+        List<MtAloneByCoatingGlue> list = mtAloneByCoatingGlueService.getAllByCompany(currentUser.getCompanyId());
+        return ResultGenerator.genSuccessResult(list);
+    }
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByOrderInfoController.java

@@ -1,16 +1,25 @@
 package com.deer.wms.produce.manage.web;
 
-import com.deer.wms.produce.manage.model.MtAloneByAShelf;
+import com.deer.wms.base.system.model.ClientManage;
+import com.deer.wms.base.system.model.ClientManageCriteria;
+import com.deer.wms.base.system.service.ClientManageService;
+import com.deer.wms.produce.manage.constant.ProduceManagePublicMethod;
+import com.deer.wms.produce.manage.mapstruct.MtAloneByOrderInfoMapping;
+import com.deer.wms.produce.manage.model.*;
+import com.deer.wms.produce.manage.service.MtAloneByProductInfoService;
 import com.deer.wms.project.seed.annotation.OperateLog;
 import com.deer.wms.project.seed.constant.SystemManageConstant;
 import com.deer.wms.project.seed.core.result.CommonCode;
 import com.deer.wms.project.seed.core.result.Result;
 import com.deer.wms.project.seed.core.result.ResultGenerator;
-import com.deer.wms.produce.manage.model.MtAloneByOrderInfo;
-import com.deer.wms.produce.manage.model.MtAloneByOrderInfoParams;
 import com.deer.wms.produce.manage.service.MtAloneByOrderInfoService;
 import com.deer.wms.intercept.annotation.User;
 import com.deer.wms.intercept.common.data.CurrentUser;
+import com.deer.wms.system.manage.model.user.UserInfo;
+import com.deer.wms.system.manage.model.user.UserInfoCriteria;
+import com.deer.wms.system.manage.model.user.UserInfoVO;
+import com.deer.wms.system.manage.model.user.UserListVO;
+import com.deer.wms.system.manage.service.UserInfoService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 
@@ -30,7 +39,7 @@ import java.util.List;
 /**
 * Created by  on 2020/08/18.
 */
-@Api(description = "xxx接口")
+@Api(description = "订单接口")
 @RestController
 @RequestMapping("/mt/alone/by/order/infos")
 public class MtAloneByOrderInfoController {
@@ -38,43 +47,107 @@ public class MtAloneByOrderInfoController {
     @Autowired
     private MtAloneByOrderInfoService mtAloneByOrderInfoService;
 
-    @OperateLog(description = "添加xxx", type = "增加")
+    @Autowired
-    @ApiOperation(value = "添加xxx", notes = "添加xxx")
+    private ClientManageService clientManageService;
+
+    @Autowired
+    private UserInfoService userInfoService;
+
+    @Autowired
+    private MtAloneByProductInfoService mtAloneByProductInfoService;
+
+    @Autowired
+    private MtAloneByOrderInfoMapping mtAloneByOrderInfoMapping;
+
+    @OperateLog(description = "添加订单", type = "增加")
+    @ApiOperation(value = "添加订单", notes = "添加订单")
     @PostMapping("/add")
-    public Result add(@RequestBody MtAloneByOrderInfo mtAloneByOrderInfo, @ApiIgnore @User CurrentUser currentUser) {
+    public Result add(@RequestBody MtAloneByOrderInfoParams mtAloneByOrderInfoParams, @ApiIgnore @User CurrentUser currentUser) {
         if(currentUser==null){
             return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null );
         }
-		 mtAloneByOrderInfo.setCreateTime(new Date());
+        mtAloneByOrderInfoParams.getMtAloneByOrderInfo().setCreateTime(new Date());
-		 mtAloneByOrderInfo.setCompanyId(currentUser.getCompanyId());
+        mtAloneByOrderInfoParams.getMtAloneByOrderInfo().setCompanyId(currentUser.getCompanyId());
-        mtAloneByOrderInfoService.save(mtAloneByOrderInfo);
+        mtAloneByOrderInfoService.save(mtAloneByOrderInfoParams.getMtAloneByOrderInfo());
+        for (MtAloneByProductInfo mtAloneByProductInfo:mtAloneByOrderInfoParams.getMtAloneByProductInfoList()) {
+            mtAloneByProductInfo.setCreateTime(new Date());
+            mtAloneByProductInfo.setCompanyId(currentUser.getCompanyId());
+        }
+        mtAloneByProductInfoService.save(mtAloneByOrderInfoParams.getMtAloneByProductInfoList());
         return ResultGenerator.genSuccessResult();
     }
     
-    @OperateLog(description = "删除xxx", type = "删除")
+    @OperateLog(description = "删除订单", type = "删除")
-    @ApiOperation(value = "删除xxx", notes = "删除xxx")
+    @ApiOperation(value = "删除订单", notes = "删除订单")
-    @DeleteMapping("/delete/{id}")
+    @PostMapping("/delete/{id}")
     public Result delete(@PathVariable Integer Id) {
+        mtAloneByProductInfoService.deleteByOrderInfoId(Id);
         mtAloneByOrderInfoService.deleteById(Id);
         return ResultGenerator.genSuccessResult();
     }
 
-    @OperateLog(description = "修改xxx", type = "更新")
+    /**
-    @ApiOperation(value = "修改xxx", notes = "修改xxx")
+     * 修改保存
+     * @param mtAloneByOrderInfoParams
+     * @return
+     */
+    @OperateLog(description = "修改订单", type = "更新")
+    @ApiOperation(value = "修改订单", notes = "修改订单")
     @PostMapping("/update")
-    public Result update(@RequestBody MtAloneByOrderInfo mtAloneByOrderInfo) {
+    public Result update(@RequestBody MtAloneByOrderInfoParams mtAloneByOrderInfoParams) {
-        mtAloneByOrderInfo.setUpdateTime(new Date());
+        mtAloneByOrderInfoParams.getMtAloneByOrderInfo().setUpdateTime(new Date());
-        mtAloneByOrderInfoService.update(mtAloneByOrderInfo);
+        mtAloneByOrderInfoService.update(mtAloneByOrderInfoParams.getMtAloneByOrderInfo());
+        for (MtAloneByProductInfo mtAloneByProductInfo:mtAloneByOrderInfoParams.getMtAloneByProductInfoList()) {
+            mtAloneByProductInfo.setUpdateTime(new Date());
+            mtAloneByProductInfoService.update(mtAloneByProductInfo);
+        }
         return ResultGenerator.genSuccessResult();
     }
 
+    /**
+     * 根据订单id查询出来产品信息并且分页
+     * @param
+     * @return
+     */
+    @GetMapping("/update/for/product/info")
+    public Result updateForProductInfo(MtAloneByOrderInfoParams params, @ApiIgnore @User CurrentUser currentUser){
+        if(currentUser==null){
+            return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
+        }
+
+        if (currentUser.getCompanyType() != SystemManageConstant.COMPANY_TYPE_MT){
+            params.setCompanyId(currentUser.getCompanyId());
+        }else{
+            params.setCompanyId(null);
+        }
+        PageHelper.startPage(params.getPageNum(), params.getPageSize());
+        List<MtAloneByProductInfo> mtAloneByProductInfoList = mtAloneByProductInfoService.findByOrderInfoId(params.getId());
+        PageInfo pageInfo = new PageInfo(mtAloneByProductInfoList);
+        /*MtAloneByOrderInfo mtAloneByOrderInfo = mtAloneByOrderInfoService.findById(id);
+        List<MtAloneByProductInfo> mtAloneByProductInfos = mtAloneByProductInfoService.findByOrderInfoId(id);
+        MtAloneByOrderInfoVo mtAloneByOrderInfoVo = mtAloneByOrderInfoMapping.MtAloneByOrderInfoToMtAloneByOrderInfoVo(mtAloneByOrderInfo);
+        mtAloneByOrderInfoVo.setMtAloneByProductInfos(mtAloneByProductInfos);
+        */
+        return ResultGenerator.genSuccessResult(pageInfo);
+    }
+
+    /**
+     * 根据订单id查询出来订单详情
+     * @param id
+     * @return
+     */
     @GetMapping("/detail/{id}")
     public Result detail(@PathVariable Integer id) {
         MtAloneByOrderInfo mtAloneByOrderInfo = mtAloneByOrderInfoService.findById(id);
         return ResultGenerator.genSuccessResult(mtAloneByOrderInfo);
     }
 
+
+    /**
+     * 订单条件列表
+     */
     @GetMapping("/list")
+    @ApiOperation(value = "查看订单", notes = "查看")
     public Result list(MtAloneByOrderInfoParams params, @ApiIgnore @User CurrentUser currentUser) {
         if(currentUser==null){
             return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
@@ -86,10 +159,49 @@ public class MtAloneByOrderInfoController {
 			params.setCompanyId(null);
         }
         PageHelper.startPage(params.getPageNum(), params.getPageSize());
-        //List<MtAloneByOrderInfo> list = mtAloneByOrderInfoService.findList(params);
+        List<MtAloneByOrderInfo> list = mtAloneByOrderInfoService.findList(params);
-        List<MtAloneByAShelf> list = new ArrayList<>();
         PageInfo pageInfo = new PageInfo(list);
         return ResultGenerator.genSuccessResult(pageInfo);
     }
 
+    /**
+     * 添加订单的时候获取uuid作为订单编码
+     */
+    @PostMapping("get/order/code")
+    public Result getOrderCode(@ApiIgnore @User CurrentUser currentUser){
+        if(currentUser==null){
+            return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
+        }
+        String orderCode = ProduceManagePublicMethod.getUUID();
+        return ResultGenerator.genSuccessResult(orderCode);
+    }
+
+    /**
+     * 新增订单的获取客户编码
+     */
+    @PostMapping("get/client/code")
+    public Result getClientCode(@ApiIgnore @User CurrentUser currentUser){
+        if(currentUser==null){
+            return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
+        }
+        ClientManageCriteria clientManageCriteria = new ClientManageCriteria();
+        clientManageCriteria.setCompanyId(currentUser.getCompanyId());
+        List<ClientManage> list = clientManageService.findList(clientManageCriteria);
+        return ResultGenerator.genSuccessResult(list);
+    }
+
+    /**
+     * 新增订单的获取跟单员
+     */
+    @PostMapping("get/follow/name")
+    public Result getFollowName(@ApiIgnore @User CurrentUser currentUser){
+        if(currentUser==null){
+            return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
+        }
+        UserInfoCriteria userInfoCriteria = new UserInfoCriteria();
+        userInfoCriteria.setCompanyId(currentUser.getCompanyId());
+        List<UserListVO> list = userInfoService.findUserFormList(userInfoCriteria);
+        return ResultGenerator.genSuccessResult(list);
+    }
+
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByProductInfoController.java

@@ -1,6 +1,11 @@
 package com.deer.wms.produce.manage.web;
 
+import com.deer.wms.base.system.model.MtAloneProductLibrary;
+import com.deer.wms.base.system.model.MtAloneProductLibraryParams;
+import com.deer.wms.base.system.service.MtAloneProductLibraryService;
+import com.deer.wms.base.system.web.MtAloneProductLibraryController;
 import com.deer.wms.produce.manage.model.MtAloneByAShelf;
+import com.deer.wms.produce.manage.model.MtAloneByProductInfoVo;
 import com.deer.wms.project.seed.annotation.OperateLog;
 import com.deer.wms.project.seed.constant.SystemManageConstant;
 import com.deer.wms.project.seed.core.result.CommonCode;
@@ -30,7 +35,7 @@ import java.util.List;
 /**
 * Created by  on 2020/08/18.
 */
-@Api(description = "xxx接口")
+@Api(description = "产品信息接口")
 @RestController
 @RequestMapping("/mt/alone/by/product/infos")
 public class MtAloneByProductInfoController {
@@ -38,6 +43,9 @@ public class MtAloneByProductInfoController {
     @Autowired
     private MtAloneByProductInfoService mtAloneByProductInfoService;
 
+    @Autowired
+    private MtAloneProductLibraryService mtAloneProductLibraryService;
+
     @OperateLog(description = "添加xxx", type = "增加")
     @ApiOperation(value = "添加xxx", notes = "添加xxx")
     @PostMapping("/add")
@@ -59,8 +67,8 @@ public class MtAloneByProductInfoController {
         return ResultGenerator.genSuccessResult();
     }
     
-    @OperateLog(description = "修改xxx", type = "更新")
+    @OperateLog(description = "修改产品信息", type = "更新")
-    @ApiOperation(value = "修改xxx", notes = "修改xxx")
+    @ApiOperation(value = "修改产品信息", notes = "修改产品信息")
     @PostMapping("/update")
     public Result update(@RequestBody MtAloneByProductInfo mtAloneByProductInfo) {
         mtAloneByProductInfo.setUpdateTime(new Date());
@@ -92,4 +100,30 @@ public class MtAloneByProductInfoController {
         return ResultGenerator.genSuccessResult(pageInfo);
     }
 
+    /**
+     * 根据公司id获取到产品池的全部产品
+     */
+    @PostMapping("/get/product/library")
+    public Result getProductLibrary(@ApiIgnore @User CurrentUser currentUser){
+        if(currentUser==null){
+            return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
+        }
+        MtAloneProductLibraryParams mtAloneProductLibraryParams = new MtAloneProductLibraryParams();
+        mtAloneProductLibraryParams.setCompanyId(currentUser.getCompanyId());
+        List<MtAloneProductLibrary> list = mtAloneProductLibraryService.findList(mtAloneProductLibraryParams);
+        return ResultGenerator.genSuccessResult(list);
+    }
+
+    /**
+     * 发起流程
+     */
+    @PostMapping("initiation/process")
+    public Result initiationProcess(MtAloneByProductInfoParams params,@ApiIgnore @User CurrentUser currentUser){
+        if(currentUser==null){
+            return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
+        }
+        MtAloneByProductInfoVo mtAloneByProductInfoVo = mtAloneByProductInfoService.initiationProcess(params);
+        return ResultGenerator.genSuccessResult(mtAloneByProductInfoVo);
+    }
+
 }

wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByWeavClothController.java

@@ -1,13 +1,12 @@
 package com.deer.wms.produce.manage.web;
 
-import com.deer.wms.produce.manage.model.MtAloneByAShelf;
+import com.deer.wms.produce.manage.model.*;
+import com.deer.wms.produce.manage.service.MtAloneProcessService;
 import com.deer.wms.project.seed.annotation.OperateLog;
 import com.deer.wms.project.seed.constant.SystemManageConstant;
 import com.deer.wms.project.seed.core.result.CommonCode;
 import com.deer.wms.project.seed.core.result.Result;
 import com.deer.wms.project.seed.core.result.ResultGenerator;
-import com.deer.wms.produce.manage.model.MtAloneByWeavCloth;
-import com.deer.wms.produce.manage.model.MtAloneByWeavClothParams;
 import com.deer.wms.produce.manage.service.MtAloneByWeavClothService;
 import com.deer.wms.intercept.annotation.User;
 import com.deer.wms.intercept.common.data.CurrentUser;
@@ -30,7 +29,7 @@ import java.util.List;
 /**
 * Created by  on 2020/08/18.
 */
-@Api(description = "xxx接口")
+@Api(description = "织布接口")
 @RestController
 @RequestMapping("/mt/alone/by/weav/cloths")
 public class MtAloneByWeavClothController {
@@ -38,8 +37,11 @@ public class MtAloneByWeavClothController {
     @Autowired
     private MtAloneByWeavClothService mtAloneByWeavClothService;
 
-    @OperateLog(description = "添加xxx", type = "增加")
+    @Autowired
-    @ApiOperation(value = "添加xxx", notes = "添加xxx")
+    private MtAloneProcessService mtAloneProcessService;
+
+    @OperateLog(description = "添加坯布", type = "增加")
+    @ApiOperation(value = "添加坯布", notes = "添加坯布")
     @PostMapping("/add")
     public Result add(@RequestBody MtAloneByWeavCloth mtAloneByWeavCloth, @ApiIgnore @User CurrentUser currentUser) {
         if(currentUser==null){
@@ -59,8 +61,8 @@ public class MtAloneByWeavClothController {
         return ResultGenerator.genSuccessResult();
     }
     
-    @OperateLog(description = "修改xxx", type = "更新")
+    @OperateLog(description = "修改坯布", type = "更新")
-    @ApiOperation(value = "修改xxx", notes = "修改xxx")
+    @ApiOperation(value = "修改坯布", notes = "修改坯布")
     @PostMapping("/update")
     public Result update(@RequestBody MtAloneByWeavCloth mtAloneByWeavCloth) {
         mtAloneByWeavCloth.setUpdateTime(new Date());
@@ -92,4 +94,31 @@ public class MtAloneByWeavClothController {
         return ResultGenerator.genSuccessResult(pageInfo);
     }
 
+    /**
+     * 坯布情况
+     */
+    @GetMapping("/grey/cloth")
+    public Result greyCloth(MtAloneByWeavClothParams params, @ApiIgnore @User CurrentUser currentUser) {
+        if(currentUser==null){
+            return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
+        }
+        params.setCompanyId(currentUser.getCompanyId());
+        List<MtAloneByWeavCloth> list = mtAloneByWeavClothService.greyCloth(params);
+        return ResultGenerator.genSuccessResult(list);
+    }
+
+    /**
+     * 获取供应商
+     */
+    @GetMapping("/get/supplier")
+    public Result getSupplier(@ApiIgnore @User CurrentUser currentUser) {
+        if(currentUser==null){
+            return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
+        }
+        MtAloneProcessParams mtAloneProcessParams = new MtAloneProcessParams();
+        mtAloneProcessParams.setCompanyId(currentUser.getCompanyId());
+        List<MtAloneProcess> mtAloneProcessList = mtAloneProcessService.getSupplier(mtAloneProcessParams);
+        return ResultGenerator.genSuccessResult(mtAloneProcessList);
+    }
+
 }