From aca94963ca944c256c4ef69d0316a2e8d6ccbc62 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 11 四月 2026 16:35:32 +0800
Subject: [PATCH] 单据上报U8批次
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 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 574eb94..b760e50 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,11 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.zy.asrs.entity.OrderReport;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.mapper.OrderReportMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -14,6 +16,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -39,22 +43,33 @@
@Autowired
private OrderService orderService;
+ @Resource
+ private OrderReportMapper orderReportMapper;
+
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
try {
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
-// // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
-// if (!Cools.isEmpty(wrkDetls)) {
-// Iterator<WrkDetl> iterator = wrkDetls.iterator();
-// while (iterator.hasNext()) {
-// WrkDetl wrkDetl = iterator.next();
-// if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
-// orderService.checkComplete(wrkDetl.getOrderNo());
-// iterator.remove();
-// }
-// }
-// }
-//
+ List<OrderReport> orderReports = new ArrayList<>();
+ // 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
+ if (!Cools.isEmpty(wrkDetls)) {
+ Iterator<WrkDetl> iterator = wrkDetls.iterator();
+ while (iterator.hasNext()) {
+ WrkDetl wrkDetl = iterator.next();
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
+ OrderReport orderReport = new OrderReport();
+ orderReport.sync(wrkDetl);
+ orderReports.add(orderReport);
+ orderService.checkComplete(wrkDetl.getOrderNo());
+ iterator.remove();
+ }
+ }
+ }
+ // 鎻掑叆涓婃姤琛�
+ if (!orderReports.isEmpty()) {
+ orderReportMapper.insertBatch(orderReports);
+ }
+
// 鍏ュ簱 --------------------------------------------------------------------------------
if (wrkMast.getWrkSts() == 5) {
// 鍏ㄦ澘鍏ュ簱
@@ -84,9 +99,9 @@
// }
// }
}
-//
-// // 鍑哄簱 --------------------------------------------------------------------------------
-// } else if (wrkMast.getWrkSts() == 15) {
+
+ // 鍑哄簱 --------------------------------------------------------------------------------
+ } else if (wrkMast.getWrkSts() == 15) {
// if (!Cools.isEmpty(wrkDetls)) {
// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
// exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
--
Gitblit v1.9.1