From ab07aed1af8d6569d07090feabd27ec358c6cf44 Mon Sep 17 00:00:00 2001
From: hy2250089 <hy2250089@qq.com>
Date: Thu, 26 Dec 2019 21:20:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B7=A5=E5=BA=8F=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E3=80=81=E4=BF=9D=E5=AD=98=E5=B7=A5=E5=BA=8F=E5=8F=8A?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/dao/ProcessMaterialsBomMapper.java |  1 +
 .../manage/mapper/MtAloneProcessMapper.xml    |  2 +-
 .../mapper/ProcessMaterialsBomMapper.xml      | 15 +++++
 .../manage/mapper/ProductProcessMapper.xml    |  2 +-
 .../manage/model/MtAloneProcessParams.java    | 10 +++
 .../manage/model/ProcessAndMaterials.java     | 30 ---------
 .../manage/model/ProcessAndMaterialsBom.java  | 32 ++++++++++
 .../manage/model/ProcessMaterialsBomVo.java   |  2 -
 .../manage/service/MtAloneProcessService.java |  2 +-
 .../service/ProcessMaterialsBomService.java   |  2 +
 .../impl/MtAloneProcessServiceImpl.java       | 63 ++++++++++++++-----
 .../impl/ProcessMaterialsBomServiceImpl.java  |  5 ++
 .../manage/web/MtAloneProcessController.java  |  8 +--
 13 files changed, 120 insertions(+), 54 deletions(-)
 delete mode 100644 wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessAndMaterials.java
 create mode 100644 wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessAndMaterialsBom.java

diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProcessMaterialsBomMapper.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProcessMaterialsBomMapper.java
index dc924bb..1666b68 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProcessMaterialsBomMapper.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/dao/ProcessMaterialsBomMapper.java
@@ -17,4 +17,5 @@ public interface ProcessMaterialsBomMapper extends Mapper<ProcessMaterialsBom> {
 
     void insertOrUpdate(List<ProcessMaterialsBom> processMaterialsBomList);
 
+    List<ProcessMaterialsBomVo> findProcMatBomVoListByProcBom(ProcessMaterialsBomParams procMatBomParams);
 }
\ No newline at end of file
diff --git 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
index 0f512c3..8a0aded 100644
--- 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
@@ -95,7 +95,7 @@
             <if test="companyId != null">
                 AND process.company_id = #{companyId}
             </if>
-        </where>
+        </where> ORDER BY process.process_step
     </select>
 
 
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsBomMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsBomMapper.xml
index 1012dd8..03c8f5a 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsBomMapper.xml
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProcessMaterialsBomMapper.xml
@@ -60,6 +60,20 @@
 
     </resultMap>
 
+    <select id="findProcMatBomVoListByProcBom" parameterType="com.deer.wms.produce.manage.model.ProcessMaterialsBomParams" resultMap="ProcessMatBomVoResultMap">
+        SELECT matbom.*,  materials.materials_name, unit.unit_name FROM mt_alone_process_materials_bom matbom
+        LEFT JOIN mt_alone_materials_info materials ON matbom.materials_id = materials.id AND matbom.company_id = materials.company_id
+        LEFT JOIN unit ON matbom.unit_id = unit.unit_id AND matbom.company_id = unit.company_id
+        <where>
+            <if test="companyId != null">
+                AND product.company_id = #{companyId}
+            </if>
+            <if test="processBomId != null">
+                AND matbom.process_bom_id = #{processBomId}
+            </if>
+        </where> ORDER BY matbom.create_time DESC, matbom.update_time DESC
+    </select>
+
     <select id="findProcMatBomVoListByProId" parameterType="com.deer.wms.produce.manage.model.ProcessMaterialsBomParams" resultMap="ProcessMatBomVoResultMap">
         SELECT materials.code, materials.materials_name,
         unit.unit_name, matbom.specification, procbom.process_name,
@@ -82,6 +96,7 @@
         </where>
     </select>
 
+
     <select id="findListByProcessBomId" parameterType="com.deer.wms.produce.manage.model.ProcessMaterialsBomParams" resultMap="BaseResultMap">
         SELECT matbom.*
         FROM mt_alone_process_materials_bom matbom
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml
index 69c7840..7c73340 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessMapper.xml
@@ -115,7 +115,7 @@
             <if test="companyId != null">
                 AND prodproc.company_id = #{companyId}
             </if>
