From 4d0d1312f0782bd90cec598a6125fe503b0fd727 Mon Sep 17 00:00:00 2001 From: 1 <1> Date: 星期三, 15 十月 2025 09:28:30 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 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..c2a8a9a 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,6 +37,10 @@ private WaitPakinLogService waitPakinLogService; @Autowired private OrderService orderService; + @Autowired + private BasArmMastLogService basArmMastLogService; + @Autowired + private BasArmMastService basArmMastService; @Transactional public ReturnT<String> start(WrkMast wrkMast) { @@ -51,7 +53,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 +71,11 @@ if (!Cools.isEmpty(wrkMast.getBarcode())) { // 淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。 if (!waitPakinLogService.save(wrkMast.getBarcode())) { - exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo()); +// exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo()); } // 鍒犻櫎鍏ュ簱閫氱煡妗� if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) { - exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo()); +// exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo()); } } // // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆� @@ -125,4 +127,25 @@ 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; + } + } -- Gitblit v1.9.1