From 37a8b4bd1b8a5f09ad9e258733d4d12d6b19c6fa Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 04 八月 2023 16:21:01 +0800
Subject: [PATCH] erp轮询，登录，查询创建物料，查询创建订单,审核
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 69cc3d3..4fa9711 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -72,18 +72,26 @@
}
// 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆�
if (!Cools.isEmpty(wrkDetls)) {
- if (!orderService.saveHandlerOrder(wrkMast, wrkDetls)) {
+ if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
}
// 鎷ｆ枡鍐嶅叆搴�
} else if (wrkMast.getIoType() == 53) {
-
+ if (!Cools.isEmpty(wrkDetls)) {
+ if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
+ exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ }
}
// 鍑哄簱 --------------------------------------------------------------------------------
} else if (wrkMast.getWrkSts() == 15) {
-
+ if (!Cools.isEmpty(wrkDetls)) {
+ if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
+ exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ }
}
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
@@ -94,13 +102,15 @@
if (!wrkMastService.deleteById(wrkMast)) {
exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
- // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
- 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.getEmptyMk().equals("Y")) {
+ // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
+ 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