From a516fec01d3af6fbd55fb8ec1177ff55f5b0f156 Mon Sep 17 00:00:00 2001 From: ytfl <ytfl@qq.com> Date: 星期二, 14 十月 2025 15:33:43 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 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 dc6f573..58b2f96 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java @@ -15,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; +import java.util.Date; import java.util.Iterator; import java.util.List; @@ -39,6 +40,8 @@ private WaitPakinLogService waitPakinLogService; @Autowired private OrderService orderService; + @Autowired + private ReportToThirdService reportToThirdService; @Transactional public ReturnT<String> start(WrkMast wrkMast) { @@ -67,6 +70,16 @@ if (wrkMast.getIoType() == 1) { // 鍏ュ簱閫氱煡鍗� if (!Cools.isEmpty(wrkMast.getBarcode())) { + WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode())); + if (waitPakin != null) { + if (!Cools.isEmpty(waitPakin.getTkFlag())) { + boolean result = reportToThirdService.reportTkrk(waitPakin); + if (!result) { + exceptionHandle("閫�搴撳叆搴撲笂鎶RP[workNo={0}]澶辫触", wrkMast.getWrkNo()); + } + } + } + // 淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。 if (!waitPakinLogService.save(wrkMast.getBarcode())) { // exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo()); @@ -100,6 +113,9 @@ // } } + wrkMast.setIoTime(new Date()); + wrkMastService.updateById(wrkMast); + // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗� if (!wrkMastLogService.save(wrkMast.getWrkNo())) { exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo()); -- Gitblit v1.9.1