生产流程

Merge remote-tracking branch 'origin/hy2250089' into hy2250089
# Conflicts: # .idea/workspace.xml
2020-08-24 13:19:45 +08:00 · 2020-08-24 08:29:48 +08:00 · 2020-08-24 08:29:16 +08:00 · 2020-08-24 08:28:43 +08:00 · 2020-08-22 16:08:20 +08:00 · 2020-08-22 10:20:47 +08:00
36 changed files with 411 additions and 76 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,25 +8,20 @@
  </component>
  <component name="ChangeListManager">
    <list default="true" id="3fd1674b-533b-4c0c-9ac3-bba39e6841ef" name="Default" comment="mark">
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapstruct/MtAloneByOrderInfoMapping.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByOrderInfoVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__org_mapstruct_mapstruct_1_1_0_Final.xml" beforeDir="false" />
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" 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/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/constant/ProduceManagePublicMethod.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/constant/ProduceManagePublicMethod.java" afterDir="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/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/manage/dao/MtAloneByProductInfoMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByProductInfoMapper.java" afterDir="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/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/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/manage/model/MtAloneByOrderInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByOrderInfo.java" afterDir="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/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/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/manage/service/MtAloneByProductInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByProductInfoService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByOrderInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByOrderInfoServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByProductInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByProductInfoServiceImpl.java" afterDir="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/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/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/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" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -95,7 +90,7 @@
  <component name="MavenImportPreferences">
    <option name="generalSettings">
      <MavenGeneralSettings>
-        <option name="mavenHome" value="E:\idea\IntelliJ IDEA 2019.3.5\plugins\maven\lib\maven3" />
+        <option name="mavenHome" value="$APPLICATION_HOME_DIR$/plugins/maven/lib/maven3" />
      </MavenGeneralSettings>
    </option>
  </component>
@@ -156,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">
@@ -194,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" />
@@ -256,19 +264,6 @@
        <option name="Make" enabled="true" />
      </method>
    </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 default="true" type="JUnit" factoryName="JUnit">
      <option name="TEST_OBJECT" value="class" />
      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
@@ -324,13 +319,11 @@
      <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="Application.Test" />
-        <item itemvalue="Spring Boot.PmsApplication" />
        <item itemvalue="Application.CodeGenerator (1)" />
        <item itemvalue="Application.CodeGenerator" />
        <item itemvalue="Application.ProductProcessBatchDetServiceImpl" />
@@ -582,10 +575,13 @@
      <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="765" y="223" key="#com.intellij.ide.util.MemberChooser" timestamp="1597999710196">
-      <screen x="0" y="0" width="1920" height="1040" />
+    <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>
@@ -624,14 +620,27 @@
      <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="366" y="78" key="SettingsEditor" timestamp="1597481540846">
-      <screen x="0" y="0" width="1920" height="1040" />
+    <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" />
--- a/wms-parent.iml
+++ b/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 />
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByAShelfMapper.java
+++ b/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);
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByCoatingGlueMapper.java
+++ b/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);
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByOrderInfoMapper.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByOrderInfoMapper.java
@@ -2,7 +2,6 @@ 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.produce.manage.model.MtAloneByOrderInfoVo;
 import com.deer.wms.project.seed.core.mapper.Mapper;

 import java.util.List;
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByProductInfoMapper.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByProductInfoMapper.java
@@ -1,6 +1,8 @@
 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;
@@ -9,4 +11,6 @@ public interface MtAloneByProductInfoMapper extends Mapper<MtAloneByProductInfo>
    void deleteByOrderInfoId(Integer id);

    List<MtAloneByProductInfo> findByOrderInfoId(Integer id);
+
+    MtAloneByProductInfoVo initiationProcess(MtAloneByProductInfoParams params);
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneByWeavClothMapper.java
+++ b/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);
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/MtAloneProcessMapper.java
+++ b/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);
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByAShelfMapper.xml
+++ b/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>
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByCoatingGlueMapper.xml
+++ b/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>
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByOrderInfoMapper.xml
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByOrderInfoMapper.xml
@@ -49,6 +49,7 @@
      <if test="companyId != null">
        AND mappb.company_id = #{companyId}
      </if>
+      AND order_status = 0
    </where>
  </select>
 </mapper>
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByProductInfoMapper.xml
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByProductInfoMapper.xml
@@ -35,6 +35,11 @@
    <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}
@@ -44,5 +49,13 @@
    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>
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneByWeavClothMapper.xml
+++ b/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>
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/MtAloneProcessMapper.xml
+++ b/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>
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByCoatingGlue.java
+++ b/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逻辑删除
     *
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByOrderInfoParams.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByOrderInfoParams.java
@@ -2,6 +2,8 @@ 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.
 */
