From b09865e3b4e43ec7110ca7472188478fcdb6fb0f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 22 三月 2023 09:41:32 +0800
Subject: [PATCH] #库存档案同步上报

---
 src/main/java/com/zy/common/web/WcsController.java |    4 +++-
 1 files changed, 3 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 2549d83..8fb2c05 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -72,7 +72,9 @@
             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 || countWait > 0) {
-                return R.error(CodeRes.EXIST_500);
+                if (!Cools.isEmpty(waitPakins.get(0).getDeadWarn()) && waitPakins.get(0).getDeadWarn()!=0){
+                    return R.error(CodeRes.EXIST_500);
+                }
             }
         }
         if (Cools.isEmpty(param.getLocType1())){

--
Gitblit v1.9.1