From 8416a2ccfedeb54b4244a38b8a53c1c5a5eec6a9 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期二, 06 一月 2026 16:34:55 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
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..fee9659 100644
--- a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
@@ -37,6 +37,8 @@
private String inDevp;
@Value("${wcs-slave.outDevp}")
private String outDevp;
+ @Value("${wcs-slave.warehouse}")
+ private String warehouse;
@Autowired
private ApiLogService apiLogService;
@Autowired
@@ -133,11 +135,13 @@
return null;
}
+ //浠诲姟浼樺厛绾ц皟鏁� 璋冪敤wcs鎺ュ彛 閫氱煡wcs
public ReturnT<String> notice(WrkMast wrkMast) {
WrkPriority wrkPriority = new WrkPriority();
Date date = new Date();
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- wrkPriority.setTaskId(wrkMast.getWrkNo().toString()); // 缁勫彿
+ wrkPriority.setTaskId(wrkMast.getWrkNo().toString()); // 浠诲姟鍙�
+ wrkPriority.setWarehouse(warehouse); // 浠撳簱缂栫爜
wrkPriority.setPriorityCode(wrkMast.getIoPri().intValue()); // 浼樺厛绾�
wrkPriority.setMsgTime(dateFormat.format(date)); // 璋冩暣鏃堕棿
@@ -156,18 +160,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