From e955eb6077fc28f0ad379af45c5adec1962eeff6 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期三, 29 四月 2026 17:56:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 80 +++++++++++++++++++++++++---------------
1 files changed, 50 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 d26a89d..63ce6fd 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,23 +76,29 @@
if (wrkMast.getIoType() == 1) {
// 鍏ュ簱閫氱煡鍗�
if (!Cools.isEmpty(wrkMast.getBarcode())) {
-// if(Cools.isEmpty(wrkMast.getPacked()){
-// 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);
-// }
-// }
-// }
-// }
-// }
+ 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);
+ }
+ }
+ }
+ }
+ }
// 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
@@ -119,19 +127,31 @@
// 鍑哄簱 --------------------------------------------------------------------------------
} else if (wrkMast.getWrkSts() == 15) {
-// if(wrkMast.getIsSuplus()!=null && wrkMast.getIsSuplus()==1){
-// List<WrkDetl> wrkDetls1 = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
-// WrkDetl wrkDetl = wrkDetls1.get(0);
-// JSONObject res = erpTokenService.stockBack(wrkMast.getBarcode(),wrkDetl.getAnfme(),null);
-// if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
-//
-// }
-// }else{
-// JSONObject res = erpTokenService.stockOut(wrkMast.getBarcode(),null);
-// if (res != null && Boolean.TRUE.equals(res.getBoolean("success"))) {
-//
-// }
-// }
+ 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"))) {
+
+ }
+ }
// if (!Objects.isNull(wrkMast.getWrkCode())) {
// return FAIL;
--
Gitblit v1.9.1