From c31e8e5c66195f523ecb9a8254f29e1fdacfab6d Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 29 十月 2025 12:37:07 +0800
Subject: [PATCH] 入库调整

---
 src/main/java/com/zy/common/web/WcsController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index a6dc514..6a7ec60 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -68,7 +68,8 @@
             }
             int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
             int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
-            if (countLoc > 0 || countWrk > 0) {
+            WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+            if (countLoc > 0 || (countWrk > 0 && wrkMast.getWrkSts() != 15)) {
                 return R.error("宸ヤ綔妗�/搴撳瓨鏉$爜鏁版嵁宸插瓨鍦�");
             }
         }

--
Gitblit v1.9.1