From 27f51bf3b0bd265aebf83a6a262fe15623dac709 Mon Sep 17 00:00:00 2001
From: hy2250089 <hy2250089@qq.com>
Date: Tue, 25 Feb 2020 15:49:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/service/impl/ProductProcessServiceImpl.java    | 1 -
 .../wms/produce/manage/web/MtAloneProcessController.java  | 8 ++++----
 .../wms/produce/manage/web/ProductProcessController.java  | 3 +++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java
index 4d820c5..b12cb5f 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/service/impl/ProductProcessServiceImpl.java
@@ -174,7 +174,6 @@ public class ProductProcessServiceImpl extends AbstractService<ProductProcess, I
         }
 
         return productProcessHo;
-
     }
 
     @Override
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 a70bfbd..df8c4e6 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
@@ -110,11 +110,11 @@ public class MtAloneProcessController {
     @ApiOperation(value = "根据批次产品加工单id查询工序", notes = "根据批次产品加工单id查询工序")
     @GetMapping("/processListByProductProcess")
     public Result processListByProductProcess(ProductProcessParams params, @ApiIgnore @User CurrentUser currentUser) {
-        //if(currentUser==null){
-        //    return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
-        //}
+        if(currentUser==null){
+            return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
+        }
 
-        params.setCompanyId(1);
+        params.setCompanyId(currentUser.getCompanyId());
         PageHelper.startPage(params.getPageNum(), params.getPageSize());
         List<MtAloneProcessVo> list = mtAloneProcessService.findProcessVoListByProductProcess(params);
         PageInfo pageInfo = new PageInfo(list);
diff --git a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java
index d55c1ab..c2fc752 100644
--- a/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java
+++ b/wms-produce-manage/src/main/java/com/deer/wms/produce/manage/web/ProductProcessController.java
@@ -201,6 +201,9 @@ public class ProductProcessController {
             return ResultGenerator.genFailResult(CommonCode.SERVICE_ERROR,"未登录错误",null );
         }
 
+        List<ProcessHo> processHoList = productProcessHo.getProcessHoList();
+        ProcessHo processHo = processHoList.get(0);
+        System.out.println("-----------"+processHo.getOriginalLen()+"  "+processHo.getAfterLen()+"  "+processHo.getProcessPrice());
         productProcessService.addProduceProcess(productProcessHo, currentUser);
         return ResultGenerator.genSuccessResult();
     }