From e5cf12d2e3441b83cc3aeafd4f7f23d4075ab5fc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 07 一月 2025 14:56:14 +0800
Subject: [PATCH] #并板出库

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

diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index ebb8400..0fb2cc6 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -434,9 +434,12 @@
                     return R.parse(CodeRes.NO_COMB_700);
                 }
                 int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+                if (countLoc > 0 ) {
+                    return R.error(param.getBarcode()+"鏉$爜鍦ㄥ簱瀛樹腑宸插瓨鍦�");
+                }
                 int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
-                if (countLoc > 0 || countWrk > 0) {
-                    return R.error(CodeRes.EXIST_500);
+                if ( countWrk > 0) {
+                    return R.error(param.getBarcode()+"鏉$爜鍦ㄥ伐浣滄。涓凡瀛樺湪");
                 }
             }
             if (Cools.isEmpty(param.getLocType1())){

--
Gitblit v1.9.1