From a1baefc4c357760a0faa727e68bc5b5f4feec264 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期五, 07 十月 2022 13:44:59 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index de04b1c..f0f6ade 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
+import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.service.*;
 import com.zy.asrs.task.AbstractHandler;
@@ -32,7 +33,7 @@
     @Autowired
     private LocDetlService locDetlService;
     @Autowired
-    private WaitPakinService waitPakinService;
+    private TestMastService testMastService;
     @Autowired
     private OrderDetlService orderDetlService;
 
@@ -301,6 +302,18 @@
                         locMast.setPackStatus(sourceLoc.getPackStatus());
                     }else {
                         locMast.setPackStatus(4); //4:闈欑疆涓�
+                        if (locMast.getLocType1()==1 && sourceLoc.getLocType1()==2){
+                            TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
+                                    .eq("loc_no",sourceLoc.getLocNo())
+                                    .eq("barcode",locMast.getBarcode())
+                                    .eq("status",4)
+                            );
+                            testMast.setStatus(5);
+                            testMast.setModiTime(new Date());
+                            if (!testMastService.update(testMast,new EntityWrapper<TestMast>().eq("loc_no",sourceLoc.getLocNo()).eq("barcode",locMast.getBarcode()).eq("status",4))){
+                                throw new CoolException("鏇存敼娴嬭瘯鐘舵�佸け璐�");
+                            }
+                        }
                     }
                     if (!locMastService.updateById(locMast)) {
 //                        exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());

--
Gitblit v1.9.1