@@ -11,6 +13,12 @@ public class MtAloneByOrderInfoParams extends QueryParams {

    private String endTime;

+    private Integer id;
+
+    private MtAloneByOrderInfo mtAloneByOrderInfo;
+
+    private List<MtAloneByProductInfo> mtAloneByProductInfoList;
+
    public String getBeginTime() {
        return beginTime;
    }
@@ -26,4 +34,28 @@ public class MtAloneByOrderInfoParams extends QueryParams {
    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;
+    }
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByProductInfo.java
+++ b/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
     *
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByProductInfoParams.java
+++ b/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;
+    }
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByProductInfoVo.java
+++ b/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;
+    }
+}
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneByWeavClothParams.java
+++ b/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;
+    }
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByAShelfService.java
+++ b/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);

 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByCoatingGlueService.java
+++ b/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);
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByOrderInfoService.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByOrderInfoService.java
@@ -14,4 +14,6 @@ public interface MtAloneByOrderInfoService extends Service<MtAloneByOrderInfo, I


    List<MtAloneByOrderInfo> findList(MtAloneByOrderInfoParams params);
+
+    MtAloneByOrderInfo findByIdStatus(Integer id);
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByProductInfoService.java
+++ b/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;

@@ -15,4 +16,6 @@ public interface MtAloneByProductInfoService extends Service<MtAloneByProductInf
    void deleteByOrderInfoId(Integer id);

    List<MtAloneByProductInfo> findByOrderInfoId(Integer id);
+
+    MtAloneByProductInfoVo initiationProcess(MtAloneByProductInfoParams params);
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneByWeavClothService.java
+++ b/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);
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/MtAloneProcessService.java
+++ b/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);
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByAShelfServiceImpl.java
+++ b/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);
+    }
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByCoatingGlueServiceImpl.java
+++ b/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);
+    }
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByProductInfoServiceImpl.java
+++ b/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;
@@ -31,4 +32,9 @@ public class MtAloneByProductInfoServiceImpl extends AbstractService<MtAloneByPr
    public List<MtAloneByProductInfo> findByOrderInfoId(Integer id) {
        return mtAloneByProductInfoMapper.findByOrderInfoId(id);
    }
+
+    @Override
+    public MtAloneByProductInfoVo initiationProcess(MtAloneByProductInfoParams params) {
+        return mtAloneByProductInfoMapper.initiationProcess(params);
+    }
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneByWeavClothServiceImpl.java
+++ b/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);
+    }
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/MtAloneProcessServiceImpl.java
+++ b/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);
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByAShelfController.java
+++ b/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);
+    }
+
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByCoatingGlueController.java
+++ b/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);
+    }
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByOrderInfoController.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByOrderInfoController.java
@@ -59,22 +59,27 @@ public class MtAloneByOrderInfoController {
    @Autowired
    private MtAloneByOrderInfoMapping mtAloneByOrderInfoMapping;

-    @OperateLog(description = "添加xxx", type = "增加")
-    @ApiOperation(value = "添加xxx", notes = "添加xxx")
+    @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());
-		 mtAloneByOrderInfo.setCompanyId(currentUser.getCompanyId());
-        mtAloneByOrderInfoService.save(mtAloneByOrderInfo);
+        mtAloneByOrderInfoParams.getMtAloneByOrderInfo().setCreateTime(new Date());
+        mtAloneByOrderInfoParams.getMtAloneByOrderInfo().setCompanyId(currentUser.getCompanyId());
+        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 = "删除订单", type = "删除")
    @ApiOperation(value = "删除订单", notes = "删除订单")
