From 1138d68ff11124f87b8d9e5e0bba1c6d600902ab Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 23 十月 2025 12:40:14 +0800
Subject: [PATCH] 组托调整

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 9804444..e842505 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -4,10 +4,7 @@
 import com.core.common.BaseRes;
 import com.core.common.Cools;
 import com.core.exception.CoolException;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.entity.PltBarcode;
-import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.param.CombParam;
 import com.zy.asrs.service.*;
 import com.zy.ints.entity.WaitMatin;
@@ -39,6 +36,8 @@
     private WrkDetlService wrkDetlService;
     @Autowired
     private PltBarcodeService pltBarcodeService;
+    @Autowired
+    private WrkMastService wrkMastService;
 
     @Override
     @Transactional
@@ -51,7 +50,8 @@
         int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
         int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
         int countPlt = pltBarcodeService.selectCount(new EntityWrapper<PltBarcode>().eq("barcode",param.getBarcode()));
-        if (countPlt > 0 || countLoc > 0 || countWrk > 0) {
+        WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+        if (countPlt > 0 || countLoc > 0 || (countWrk > 0 && wrkMast.getWrkSts() != 15)) {
             throw new CoolException("鏉$爜鏁版嵁宸插瓨鍦�");
         }
 

--
Gitblit v1.9.1