From 02d6a768149f3428583c30fa7caa1ce446d53291 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 18 七月 2023 13:35:37 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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 ff87a2b..05e9f89 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -62,7 +62,9 @@
             throw new CoolException(BaseRes.PARAM);
         }
         int waitPakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
-                eq("zpallet", param.getBarcode()).eq("io_status", "N"));
+                eq("zpallet", param.getBarcode())
+                //.eq("io_status", "N")
+        );
         int wrkMastCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
         int locDetlCount = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
         if (waitPakinCount > 0 || wrkMastCount > 0 || locDetlCount > 0) {
@@ -282,9 +284,13 @@
         if (Cools.isEmpty(param.getCombMats()) && Cools.isEmpty(param.getProductCode())) {
             throw new CoolException(BaseRes.PARAM);
         }
-        int count = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
-                eq("zpallet", param.getBarcode()).eq("io_status", "N"));
-        if (count > 0) {
+        int waitPakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+                        eq("zpallet", param.getBarcode())
+                //.eq("io_status", "N")
+        );
+        int wrkMastCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
+        int locDetlCount = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+        if (waitPakinCount > 0 || wrkMastCount > 0 || locDetlCount > 0) {
             throw new CoolException("鏉$爜鏁版嵁宸插瓨鍦�");
         }
         // 鍏宠仈閫氱煡鍗曠粍鎵�

--
Gitblit v1.9.1