From a7a4df7db1ece652cfd91f6a7f0ad2cde2aa3344 Mon Sep 17 00:00:00 2001
From: weihongyang <1075331873@qq.com>
Date: Fri, 3 Jan 2020 10:27:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=A7=E5=93=81bom?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                               |  7 ++++---
 .../produce/manage/mapper/ProductProcessBomMapper.xml |  2 +-
 .../produce/manage/model/ProductProcessBomParams.java | 11 +++++++++++
 .../service/impl/ProductProcessBomServiceImpl.java    |  5 +++--
 .../manage/web/ProductProcessBomController.java       |  4 ----
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 382f7fd..2fc2805 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,6 +8,10 @@
     <packaging>pom</packaging>
     <version>1.0.0-SNAPSHOT</version>
 
+    <modules>
+        <module>wms-produce-manage</module>
+    </modules>
+
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
@@ -15,9 +19,6 @@
         <relativePath/>
     </parent>
 
-    <modules>
-        <module>wms-produce-manage</module>
-    </modules>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBomMapper.xml b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBomMapper.xml
index deb4600..93bf197 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBomMapper.xml
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/mapper/ProductProcessBomMapper.xml
@@ -106,7 +106,7 @@
     </select>
 
     <select id="findListByTerm" resultMap="ProPrcessBomDTOResultMap">
-        SELECT u.unit_name,mappb.id,mamp.product_code, mamp.product_name,mamp.specification,mapb.specification AS
+        SELECT u.unit_name,mappb.id,mappb.product_process_name,mamp.product_code, mamp.product_name,mamp.specification,mapb.specification AS
         work_specification,mapb.process_content, COUNT(mapb.process_step) process_step
         FROM mt_alone_product_process_bom mappb
         LEFT JOIN mt_alone_machining_product mamp ON mappb.product_id = mamp.id
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomParams.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomParams.java
index 77d743e..63d7ee1 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomParams.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/model/ProductProcessBomParams.java
@@ -28,6 +28,9 @@ public class ProductProcessBomParams extends QueryParams {
 
     private String productNum;
 
+    private String productProcessName;
+
+
 
     /**
      *添加时间
@@ -148,4 +151,12 @@ public class ProductProcessBomParams extends QueryParams {
     public void setProductBomId(String productBomId) {
         this.productBomId = productBomId;
     }
+
+    public String getProductProcessName() {
+        return productProcessName;
+    }
+
+    public void setProductProcessName(String productProcessName) {
+        this.productProcessName = productProcessName;
+    }
 }
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBomServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBomServiceImpl.java
index 9beed59..d5d2e65 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBomServiceImpl.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessBomServiceImpl.java
@@ -61,6 +61,7 @@ public class ProductProcessBomServiceImpl extends AbstractService<ProductProcess
         productProcessBom.setSpecification(params.getSpecification());
         productProcessBom.setProductId(params.getProductId());
         productProcessBom.setProcessContent(params.getProcessContent());
+        productProcessBom.setProductProcessName(params.getProductProcessName());
         productProcessBomMapper.insert(productProcessBom);
         for (ProcessBomParams processBomParams:params.getProcessBomParamsList()) {
             ProcessBom processBom = new ProcessBom();
@@ -107,7 +108,7 @@ public class ProductProcessBomServiceImpl extends AbstractService<ProductProcess
         for (ProcessBomParams processBomParams:params.getProcessBomParamsList()) {
             ProcessBom processBom = new ProcessBom();
             processBom.setId(processBomParams.getId());
-            processBom.setCreateTime(processBomParams.getCreateTime());
+            processBom.setUpdateTime(new Date());
             processBom.setProcessName(processBomParams.getProcessName());
             processBom.setProductProcessId(processBomParams.getProductProcessId());
             processBom.setSpecification(processBomParams.getSpecification());
@@ -123,7 +124,7 @@ public class ProductProcessBomServiceImpl extends AbstractService<ProductProcess
             for (ProcessMaterialsBomParams processMaterialsBomParams:params.getProcessBomParamsList().get(i).getProcessMaterialsBomParamsList()){
                 ProcessMaterialsBom processMaterialsBom = new ProcessMaterialsBom();
                 processMaterialsBom.setId(processMaterialsBomParams.getId());
-                processMaterialsBom.setCreateTime(new Date());
+                processMaterialsBom.setUpdateTime(new Date());
                 processMaterialsBom.setProcessBomId(processMaterialsBomParams.getProcessBomId());
                 processMaterialsBom.setMaterialsId(processMaterialsBomParams.getMaterialsId());
                 processMaterialsBom.setCode(processMaterialsBomParams.getCode());
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBomController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBomController.java
index ddb29a5..1068fab 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBomController.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessBomController.java
@@ -85,10 +85,6 @@ public class ProductProcessBomController {
         }
         productProcessBomParams.setCreateTime(new Date());
         productProcessBomParams.setCompanyId(currentUser.getCompanyId());
-//        productProcessBomParams.setProductId(1);
-//        productProcessBomParams.setProcessContent("1");
-//        productProcessBomParams.setSpecification("1");
-
         productProcessBomService.updateProductProcessBom(productProcessBomParams);
         return ResultGenerator.genSuccessResult();
     }