From 44d51d79370da8973fcd52203c669da9d0a1e479 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 31 十二月 2024 10:00:37 +0800
Subject: [PATCH] 并板入库,并板途中拣料,拣料途中并板,以及相关查询接口

---
 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 506c965..dc6f573 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -51,7 +51,7 @@
                     WrkDetl wrkDetl = iterator.next();
                     if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
 //                        orderService.checkComplete(wrkDetl.getOrderNo());
-                        if (wrkMast.getIoType() ==  1 ||  wrkMast.getIoType() == 54 ||  wrkMast.getIoType() == 104){
+                        if (wrkMast.getIoType() ==  1 || wrkMast.getIoType() == 8 ||  wrkMast.getIoType() == 54 ||  wrkMast.getIoType() == 104){
                             OrderInAndOutUtil.checkComplete(Boolean.TRUE,wrkDetl.getOrderNo());
                         } else {
                             OrderInAndOutUtil.checkComplete(Boolean.FALSE,wrkDetl.getOrderNo());
@@ -69,11 +69,11 @@
                     if (!Cools.isEmpty(wrkMast.getBarcode())) {
                         // 淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。
                         if (!waitPakinLogService.save(wrkMast.getBarcode())) {
-                            exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+//                            exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
                         }
                         // 鍒犻櫎鍏ュ簱閫氱煡妗�
                         if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
-                            exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+//                            exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
                         }
                     }
 //                    // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆�

--
Gitblit v1.9.1