From dedc80d719d50e54775fa991ac470aeba56eee22 Mon Sep 17 00:00:00 2001
From: hy2250089 <hy2250089@qq.com>
Date: Fri, 17 Jan 2020 11:16:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E8=BF=9B=E5=BA=A6=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/mapper/ProductProcessMapper.xml    |  7 ++++---
 .../manage/model/ProductProcessVo.java        | 20 +++++++++++++++++++
 .../impl/MtAloneProcessServiceImpl.java       |  2 --
 3 files changed, 24 insertions(+), 5 deletions(-)

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 c9f09c7..5ecf5a9 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
@@ -97,10 +97,11 @@
     </resultMap>
 
     <select id="findList" parameterType="com.deer.wms.produce.manage.model.ProductProcessParams" resultMap="ProductProcessVoResultMap">
-        SELECT prodproc.*, prodbom.product_process_name, product.product_name
-        FROM mt_alone_product_process prodproc
+        SELECT prodproc.*, prodbom.product_process_name, product.product_name, SUM(process.handle_status) AS finishedProcess,  COUNT(process.id) AS countProcess,
+        (SUM(process.handle_status)*100/COUNT(process.id)) AS schedule FROM mt_alone_product_process prodproc
         LEFT JOIN mt_alone_product_process_bom prodbom ON prodproc.product_bom_id = prodbom.id AND prodproc.company_id = prodbom.company_id
         LEFT JOIN mt_alone_machining_product product ON prodbom.product_id =  product.id AND prodbom.company_id = product.company_id
+        LEFT JOIN mt_alone_process process ON prodproc.id = process.product_process_id AND prodproc.company_id = process.company_id
         <where>
             <if test="keywords != null and keywords != ''">
                 AND prodproc.work_order_code LIKE CONCAT('%', #{keywords}, '%')
@@ -115,7 +116,7 @@
             <if test="companyId != null">
                 AND prodproc.company_id = #{companyId}
             </if>
-        </where> ORDER BY prodproc.create_time DESC, prodproc.update_time DESC
+        </where> GROUP BY prodproc.id 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/ProductProcessVo.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessVo.java
index fca3abc..acf96d1 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessVo.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessVo.java
@@ -13,6 +13,10 @@ public class ProductProcessVo extends ProductProcess {
 
     private Boolean isFinish = false;//是否已完成
 
+    private Integer countProcess;//工序总数
+
+    private Integer finishedProcess;//已完成工序数
+
     private Float schedule;//进度，计算所得
 
     private String productProcessName;//产品Bom名称
@@ -48,4 +52,20 @@ public class ProductProcessVo extends ProductProcess {
     public void setProductProcessName(String productProcessName) {
         this.productProcessName = productProcessName;
     }
+
+    public Integer getCountProcess() {
+        return countProcess;
+    }
+
+    public void setCountProcess(Integer countProcess) {
+        this.countProcess = countProcess;
+    }
+
+    public Integer getFinishedProcess() {
+        return finishedProcess;
+    }
+
+    public void setFinishedProcess(Integer finishedProcess) {
+        this.finishedProcess = finishedProcess;
+    }
 }
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 469244c..bca6e7b 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
@@ -68,8 +68,6 @@ public class MtAloneProcessServiceImpl extends AbstractService<MtAloneProcess, I
         List<ProcessMaterialsVo> procMatVoList = processMaterialsService.findProcMatVoListByProcess(params);
         ProcessHo processHo = new ProcessHo();
         if (null != processVo) {
-            System.out.println("----------" + processVo.getId());
-            System.out.println("----------" + processVo.getProcessName());
             BeanUtils.copyProperties(processVo, processHo);
             processHo.setProcessMaterialsVoList(procMatVoList);
         }