From bf81b6e3600a49cb8621cd798db9aa521956bc6e Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 10 三月 2025 15:28:09 +0800
Subject: [PATCH] #接口开发
---
src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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 af840cd..f92acd1 100644
--- a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
@@ -48,29 +48,46 @@
String groupId = dateFormat.format(date)+"-"+i;
workIssuedResult.setGroupId(groupId);//缁勫彿
workIssuedResult.setMsgTime(dateFormat.format(date));
- workIssuedResult.setWarehouse("wzzy");
+ workIssuedResult.setWarehouse("ddth");
List<WorkIssuedResult.Tasks> tasks = new ArrayList<>();
WorkIssuedResult.Tasks task = new WorkIssuedResult.Tasks();
task.setTaskId(wrkMast.getWrkNo().toString());
task.setBarCode(wrkMast.getBarcode());
- task.setOrder(i);
- if(wrkMast.getIoType() == 1 ){//鍏ュ簱
+// task.setOrder(i);
+ task.setOrder((int) (100 - wrkMast.getIoPri()));
+
+ //浼樺厛绾ф帓搴� 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());//鐩爣搴撲綅
+
+
}else if(wrkMast.getIoType() == 10 ){//绌烘澘鍏ュ簱
+ workIssuedResult.setPriorityCode(12);//浼樺厛绾�
task.setTaskType(0);//鍏ュ簱
- task.setStartNode("200");
+ task.setStartNode(inDevp);
task.setEndNode(wrkMast.getLocNo());//鐩爣搴撲綅
- }else if(wrkMast.getIoType() == 101 ){//鍑哄簱
+
+ }else if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107){//鍑哄簱
+ workIssuedResult.setPriorityCode(15);//浼樺厛绾�
task.setTaskType(1);//鍑哄簱
task.setStartNode(wrkMast.getSourceLocNo());//婧愬簱浣�
task.setEndNode(outDevp);
- }else{//绌烘澘鍑哄簱
+
+ }else if(wrkMast.getIoType() == 11){//绉诲簱
+ workIssuedResult.setPriorityCode(11);//浼樺厛绾�
+ task.setTaskType(2);//绉诲簱
+ task.setStartNode(wrkMast.getSourceLocNo());//婧愬簱浣�
+ task.setEndNode(wrkMast.getLocNo());//鐩爣搴撲綅
+
+ } else {//绌烘澘鍑哄簱
+ workIssuedResult.setPriorityCode(13);//浼樺厛绾�
task.setTaskType(1);//鍑哄簱
task.setStartNode(wrkMast.getSourceLocNo());//婧愬簱浣�
- task.setEndNode("100");
+ task.setEndNode(outDevp);
}
tasks.add(task);
workIssuedResult.setTasks(tasks);
--
Gitblit v1.9.1