-        </where>
+        </where> ORDER BY prodproc.create_time DESC, prodproc.update_time DESC
     </select>
 
 <!--没用
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessParams.java
index 1847ab7..18238d7 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessParams.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/MtAloneProcessParams.java
@@ -10,6 +10,8 @@ public class MtAloneProcessParams extends QueryParams {
 
     private Integer productBomId;
 
+    private Integer processBomId;
+
     public Integer getProcessId() {
         return processId;
     }
@@ -25,4 +27,12 @@ public class MtAloneProcessParams extends QueryParams {
     public void setProductBomId(Integer productBomId) {
         this.productBomId = productBomId;
     }
+
+    public Integer getProcessBomId() {
+        return processBomId;
+    }
+
+    public void setProcessBomId(Integer processBomId) {
+        this.processBomId = processBomId;
+    }
 }
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessAndMaterials.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessAndMaterials.java
deleted file mode 100644
index 66e9195..0000000
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessAndMaterials.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.deer.wms.produce.manage.model;
-
-/**
- *同时获取工序信息和物料信息
- * @Author: hy
- * @Date: 2019/12/19 20:13
- * @Version 1.0
- */
-public class ProcessAndMaterials {
-
-    private MtAloneProcessVo processVo;//工序扩展信息
-
-    private ProcessMaterialsVo[] processMaterialsVo;//物料扩展信息
-
-    public MtAloneProcessVo getProcessVo() {
-        return processVo;
-    }
-
-    public void setProcessVo(MtAloneProcessVo processVo) {
-        this.processVo = processVo;
-    }
-
-    public ProcessMaterialsVo[] getProcessMaterialsVo() {
-        return processMaterialsVo;
-    }
-
-    public void setProcessMaterialsVo(ProcessMaterialsVo[] processMaterialsVo) {
-        this.processMaterialsVo = processMaterialsVo;
-    }
-}
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessAndMaterialsBom.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessAndMaterialsBom.java
new file mode 100644
index 0000000..3f5615d
--- /dev/null
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessAndMaterialsBom.java
@@ -0,0 +1,32 @@
+package com.deer.wms.produce.manage.model;
+
+import java.util.List;
+
+/**
+ *同时获取工序信息和物料bom信息
+ * @Author: hy
+ * @Date: 2019/12/19 20:13
+ * @Version 1.0
+ */
+public class ProcessAndMaterialsBom {
+
+    private MtAloneProcessVo processVo;//工序扩展信息
+
+    private List<ProcessMaterialsBomVo> procMatBomVoList;//物料扩展信息
+
+    public MtAloneProcessVo getProcessVo() {
+        return processVo;
+    }
+
+    public void setProcessVo(MtAloneProcessVo processVo) {
+        this.processVo = processVo;
+    }
+
+    public List<ProcessMaterialsBomVo> getProcMatBomVoList() {
+        return procMatBomVoList;
+    }
+
+    public void setProcMatBomVoList(List<ProcessMaterialsBomVo> procMatBomVoList) {
+        this.procMatBomVoList = procMatBomVoList;
+    }
+}
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBomVo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBomVo.java
index 84dd37e..8a949c9 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBomVo.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProcessMaterialsBomVo.java
@@ -23,8 +23,6 @@ public class ProcessMaterialsBomVo extends ProcessMaterialsBom {
 
     private Float remain;//剩余数量
 
-
-
     public String getProcessName() {
         return processName;
     }
diff --git 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
index d9e99f9..efd5556 100644
--- 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
@@ -14,7 +14,7 @@ public interface MtAloneProcessService extends Service<MtAloneProcess, Integer>
 
     List<MtAloneProcessVo> findProcessVoListByProductProcess(ProductProcessParams params);
 
-    ProcessAndMaterials queryProcessDetail(MtAloneProcessParams params);
+    ProcessAndMaterialsBom queryProcessDetail(MtAloneProcessParams params);
 
     void saveProcAndProcMat(ProcessAndProcMat processAndProcMat, CurrentUser currentUser);
 
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessMaterialsBomService.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessMaterialsBomService.java
index d01eae4..4fbb0a5 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessMaterialsBomService.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/ProcessMaterialsBomService.java
@@ -16,6 +16,8 @@ public interface ProcessMaterialsBomService extends Service<ProcessMaterialsBom,
 
     List<MaterialInfoVo> findMaterilaListByProcessBomId(ProcessBom processBom);
 
+    List<ProcessMaterialsBomVo> findProcMatBomVoListByProcBom(ProcessMaterialsBomParams procMatBomParams);
+
 
     //List<ProcessMaterialsBom> findList(ProcessMaterialsBomParams params) ;
 
diff --git 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
index 5bcb2bf..9695693 100644
--- 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
@@ -1,10 +1,13 @@
 package com.deer.wms.produce.manage.service.impl;
 
 import com.deer.wms.intercept.common.data.CurrentUser;
+import com.deer.wms.produce.manage.constant.ProduceManagePublicMethod;
 import com.deer.wms.produce.manage.dao.MtAloneProcessMapper;
+import com.deer.wms.produce.manage.dao.ProcessMaterialsMapper;
 import com.deer.wms.produce.manage.model.*;
 import com.deer.wms.produce.manage.service.MtAloneProcessService;
 import com.deer.wms.produce.manage.service.ProcessBomService;
+import com.deer.wms.produce.manage.service.ProcessMaterialsBomService;
 import com.deer.wms.produce.manage.service.ProcessMaterialsService;
 import com.deer.wms.project.seed.core.service.AbstractService;
 import org.springframework.beans.BeanUtils;
@@ -13,6 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -31,6 +35,9 @@ public class MtAloneProcessServiceImpl extends AbstractService<MtAloneProcess, I
     @Autowired
     private ProcessMaterialsService processMaterialsService;
 
+    @Autowired
+    private ProcessMaterialsBomService processMaterialsBomService;
+
     @Override
     public List<MtAloneProcess> findProcessListByProductBom(ProcessBomParams params) {
         //通过产品bom获取工序bom
@@ -55,25 +62,21 @@ public class MtAloneProcessServiceImpl extends AbstractService<MtAloneProcess, I
     }
 
     @Override
-    public ProcessAndMaterials queryProcessDetail(MtAloneProcessParams params) {
+    public ProcessAndMaterialsBom queryProcessDetail(MtAloneProcessParams params) {
         //根据工序id查询工序详细信息
         MtAloneProcessVo processVo = (MtAloneProcessVo) mtAloneProcessMapper.selectProcessVoByProcessId(params);
 
-        //根据工序id查询物料信息
-        List<ProcessMaterialsVo> processMaterialsVoList = processMaterialsService.findProcMatVoListByProcess(params);
+        //根据工序bom的id查询物料bom信息
+        ProcessMaterialsBomParams procMatBomParams = new ProcessMaterialsBomParams();
+        procMatBomParams.setProcessBomId(processVo.getProcessBomId());
+        procMatBomParams.setCompanyId(params.getCompanyId());
+        List<ProcessMaterialsBomVo> procMatBomVoList = processMaterialsBomService.findProcMatBomVoListByProcBom(procMatBomParams);
 
-        ProcessAndMaterials processAndMaterials = new ProcessAndMaterials();
-        processAndMaterials.setProcessVo(processVo);
-        if(null != processMaterialsVoList) {
-            ProcessMaterialsVo[] processMaterialsVo = new ProcessMaterialsVo[processMaterialsVoList.size()];
-            for (int i = 0; i < processMaterialsVo.length; i++) {
-                processMaterialsVo[i] = processMaterialsVoList.get(i);
-            }
-            processAndMaterials.setProcessMaterialsVo(processMaterialsVo);
-        }
+        ProcessAndMaterialsBom processAndMaterialsBom = new ProcessAndMaterialsBom();
+        processAndMaterialsBom.setProcessVo(processVo);
+        processAndMaterialsBom.setProcMatBomVoList(procMatBomVoList);
 
-
-        return processAndMaterials;
+        return processAndMaterialsBom;
     }
 
     @Override
@@ -84,7 +87,37 @@ public class MtAloneProcessServiceImpl extends AbstractService<MtAloneProcess, I
         BeanUtils.copyProperties(mtAloneProcessVo, mtAloneProcess);
         mtAloneProcessMapper.updateByPrimaryKey(mtAloneProcess);
 
-        //前端对物料用量赋值，保存物料
+        //通过工序bom的id获取物料bom
+        ProcessMaterialsBomParams procMatBomParams = new ProcessMaterialsBomParams();
+        procMatBomParams.setProcessBomId(processAndProcMat.getMtAloneProcessVo().getProcessBomId());
+        procMatBomParams.setCompanyId(currentUser.getCompanyId());
+        List<ProcessMaterialsBomVo> procMatBomVoList = processMaterialsBomService.findProcMatBomVoListByProcBom(procMatBomParams);
+
+        ////由物料bom对物料赋值，保存物料,其中前端赋值物料用量
+        //MtAloneProcessParams processParams = new MtAloneProcessParams();
+        //processParams.setProcessId(mtAloneProcessVo.getId());
+        //List<ProcessMaterialsVo> procMatVoList = processMaterialsService.findProcMatVoListByProcess(processParams);
+        //if(null == procMatVoList){
+        //    procMatVoList = new ArrayList<ProcessMaterialsVo>(procMatBomVoList.size());
+        //    Date date = new Date();
+        //    for (ProcessMaterialsBomVo procMatBomVo : procMatBomVoList){
+        //        ProcessMaterialsVo procMatVo = new ProcessMaterialsVo();
+        //        procMatVo.setCreateTime(date);
+        //        procMatVo.setUpdateTime(date);
+        //        procMatVo.setStatus(0);
+        //        procMatVo.setProcessId(mtAloneProcessVo.getId());
+        //        procMatVo.setMaterialsBomId(procMatBomVo.getId());
+        //        procMatVo.setMaterialsName(procMatBomVo.getMaterialsName());
+        //        procMatVo.setCode(ProduceManagePublicMethod.creatUniqueCode("WL"));
+        //        procMatVo.setSpecification(procMatBomVo.getSpecification());
+        //        procMatVo.setUnitId(procMatBomVo.getUnitId());
+        //        procMatVo.setCompanyId(currentUser.getCompanyId());
+        //        procMatVoList.add(procMatVo);
+        //    }
+        //    processMaterialsService.save();
+        //}else{
+        //    for ()
+        //}
 
 
     }
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessMaterialsBomServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessMaterialsBomServiceImpl.java
index 2e82f05..7f46ea6 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessMaterialsBomServiceImpl.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProcessMaterialsBomServiceImpl.java
@@ -35,6 +35,11 @@ public class ProcessMaterialsBomServiceImpl extends AbstractService<ProcessMater
         return processMaterialsBomMapper.findMaterilaListByProcessBomId(processBom);
     }
 
+    @Override
+    public List<ProcessMaterialsBomVo> findProcMatBomVoListByProcBom(ProcessMaterialsBomParams procMatBomParams) {
+        return processMaterialsBomMapper.findProcMatBomVoListByProcBom(procMatBomParams);
+    }
+
 
     //@Override
     //public List<ProcessMaterialsBom> findList(ProcessMaterialsBomParams params) {
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneProcessController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneProcessController.java
index aafa2d9..f35594e 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneProcessController.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/MtAloneProcessController.java
@@ -144,20 +144,20 @@ public class MtAloneProcessController {
 
         params.setCompanyId(currentUser.getCompanyId());
         PageHelper.startPage(params.getPageNum(), params.getPageSize());
-        ProcessAndMaterials processAndMaterials = mtAloneProcessService.queryProcessDetail(params);
-        return ResultGenerator.genSuccessResult(processAndMaterials);
+        ProcessAndMaterialsBom processAndMaterialsBom = mtAloneProcessService.queryProcessDetail(params);
+        return ResultGenerator.genSuccessResult(processAndMaterialsBom);
     }
 
     /**
      * hy正在用
      * 工序处理完毕时，点击提交同时更新工序信息、保存物料信息、更新物料库存信息
-     * @param productAndProcess
+     * @param processAndProcMat
      * @param currentUser
      * @return
      */
     @ApiOperation(value = "工序及物料信息保存", notes = "工序及物料信息保存")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "productAndProcess", value = "批次生产加工及工序", paramType = "body", dataType = "ProductAndProcess", required = true)
+            @ApiImplicitParam(name = "processAndProcMat", value = "工序及物料", paramType = "body", dataType = "ProcessAndProcMat", required = true)
     })
     @OperateLog(description = "工序及物料信息保存", type = "更新、保存")
     @PostMapping("/saveProcAndProcMat")