From 585023c7abdd062c51ecf33b6b2119f3a4fbf993 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 12 一月 2026 08:16:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 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..dd86df3 100644
--- a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
@@ -10,6 +10,7 @@
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.Utils;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -37,6 +38,8 @@
private String inDevp;
@Value("${wcs-slave.outDevp}")
private String outDevp;
+ @Value("${wcs-slave.warehouse}")
+ private String warehouse;
@Autowired
private ApiLogService apiLogService;
@Autowired
@@ -57,38 +60,45 @@
task.setTaskId(wrkMast.getWrkNo().toString());
task.setBarCode(wrkMast.getBarcode());
// task.setOrder(i);
- task.setOrder((int) (100 - wrkMast.getIoPri()));
-
+ task.setOrder(wrkMast.getIoPri().intValue());
+ String LocNo = null;
+ String sourceLocNo = null;
//浼樺厛绾ф帓搴� 15.鍑哄簱>14.鍏ュ簱>13.绌烘澘鍑哄簱>12.绌烘澘鍏ュ簱>11.绉诲簱
if(wrkMast.getIoType() == 1 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57){//鍏ュ簱
workIssuedResult.setPriorityCode(14);//浼樺厛绾�
task.setTaskType(0);//鍏ュ簱
task.setStartNode(inDevp);
- task.setEndNode(wrkMast.getLocNo());//鐩爣搴撲綅
+ LocNo = Utils.getLocNo(Utils.getRow(wrkMast.getLocNo()),Utils.getBay(wrkMast.getLocNo()),Utils.getLev(wrkMast.getLocNo()));
+ task.setEndNode(LocNo);//鐩爣搴撲綅
}else if(wrkMast.getIoType() == 10 ){//绌烘澘鍏ュ簱
workIssuedResult.setPriorityCode(12);//浼樺厛绾�
task.setTaskType(0);//鍏ュ簱
task.setStartNode(inDevp);
- task.setEndNode(wrkMast.getLocNo());//鐩爣搴撲綅
+ LocNo = Utils.getLocNo(Utils.getRow(wrkMast.getLocNo()),Utils.getBay(wrkMast.getLocNo()),Utils.getLev(wrkMast.getLocNo()));
+ task.setEndNode(LocNo);//鐩爣搴撲綅
}else if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107){//鍑哄簱
workIssuedResult.setPriorityCode(15);//浼樺厛绾�
task.setTaskType(1);//鍑哄簱
- task.setStartNode(wrkMast.getSourceLocNo());//婧愬簱浣�
+ sourceLocNo = Utils.getLocNo(Utils.getRow(wrkMast.getSourceLocNo()),Utils.getBay(wrkMast.getSourceLocNo()),Utils.getLev(wrkMast.getSourceLocNo()));
+ task.setStartNode(sourceLocNo);//婧愬簱浣�
task.setEndNode(outDevp);
}else if(wrkMast.getIoType() == 11){//绉诲簱
workIssuedResult.setPriorityCode(11);//浼樺厛绾�
task.setTaskType(2);//绉诲簱
- task.setStartNode(wrkMast.getSourceLocNo());//婧愬簱浣�
- task.setEndNode(wrkMast.getLocNo());//鐩爣搴撲綅
+ sourceLocNo = Utils.getLocNo(Utils.getRow(wrkMast.getSourceLocNo()),Utils.getBay(wrkMast.getSourceLocNo()),Utils.getLev(wrkMast.getSourceLocNo()));
+ LocNo = Utils.getLocNo(Utils.getRow(wrkMast.getLocNo()),Utils.getBay(wrkMast.getLocNo()),Utils.getLev(wrkMast.getLocNo()));
+ task.setStartNode(sourceLocNo);//婧愬簱浣�
+ task.setEndNode(LocNo);//鐩爣搴撲綅
} else {//绌烘澘鍑哄簱
workIssuedResult.setPriorityCode(13);//浼樺厛绾�
task.setTaskType(1);//鍑哄簱
- task.setStartNode(wrkMast.getSourceLocNo());//婧愬簱浣�
+ sourceLocNo = Utils.getLocNo(Utils.getRow(wrkMast.getSourceLocNo()),Utils.getBay(wrkMast.getSourceLocNo()),Utils.getLev(wrkMast.getSourceLocNo()));
+ task.setStartNode(sourceLocNo);//婧愬簱浣�
task.setEndNode(outDevp);
}
tasks.add(task);
@@ -133,11 +143,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 +168,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