From 82889ebbf8d8d92ce1162a983b19a5d3ed64cd2b Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 18 十二月 2025 13:46:10 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java | 8 ++++----
src/main/java/com/zy/asrs/controller/WrkMastController.java | 3 +++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 3a6a9c5..318128d 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -12,6 +12,7 @@
import com.core.common.R;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.task.handler.WCSReportHandler;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,6 +24,8 @@
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private WCSReportHandler wcsReportHandler;
@RequestMapping(value = "/wrkMast/{id}/auth")
@ManagerAuth
diff --git a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
index 375f994..38bef90 100644
--- a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
@@ -133,6 +133,7 @@
return null;
}
+ //浠诲姟浼樺厛绾ц皟鏁� 璋冪敤wcs鎺ュ彛 閫氱煡wcs
public ReturnT<String> notice(WrkMast wrkMast) {
WrkPriority wrkPriority = new WrkPriority();
Date date = new Date();
@@ -156,18 +157,17 @@
wrkMast.setWrkSts(1L);
wrkMastService.updateById(wrkMast);
} else {
- log.error("wms涓嬪彂浠诲姟缁檞cs澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", url + "/" + workIssued, JSON.toJSONString(wrkPriority), response);
- throw new CoolException("wms涓嬪彂浠诲姟缁檞cs澶辫触");
+ log.error("wms璋冩暣浼樺厛绾т笅鍙戠粰wcs澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", url + "/" + workIssued, JSON.toJSONString(wrkPriority), response);
+ throw new CoolException("wms璋冩暣浼樺厛绾т笅鍙戠粰wcs澶辫触");
}
} catch (Exception e) {
log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
} finally {
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "wms涓嬪彂浠诲姟缁檞cs",
+ "wms璋冩暣浼樺厛绾т笅鍙戠粰wcs",
url + "/" + workIssued,
null,
"127.0.0.1",
--
Gitblit v1.9.1