From 96b30d7e4005d76fabc48894150edfe208a70218 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 20 七月 2023 16:48:04 +0800
Subject: [PATCH] #桁架上位软件:单次拆垛完成通知 接口实装

---
 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 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 d71d3e4..976ff0a 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -44,7 +44,7 @@
         try {
             List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
             // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
-            if (!Cools.isEmpty(wrkDetls)) {
+            if (wrkMast.getIoType()<200 && !Cools.isEmpty(wrkDetls)) {
                 Iterator<WrkDetl> iterator = wrkDetls.iterator();
                 while (iterator.hasNext()) {
                     WrkDetl wrkDetl = iterator.next();
@@ -102,13 +102,15 @@
             if (!wrkMastService.deleteById(wrkMast)) {
                 exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
             }
-            // 淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。
-            if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
-//                exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
-            }
-            // 鍒犻櫎宸ヤ綔鏄庣粏妗�
-            if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
-//                exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+            if ((wrkMast.getIoType()<200 || wrkMast.getWrkSts().equals(57L)) && !Cools.isEmpty(wrkDetls)){
+                // 淇濆瓨宸ヤ綔鏄庣粏妗e巻鍙叉。
+                if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
+                    exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+                }
+                // 鍒犻櫎宸ヤ綔鏄庣粏妗�
+                if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
+                    exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+                }
             }
         } catch (Exception e) {
             log.error("fail", e);

--
Gitblit v1.9.1