-    @DeleteMapping("/delete/{id}")
+    @PostMapping("/delete/{id}")
    public Result delete(@PathVariable Integer Id) {
        mtAloneByProductInfoService.deleteByOrderInfoId(Id);
        mtAloneByOrderInfoService.deleteById(Id);
@@ -83,32 +88,54 @@ public class MtAloneByOrderInfoController {

    /**
     * 修改保存
-     * @param mtAloneByOrderInfo
+     * @param mtAloneByOrderInfoParams
     * @return
     */
    @OperateLog(description = "修改订单", type = "更新")
    @ApiOperation(value = "修改订单", notes = "修改订单")
    @PostMapping("/update")
-    public Result update(@RequestBody MtAloneByOrderInfo mtAloneByOrderInfo) {
-        mtAloneByOrderInfo.setUpdateTime(new Date());
-        mtAloneByOrderInfoService.update(mtAloneByOrderInfo);
+    public Result update(@RequestBody MtAloneByOrderInfoParams mtAloneByOrderInfoParams) {
+        mtAloneByOrderInfoParams.getMtAloneByOrderInfo().setUpdateTime(new Date());
+        mtAloneByOrderInfoService.update(mtAloneByOrderInfoParams.getMtAloneByOrderInfo());
+        for (MtAloneByProductInfo mtAloneByProductInfo:mtAloneByOrderInfoParams.getMtAloneByProductInfoList()) {
+            mtAloneByProductInfo.setUpdateTime(new Date());
+            mtAloneByProductInfoService.update(mtAloneByProductInfo);
+        }
        return ResultGenerator.genSuccessResult();
    }

    /**
-     * 修改订单获取修改的数据并填充
-     * @param id
+     * 根据订单id查询出来产品信息并且分页
+     * @param
     * @return
     */
-    @GetMapping("/update/for/data/{id}")
-    public Result updateForData(@PathVariable Integer id){
-        MtAloneByOrderInfo mtAloneByOrderInfo = mtAloneByOrderInfoService.findById(id);
+    @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(mtAloneByOrderInfoVo);
+        */
+        return ResultGenerator.genSuccessResult(pageInfo);
    }

+    /**
+     * 根据订单id查询出来订单详情
+     * @param id
+     * @return
+     */
    @GetMapping("/detail/{id}")
    public Result detail(@PathVariable Integer id) {
        MtAloneByOrderInfo mtAloneByOrderInfo = mtAloneByOrderInfoService.findById(id);
@@ -176,4 +203,5 @@ public class MtAloneByOrderInfoController {
        List<UserListVO> list = userInfoService.findUserFormList(userInfoCriteria);
        return ResultGenerator.genSuccessResult(list);
    }
+
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByProductInfoController.java
+++ b/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")
@@ -45,8 +53,8 @@ public class MtAloneByProductInfoController {
        if(currentUser==null){
            return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null );
        }
-		 mtAloneByProductInfo.setCreateTime(new Date());
-		 mtAloneByProductInfo.setCompanyId(currentUser.getCompanyId());
+        mtAloneByProductInfo.setCreateTime(new Date());
+        mtAloneByProductInfo.setCompanyId(currentUser.getCompanyId());
        mtAloneByProductInfoService.save(mtAloneByProductInfo);
        return ResultGenerator.genSuccessResult();
    }
@@ -59,8 +67,8 @@ public class MtAloneByProductInfoController {
        return ResultGenerator.genSuccessResult();
    }
    
-    @OperateLog(description = "修改xxx", type = "更新")
-    @ApiOperation(value = "修改xxx", notes = "修改xxx")
+    @OperateLog(description = "修改产品信息", type = "更新")
+    @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);
+    }
+
 }
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneByWeavClothController.java
+++ b/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,15 +37,18 @@ public class MtAloneByWeavClothController {
    @Autowired
    private MtAloneByWeavClothService mtAloneByWeavClothService;

-    @OperateLog(description = "添加xxx", type = "增加")
-    @ApiOperation(value = "添加xxx", notes = "添加xxx")
+    @Autowired
+    private MtAloneProcessService mtAloneProcessService;
+
+    @OperateLog(description = "添加坯布", type = "增加")
+    @ApiOperation(value = "添加坯布", notes = "添加坯布")
    @PostMapping("/add")
    public Result add(@RequestBody MtAloneByWeavCloth mtAloneByWeavCloth, @ApiIgnore @User CurrentUser currentUser) {
        if(currentUser==null){
            return ResultGenerator.genFailResult( CommonCode.SERVICE_ERROR,"未登录错误",null );
        }
-		 mtAloneByWeavCloth.setCreateTime(new Date());
-		 mtAloneByWeavCloth.setCompanyId(currentUser.getCompanyId());
+        mtAloneByWeavCloth.setCreateTime(new Date());
+        mtAloneByWeavCloth.setCompanyId(currentUser.getCompanyId());
        mtAloneByWeavClothService.save(mtAloneByWeavCloth);
        return ResultGenerator.genSuccessResult();
    }
@@ -59,8 +61,8 @@ public class MtAloneByWeavClothController {
        return ResultGenerator.genSuccessResult();
    }
    
-    @OperateLog(description = "修改xxx", type = "更新")
-    @ApiOperation(value = "修改xxx", notes = "修改xxx")
+    @OperateLog(description = "修改坯布", type = "更新")
+    @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);
+    }
+
 }
Author	SHA1	Message	Date
weihongyang	1288ed083d	生产流程	2020-08-24 13:19:45 +08:00
weihongyang	c56f73ed74	Merge remote-tracking branch 'origin/hy2250089' into hy2250089 # Conflicts: # .idea/workspace.xml	2020-08-24 08:29:48 +08:00
weihongyang	f0ca5f979c	commit init	2020-08-24 08:29:16 +08:00
weihongyang	45bc22522f	commit init	2020-08-24 08:28:43 +08:00
weihongyang	46c208ac4b	订单管理	2020-08-22 16:08:20 +08:00
weihongyang	a5f5da8b79	Merge branch 'hy2250089' of http://47.96.183.77:3000/wms-parent-manage/mt-pms-api into hy2250089 Conflicts: .idea/workspace.xml wms-parent.iml	2020-08-22 10:20:47 +08:00
weihongyang	f734f4392c	commit init	2020-08-22 10:20:24 +08:00