From 3aab99bed6dd2b808645ee2e4744226f4c687168 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 28 四月 2026 17:17:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 54 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 37 insertions(+), 17 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 87508d1..f097788 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -46,6 +46,8 @@
private ErpTokenService erpTokenService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private ApiLogService apiLogService;
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
@@ -74,21 +76,27 @@
if (wrkMast.getIoType() == 1) {
// 鍏ュ簱閫氱煡鍗�
if (!Cools.isEmpty(wrkMast.getBarcode())) {
-// JSONObject res = erpTokenService.stockIn(wrkMast.getBarcode());
-// if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
-// JSONObject data = res.getJSONObject("data");
-// String tlocation = data == null ? null : data.getString("tlocation");
-// if (!Cools.isEmpty(tlocation) && !Cools.isEmpty(wrkMast.getLocNo())) {
-// List<LocDetl> detls = locDetlService.selectList(new EntityWrapper<LocDetl>()
-// .eq("loc_no", wrkMast.getLocNo()));
-// if (!Cools.isEmpty(detls)) {
-// for (LocDetl detl : detls) {
-// detl.setStandby1(tlocation);
-// locDetlService.updateById(detl);
-// }
-// }
-// }
-// }
+ String request = "{\"barcode\":\"" + wrkMast.getBarcode() + "\"}";
+ log.info("ERP鍏ュ簱涓婃姤璇锋眰: workNo={}, request={}", wrkMast.getWrkNo(), request);
+ JSONObject res = erpTokenService.stockIn(wrkMast.getBarcode());
+ log.info("ERP鍏ュ簱涓婃姤鍝嶅簲: workNo={}, response={}", wrkMast.getWrkNo(), res == null ? null : res.toJSONString());
+ apiLogService.save("erp.stockIn", "erpTokenService.stockIn", null, null, request,
+ res == null ? null : res.toJSONString(),
+ res != null && Boolean.TRUE.equals(res.getBoolean("success")));
+ if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
+ JSONObject data = res.getJSONObject("data");
+ String tlocation = data == null ? null : data.getString("tlocation");
+ if (!Cools.isEmpty(tlocation) && !Cools.isEmpty(wrkMast.getLocNo())) {
+ List<LocDetl> detls = locDetlService.selectList(new EntityWrapper<LocDetl>()
+ .eq("loc_no", wrkMast.getLocNo()));
+ if (!Cools.isEmpty(detls)) {
+ for (LocDetl detl : detls) {
+ detl.setStandby1(tlocation);
+ locDetlService.updateById(detl);
+ }
+ }
+ }
+ }
// 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
@@ -117,15 +125,27 @@
// 鍑哄簱 --------------------------------------------------------------------------------
} else if (wrkMast.getWrkSts() == 15) {
- if(wrkMast.getIsSuplus()!=null && wrkMast.getIsSuplus()==1 && !Objects.isNull(wrkMast.getExitMk())){
- List<WrkDetl> wrkDetls1 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ if(wrkMast.getIsSuplus()!=null && wrkMast.getIsSuplus()==1 && wrkMast.getExitMk().equals("Y")){
+ List<WrkDetl> wrkDetls1 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no",wrkMast.getWrkNo()));
WrkDetl wrkDetl = wrkDetls1.get(0);
+ String request = "{\"barcode\":\"" + wrkMast.getBarcode() + "\",\"anfme\":" + wrkDetl.getAnfme() + "}";
+ log.info("ERP閫�鏂欎笂鎶ヨ姹�: workNo={}, request={}", wrkMast.getWrkNo(), request);
JSONObject res = erpTokenService.stockBack(wrkMast.getBarcode(),wrkDetl.getAnfme(),null);
+ log.info("ERP閫�鏂欎笂鎶ュ搷搴�: workNo={}, response={}", wrkMast.getWrkNo(), res == null ? null : res.toJSONString());
+ apiLogService.save("erp.stockBack", "erpTokenService.stockBack", null, null, request,
+ res == null ? null : res.toJSONString(),
+ res != null && Boolean.TRUE.equals(res.getBoolean("success")));
if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
}
}else if(Objects.isNull(wrkMast.getLocNo())){
+ String request = "{\"barcode\":\"" + wrkMast.getBarcode() + "\"}";
+ log.info("ERP鍑哄簱涓婃姤璇锋眰: workNo={}, request={}", wrkMast.getWrkNo(), request);
JSONObject res = erpTokenService.stockOut(wrkMast.getBarcode(),null);
+ log.info("ERP鍑哄簱涓婃姤鍝嶅簲: workNo={}, response={}", wrkMast.getWrkNo(), res == null ? null : res.toJSONString());
+ apiLogService.save("erp.stockOut", "erpTokenService.stockOut", null, null, request,
+ res == null ? null : res.toJSONString(),
+ res != null && Boolean.TRUE.equals(res.getBoolean("success")));
if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
}
--
Gitblit v1.9.1