From dc611cd221af70205e23f79d03298700de36b0f6 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期二, 10 九月 2024 16:08:09 +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 0bf1d61..2ffb341 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -84,9 +84,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("搴撳瓨鏉$爜鏁版嵁宸插瓨鍦�");
+            }
             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("宸ヤ綔妗e凡瀛樺湪");
             }
         }
         if (Cools.isEmpty(param.getLocType1())) {

--
Gitblit v1.9.1