From 1eb3279d97fc3faea38c4bd21f68f9d5a49ef80f Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 16 三月 2024 13:37:57 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index b28f535..42262b7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -206,6 +206,12 @@
                     if (!Cools.isEmpty(checkPick)) {
                         continue;
                     }
+//                    WrkMast checkPick2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
+//                            .eq("barcode", barcode)
+//                            .in("io_type", 57,53));
+//                    if (!Cools.isEmpty(checkPick2)) {
+//                        continue;
+//                    }
 
                     try {
 
@@ -1814,9 +1820,7 @@
                         Double total = 0.0;
                         EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
                         LocDetl locDetl = locDetlService.selectOne(wrapper.eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
-                        if (Cools.isEmpty(locDetl)) {
-                            total = wrkDetl.getAnfme();
-                        } else {
+                        if (!Cools.isEmpty(locDetl)) {
                             total = locDetl.getAnfme();
                         }
                         if (wrkMast.getIoType() == 101) {

--
Gitblit v1.9.1