From 9cd62b954e152eb2675ea458570d55ecaddd4f74 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 19 六月 2023 17:41:04 +0800
Subject: [PATCH] #工作档定时任务优化没订单号的问题
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index c6c9dd4..1fbf220 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -37,6 +37,8 @@
private OrderDetlService orderDetlService;
@Autowired
private OrderService orderService;
+ @Autowired
+ private ManPakOutService manPakOutService;
public ReturnT<String> start(WrkMast wrkMast) {
// 4.鍏ュ簱瀹屾垚
@@ -180,6 +182,19 @@
}
}
} catch (Exception ignore){}
+
+ //鏇存柊鎷ｈ揣鍗曞畬鎴愭暟閲�
+ EntityWrapper<ManPakOut> manPakOutEntityWrapper = new EntityWrapper<>();
+ manPakOutEntityWrapper.eq("doc_num",wrkDetl.getOrderNo());
+ manPakOutEntityWrapper.eq("matnr",wrkDetl.getMatnr());
+ ManPakOut manPakOut = manPakOutService.selectOne(manPakOutEntityWrapper);
+ manPakOut.setCount(manPakOut.getCount() + wrkDetl.getAnfme());
+ if (manPakOut.getCount() + wrkDetl.getAnfme() == manPakOut.getAnfme()){
+ manPakOut.setStatus(1);
+ }
+ if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
+ return FAIL.setMsg("鏇存柊鎷ｈ揣鍗曞畬鎴愭暟閲忓け璐�");
+ }
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
@@ -367,20 +382,36 @@
return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}
}
- EntityWrapper<OrderDetl> orderDetlEntityWrapper = new EntityWrapper<>();
- orderDetlEntityWrapper.eq("order_no",wrkDetls101.get(0).getOrderNo());
- orderDetlEntityWrapper.eq("matnr",wrkDetls101.get(0).getMatnr());
+ if (!wrkDetls101.get(0).getOrderNo().isEmpty()){
+ //鏇存柊璁㈠崟瀹屾垚鏁伴噺
+ EntityWrapper<OrderDetl> orderDetlEntityWrapper = new EntityWrapper<>();
+ orderDetlEntityWrapper.eq("order_no",wrkDetls101.get(0).getOrderNo());
+ orderDetlEntityWrapper.eq("matnr",wrkDetls101.get(0).getMatnr());
- OrderDetl orderDetl = orderDetlService.selectOne(orderDetlEntityWrapper);
+ OrderDetl orderDetl = orderDetlService.selectOne(orderDetlEntityWrapper);
- OrderDetl orderDetl1 = new OrderDetl();
- orderDetl1.setQty(orderDetl.getQty() + wrkDetls101.get(0).getAnfme());
- orderDetl1.setUpdateTime(now);
- if (!orderDetlService.update(orderDetl1,orderDetlEntityWrapper)){
- return FAIL.setMsg("鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触");
+ OrderDetl orderDetl1 = new OrderDetl();
+ orderDetl1.setQty(orderDetl.getQty() + wrkDetls101.get(0).getAnfme());
+ orderDetl1.setUpdateTime(now);
+ if (!orderDetlService.update(orderDetl1,orderDetlEntityWrapper)){
+ return FAIL.setMsg("鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触");
+ }
+ //鏇存柊鎷ｈ揣鍗曞畬鎴愭暟閲�
+ EntityWrapper<ManPakOut> manPakOutEntityWrapper = new EntityWrapper<>();
+ manPakOutEntityWrapper.eq("doc_num",wrkDetls101.get(0).getOrderNo());
+ manPakOutEntityWrapper.eq("matnr",wrkDetls101.get(0).getMatnr());
+ ManPakOut manPakOut = manPakOutService.selectOne(manPakOutEntityWrapper);
+ manPakOut.setCount(manPakOut.getCount() + wrkDetls101.get(0).getAnfme());
+ if (manPakOut.getCount() + wrkDetls101.get(0).getAnfme() == manPakOut.getAnfme()){
+ manPakOut.setStatus(1);
+ }
+ if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){
+ return FAIL.setMsg("鏇存柊鎷ｈ揣鍗曞畬鎴愭暟閲忓け璐�");
+ }
}
+
Boolean finsihed = orderDetlService.checkAllDetlFinish(wrkDetls101.get(0).getOrderNo());
if (finsihed) {
Boolean mastFinished = wrkMastService.checkFinishByOrder(wrkDetls101.get(0).getOrderNo());
--
Gitblit v1.9.1