From 178d30a9b69598e82489d24b1da18b3b3ab0766b Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 19 一月 2026 14:01:50 +0800
Subject: [PATCH] #拣料盘点功能优化
---
src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 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 dd86df3..097f721 100644
--- a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
@@ -40,6 +40,7 @@
private String outDevp;
@Value("${wcs-slave.warehouse}")
private String warehouse;
+ static String namespace = null;
@Autowired
private ApiLogService apiLogService;
@Autowired
@@ -53,7 +54,7 @@
String groupId = dateFormat.format(date)+"-"+i;
workIssuedResult.setGroupId(groupId);//缁勫彿
workIssuedResult.setMsgTime(dateFormat.format(date));
- workIssuedResult.setWarehouse("ddth");
+ workIssuedResult.setWarehouse("ZYNMG");
List<WorkIssuedResult.Tasks> tasks = new ArrayList<>();
WorkIssuedResult.Tasks task = new WorkIssuedResult.Tasks();
@@ -68,38 +69,54 @@
workIssuedResult.setPriorityCode(14);//浼樺厛绾�
task.setTaskType(0);//鍏ュ簱
task.setStartNode(inDevp);
- LocNo = Utils.getLocNo(Utils.getRow(wrkMast.getLocNo()),Utils.getBay(wrkMast.getLocNo()),Utils.getLev(wrkMast.getLocNo()));
+ LocNo = Utils.getLocNoToWcs(Utils.getRow(wrkMast.getLocNo()),Utils.getBay(wrkMast.getLocNo()),Utils.getLev(wrkMast.getLocNo()));
task.setEndNode(LocNo);//鐩爣搴撲綅
-
+ task.setCargoSize(null);
+ switch (wrkMast.getIoType()){
+ case 1: namespace= "鍏ㄦ澘鍏ュ簱涓嬪彂";break;
+ case 53: namespace= "鎷ｆ枡鍐嶅叆搴撲笅鍙�";break;
+ case 57: namespace= "鐩樼偣鍐嶅叆搴撲笅鍙�";break;
+ }
}else if(wrkMast.getIoType() == 10 ){//绌烘澘鍏ュ簱
workIssuedResult.setPriorityCode(12);//浼樺厛绾�
task.setTaskType(0);//鍏ュ簱
task.setStartNode(inDevp);
- LocNo = Utils.getLocNo(Utils.getRow(wrkMast.getLocNo()),Utils.getBay(wrkMast.getLocNo()),Utils.getLev(wrkMast.getLocNo()));
+ LocNo = Utils.getLocNoToWcs(Utils.getRow(wrkMast.getLocNo()),Utils.getBay(wrkMast.getLocNo()),Utils.getLev(wrkMast.getLocNo()));
task.setEndNode(LocNo);//鐩爣搴撲綅
+ task.setCargoSize(null);
+ namespace = "绌烘澘鍏ュ簱";
}else if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107){//鍑哄簱
workIssuedResult.setPriorityCode(15);//浼樺厛绾�
task.setTaskType(1);//鍑哄簱
- sourceLocNo = Utils.getLocNo(Utils.getRow(wrkMast.getSourceLocNo()),Utils.getBay(wrkMast.getSourceLocNo()),Utils.getLev(wrkMast.getSourceLocNo()));
+ sourceLocNo = Utils.getLocNoToWcs(Utils.getRow(wrkMast.getSourceLocNo()),Utils.getBay(wrkMast.getSourceLocNo()),Utils.getLev(wrkMast.getSourceLocNo()));
task.setStartNode(sourceLocNo);//婧愬簱浣�
task.setEndNode(outDevp);
+ task.setCargoSize(null);
+ switch (wrkMast.getIoType()){
+ case 101: namespace= "鍏ㄦ澘鍑哄簱涓嬪彂";break;
+ case 103: namespace= "鎷ｆ枡鍑哄簱涓嬪彂";break;
+ case 107: namespace= "鐩樼偣鍑哄簱涓嬪彂";break;
+ }
}else if(wrkMast.getIoType() == 11){//绉诲簱
workIssuedResult.setPriorityCode(11);//浼樺厛绾�
task.setTaskType(2);//绉诲簱
- 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()));
+ sourceLocNo = Utils.getLocNoToWcs(Utils.getRow(wrkMast.getSourceLocNo()),Utils.getBay(wrkMast.getSourceLocNo()),Utils.getLev(wrkMast.getSourceLocNo()));
+ LocNo = Utils.getLocNoToWcs(Utils.getRow(wrkMast.getLocNo()),Utils.getBay(wrkMast.getLocNo()),Utils.getLev(wrkMast.getLocNo()));
task.setStartNode(sourceLocNo);//婧愬簱浣�
task.setEndNode(LocNo);//鐩爣搴撲綅
-
+ task.setCargoSize(null);
+ namespace = "绉诲簱涓嬪彂";
} else {//绌烘澘鍑哄簱
workIssuedResult.setPriorityCode(13);//浼樺厛绾�
task.setTaskType(1);//鍑哄簱
- sourceLocNo = Utils.getLocNo(Utils.getRow(wrkMast.getSourceLocNo()),Utils.getBay(wrkMast.getSourceLocNo()),Utils.getLev(wrkMast.getSourceLocNo()));
+ sourceLocNo = Utils.getLocNoToWcs(Utils.getRow(wrkMast.getSourceLocNo()),Utils.getBay(wrkMast.getSourceLocNo()),Utils.getLev(wrkMast.getSourceLocNo()));
task.setStartNode(sourceLocNo);//婧愬簱浣�
task.setEndNode(outDevp);
+ task.setCargoSize(null);
+ namespace = "绌烘澘鍑哄簱涓嬪彂";
}
tasks.add(task);
workIssuedResult.setTasks(tasks);
@@ -118,7 +135,7 @@
wrkMast.setWrkSts(1L);
wrkMastService.updateById(wrkMast);
} else {
- log.error("wms涓嬪彂浠诲姟缁檞cs澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", url+"/"+workIssued, JSON.toJSONString(workIssuedResult), response);
+ log.error("{}}涓嬪彂浠诲姟缁檞cs澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}",namespace, url+"/"+workIssued, JSON.toJSONString(workIssuedResult), response);
throw new CoolException("wms涓嬪彂浠诲姟缁檞cs澶辫触");
}
} catch (Exception e) {
@@ -129,7 +146,7 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "wms涓嬪彂浠诲姟缁檞cs",
+ namespace,
url+"/"+workIssued,
null,
"127.0.0.1",
--
Gitblit v1.9.1