From 4f2b7db1184798a55046f04e17d5540b4a7e19f4 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 29 四月 2026 11:12:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 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 f612595..63ce6fd 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -76,21 +76,25 @@
if (wrkMast.getIoType() == 1) {
// 鍏ュ簱閫氱煡鍗�
if (!Cools.isEmpty(wrkMast.getBarcode())) {
- String request = "{\"barcode\":\"" + wrkMast.getBarcode() + "\"}";
- JSONObject res = erpTokenService.stockIn(wrkMast.getBarcode());
- 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);
+ if(wrkMast.getSourceStaNo().equals("1015")){
+ 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);
+ }
}
}
}
@@ -127,7 +131,9 @@
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")));
@@ -136,7 +142,9 @@
}
}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")));
--
Gitblit v1.9.1