From c65db22f67af8018ae7105ea00d8743e42835e13 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 29 三月 2025 15:52:09 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 43 +++++++++++++------------------------------
1 files changed, 13 insertions(+), 30 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 70e6a25..4fe6f38 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.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;
@@ -43,8 +42,6 @@
private WaitPakinLogService waitPakinLogService;
@Autowired
private OrderService orderService;
- @Autowired
- private ErpService erpService;
// update asr_wrk_mast set inv_wh = 'Y', ove_mk = 'Y' where wrk_no =
@Transactional
@@ -66,21 +63,6 @@
// 鍏ュ簱 --------------------------------------------------------------------------------
if (wrkMast.getWrkSts() == 10) {
-
- // 鎼滅储瀵瑰簲鍏ュ簱鏉＄爜鍦╡rp鏁版嵁搴撲腑鐨勭姸鎬�
- List<WrkDetl> wrkDetls0 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- for (WrkDetl wrkDetl : wrkDetls0) {
- Goods goods = erpService.selectGoodsOne(wrkDetl.getMatnr());
- if (!Cools.isEmpty(goods)) {
- if (!erpService.updateStateAndLocForGoods(goods.getBarCode(), 3, wrkMast.getLocNo())) {
- log.error("{}鏉＄爜鍦╡rp鏁版嵁搴撲腑鏇存柊澶辫触锛�", goods.getBarCode());
- }
- } else {
- log.error("{}鏉＄爜涓嶅湪erp鏁版嵁搴撲腑锛�", wrkDetl.getMatnr());
- }
- }
-
-
// 鍏ㄦ澘鍏ュ簱
if (wrkMast.getIoType() == 1) {
// 鍏ュ簱閫氱煡鍗�
@@ -89,17 +71,18 @@
if (!waitPakinLogService.save(wrkMast.getBarcode())) {
exceptionHandle("淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。[workNo={0}]澶辫触", wrkMast.getWrkNo());
}
+
// 鍒犻櫎鍏ュ簱閫氱煡妗�
-// 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());
+ 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)) {
@@ -110,7 +93,7 @@
}
// 鍑哄簱 --------------------------------------------------------------------------------
- } 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());
@@ -137,12 +120,12 @@
// 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
if (!BaseController.isJSON(wrkDetl.getOrderNo())) {
- orderService.checkComplete(wrkDetl.getOrderNo());
+ orderService.checkComplete(wrkDetl.getOrderNo(),wrkMast.getPltType());
} else {
// 璁㈠崟鍚堝苟鍑哄簱
List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
for (OrderDto one : orderDtoList) {
- orderService.checkComplete(one.getOrderNo());
+ orderService.checkComplete(one.getOrderNo(),wrkMast.getPltType());
}
}
}
--
Gitblit v1.9.1