From c664c49f8e211b7b791a5ff1e63cda53c1b1264e Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期日, 05 四月 2026 01:04:47 +0800
Subject: [PATCH] # 明细历史优化+打印
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 183 +++++++++++++++++----------------------------
1 files changed, 70 insertions(+), 113 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 1b26996..d560a7a 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -3,14 +3,13 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.model.OrderDto;
-import com.zy.common.service.erp.ErpService;
-import com.zy.common.service.erp.entity.Goods;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,21 +29,21 @@
public class WorkLogHandler extends AbstractHandler<String> {
@Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private WrkMastLogService wrkMastLogService;
+ private WrkArchiveToLogService wrkArchiveToLogService;
+// @Autowired
+// private WrkMastService wrkMastService;
@Autowired
private WrkDetlService wrkDetlService;
+// @Autowired
+// private WrkMastLogService wrkMastLogService;
+// @Autowired
+// private WrkDetlLogService wrkDetlLogService;
@Autowired
- private WrkDetlLogService wrkDetlLogService;
+ private WaitPakinService waitPakinService;
+ @Autowired
+ private WaitPakinLogService waitPakinLogService;
@Autowired
private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
- @Autowired
- private ErpService erpService;
- @Autowired
- private DocTypeService docTypeService;
// update asr_wrk_mast set inv_wh = 'Y', ove_mk = 'Y' where wrk_no =
@Transactional
@@ -66,51 +65,26 @@
// 鍏ュ簱 --------------------------------------------------------------------------------
if (wrkMast.getWrkSts() == 10) {
-
// 鍏ㄦ澘鍏ュ簱
if (wrkMast.getIoType() == 1) {
+ // 鍏ュ簱閫氱煡鍗�
+ if (!Cools.isEmpty(wrkMast.getBarcode())) {
+ // 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
+ if (!waitPakinLogService.save(wrkMast.getBarcode())) {
+ exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
- // 銆� 涓婃姤涓夋柟骞冲彴 銆�
- if (!Cools.isEmpty(wrkDetls)) {
- for (WrkDetl wrkDetl : wrkDetls) {
- // Goods 琛�
- Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
- if (!Cools.isEmpty(goods)) {
- if (!erpService.updateStateAndLocForGoods(goods.getBarCode(), 3, wrkMast.getLocNo())) {
- log.error("{}鏉＄爜鍦╡rp鏁版嵁搴撲腑鏇存柊澶辫触锛�", goods.getBarCode());
- }
- } else {
- log.error("{}鏉＄爜涓嶅湪erp鏁版嵁搴撲腑锛�", wrkDetl.getBatch());
- }
- // OrderDetl 琛�
- OrderDetl orderDetl = orderDetlService.selectContainBatch(wrkDetl.getBatch());
- if (!Cools.isEmpty(orderDetl)) {
- Order order = orderService.selectById(orderDetl.getOrderId());
- DocType docType = docTypeService.selectById(order.getDocType());
- if (docType.getPakin() == 1) {
- if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), wrkDetl.getAnfme())) {
- log.error("{}缂栧彿璁㈠崟锛屾洿鏂皗}鏉＄爜鏁伴噺澶辫触", orderDetl.getOrderNo(), orderDetl.getMatnr());
- }
- }
- // Order 琛�
- if (order.getSettle() < 3L) {
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- boolean complete = true;
- for (OrderDetl detl : orderDetls) {
- if (detl.getAnfme() > detl.getQty()) {
- complete = false;
- break;
- }
- }
- if (complete) {
- if (!orderService.updateSettle(order.getId(), 4L, null)) {
- throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
- }
- }
- }
- }
+ // 鍒犻櫎鍏ュ簱閫氱煡妗�
+ if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
+ exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
}
+// // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆�
+// if (!Cools.isEmpty(wrkDetls)) {
+// if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
+// exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
+// }
+// }
// 鎷ｆ枡鍐嶅叆搴�
} else if (wrkMast.getIoType() == 53) {
if (!Cools.isEmpty(wrkDetls)) {
@@ -118,75 +92,58 @@
exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
}
- // 淇敼 erp Goods 琛�
- for (WrkDetl wrkDetl : wrkDetls) {
- Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
- if (!Cools.isEmpty(goods)) {
- if (!erpService.updateStateForGoods(goods.getBarCode(), 4)) {
- log.error("{}鏉＄爜鍦╡rp鏁版嵁搴撲腑鏇存柊澶辫触锛�", goods.getBarCode());
- }
- } else {
- log.error("{}鏉＄爜涓嶅湪erp鏁版嵁搴撲腑锛�", wrkDetl.getMatnr());
- }
- }
- for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
- Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
- if (!Cools.isEmpty(goods)) {
- if (!erpService.updateStateForGoods(goods.getBarCode(), 4)) {
- log.error("{}鏉＄爜鍦╡rp鏁版嵁搴撲腑鏇存柊澶辫触锛�", goods.getBarCode());
- }
- } else {
- log.error("{}鏉＄爜涓嶅湪erp鏁版嵁搴撲腑锛�", wrkDetl.getMatnr());
- }
- }
}
- // 鍑哄簱 --------------------------------------------------------------------------------
- } else if (wrkMast.getWrkSts() == 18) {
+ // 鍑哄簱 --------------------------------------------------------------------------------
+ } else if (wrkMast.getWrkSts() == 30) {
if (!Cools.isEmpty(wrkDetls)) {
if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
}
- // 淇敼 erp Goods 琛�
- for (WrkDetl wrkDetl : wrkDetls) {
- Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
- if (!Cools.isEmpty(goods)) {
- if (!erpService.updateStateForGoods(goods.getBarCode(), 4)) {
- log.error("{}鏉＄爜鍦╡rp鏁版嵁搴撲腑鏇存柊澶辫触锛�", goods.getBarCode());
- }
- } else {
- log.error("{}鏉＄爜涓嶅湪erp鏁版嵁搴撲腑锛�", wrkDetl.getMatnr());
- }
- }
- for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
- Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
- if (!Cools.isEmpty(goods)) {
- if (!erpService.updateStateForGoods(goods.getBarCode(), 4)) {
- log.error("{}鏉＄爜鍦╡rp鏁版嵁搴撲腑鏇存柊澶辫触锛�", goods.getBarCode());
- }
- } else {
- log.error("{}鏉＄爜涓嶅湪erp鏁版嵁搴撲腑锛�", wrkDetl.getMatnr());
- }
- }
}
-
- // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
- exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- // 鍒犻櫎宸ヤ綔涓绘。
- if (!wrkMastService.deleteById(wrkMast)) {
- exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
- if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
+ wrkArchiveToLogService.archiveMastAndDetlToLogThenDeleteCurrent(wrkMast);
+// boolean printFullPltOutLog = !Cools.isEmpty(wrkMast)
+// && Long.valueOf(30L).equals(wrkMast.getWrkSts())
+// && "Y".equalsIgnoreCase(wrkMast.getFullPlt());
+// // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+// boolean wrkMastLogSaved = wrkMastLogService.save(wrkMast.getWrkNo());
+// if (printFullPltOutLog) {
+// System.out.println("[WorkLogHandler] save wrkMastLog, wrkNo=" + wrkMast.getWrkNo()
+// + ", result=" + wrkMastLogSaved);
+// }
+// if (!wrkMastLogSaved) {
+// exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+// }
+//
+// // 淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗�
+// boolean wrkDetlLogSaved = wrkDetlLogService.save(wrkMast.getWrkNo());
+// if (printFullPltOutLog) {
+// System.out.println("[WorkLogHandler] save wrkDetlLog, wrkNo=" + wrkMast.getWrkNo()
+// + ", result=" + wrkDetlLogSaved);
+// }
+// if (!wrkDetlLogSaved) {
// exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- // 鍒犻櫎宸ヤ綔鏄庣粏妗�
- if (!wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
+// }
+// // 鍒犻櫎宸ヤ綔涓绘。
+// boolean wrkMastDeleted = wrkMastService.deleteById(wrkMast);
+// if (printFullPltOutLog) {
+// System.out.println("[WorkLogHandler] delete wrkMast, wrkNo=" + wrkMast.getWrkNo()
+// + ", result=" + wrkMastDeleted);
+// }
+// if (!wrkMastDeleted) {
+// exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+// }
+//
+// // 鍒犻櫎宸ヤ綔鏄庣粏妗�
+// boolean wrkDetlDeleted = wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+// if (printFullPltOutLog) {
+// System.out.println("[WorkLogHandler] delete wrkDetl, wrkNo=" + wrkMast.getWrkNo()
+// + ", result=" + wrkDetlDeleted);
+// }
+// if (!wrkDetlDeleted) {
// exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
+// }
// 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
if (!BaseController.isJSON(wrkDetl.getOrderNo())) {
--
Gitblit v1.9.1