From 13d295c4210ee589b3e524bd157f85c63bca5a3e Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 30 四月 2026 13:12:08 +0800
Subject: [PATCH] 1.出库单据转历史档有问题 2.新增单据历史档 3.修复入库完成转明细失败
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 74 ++++++++++++++++++++++++++++++------
1 files changed, 61 insertions(+), 13 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..1237605 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -2,9 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -39,11 +37,19 @@
private WaitPakinLogService waitPakinLogService;
@Autowired
private OrderService orderService;
-
+ @Autowired
+ private BasArmMastLogService basArmMastLogService;
+ @Autowired
+ private BasAgvMastLogService basAgvMastLogService;
+ @Autowired
+ private BasArmMastService basArmMastService;
+ @Autowired
+ private BasAgvMastService basAgvMastService;
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
try {
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ int wrkDetlCount = Cools.isEmpty(wrkDetls) ? 0 : wrkDetls.size();
// 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
if (!Cools.isEmpty(wrkDetls)) {
Iterator<WrkDetl> iterator = wrkDetls.iterator();
@@ -51,7 +57,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 +75,11 @@
if (!Cools.isEmpty(wrkMast.getBarcode())) {
// 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
if (!waitPakinLogService.save(wrkMast.getBarcode())) {
- exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
+// exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
// 鍒犻櫎鍏ュ簱閫氱煡妗�
if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
- exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+// exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
}
// // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆�
@@ -104,17 +110,59 @@
if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
+ // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
+ if (wrkDetlCount > 0 && !wrkDetlLogService.save(wrkMast.getWrkNo())) {
+ exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
// 鍒犻櫎宸ヤ綔涓绘。
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 (wrkDetlCount > 0 && !wrkDetlService.delete(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()))) {
+ exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ return SUCCESS;
+ }
+
+ @Transactional
+ public ReturnT<String> startArm(BasArmMast basArmMast) {
+ try {
+ BasArmMastLog basArmMastLog = new BasArmMastLog(basArmMast);
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!basArmMastLogService.insert(basArmMastLog)) {
+ exceptionHandle("淇濆瓨ARM宸ヤ綔鍘嗗彶妗id={0}]澶辫触", basArmMast.getId());
+ }
+ // 鍒犻櫎宸ヤ綔涓绘。
+ if (!basArmMastService.deleteById(basArmMast)) {
+ exceptionHandle("鍒犻櫎ARM宸ヤ綔涓绘。[id={0}]澶辫触", basArmMast.getId());
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+ e.printStackTrace();
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ }
+ return SUCCESS;
+ }
+
+ @Transactional
+ public ReturnT<String> startAgv(BasAgvMast basAgvMast) {
+ try {
+ BasAgvMastLog basAgvMastLog = new BasAgvMastLog(basAgvMast);
+ // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+ if (!basAgvMastLogService.insert(basAgvMastLog)) {
+ exceptionHandle("淇濆瓨ARM宸ヤ綔鍘嗗彶妗id={0}]澶辫触", basAgvMast.getId());
+ }
+ // 鍒犻櫎宸ヤ綔涓绘。
+ if (!basAgvMastService.deleteById(basAgvMast)) {
+ exceptionHandle("鍒犻櫎ARM宸ヤ綔涓绘。[id={0}]澶辫触", basAgvMast.getId());
}
} catch (Exception e) {
log.error("fail", e);
--
Gitblit v1.9.1