From 4fccd3709649b7b7ab43d6f8a6c62fd72b3123c6 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 21 六月 2025 15:54:16 +0800
Subject: [PATCH] 完善
---
src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 3e991b0..622ddf8 100644
--- a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.result.WorkIssuedResult;
@@ -40,7 +41,7 @@
@Autowired
private WrkMastService wrkMastService;
- public ReturnT<String> start(WrkMast wrkMast,int i) {
+ public synchronized ReturnT<String> start(WrkMast wrkMast,int i) {
WorkIssuedResult workIssuedResult = new WorkIssuedResult();
Date date = new Date();
@@ -52,26 +53,44 @@
List<WorkIssuedResult.Tasks> tasks = new ArrayList<>();
WorkIssuedResult.Tasks task = new WorkIssuedResult.Tasks();
- task.setTaskId(wrkMast.getWrkNo().toString());
+ if(Cools.isEmpty(wrkMast.getMemo())){
+ task.setTaskId(wrkMast.getWrkNo().toString()+"-"+new Date().getTime());
+ wrkMast.setMemo(wrkMast.getWrkNo().toString()+"-"+new Date().getTime());
+ wrkMastService.updateById(wrkMast);
+ }else {
+ task.setTaskId(wrkMast.getMemo());
+ }
+
task.setBarCode(wrkMast.getBarcode());
task.setOrder(i);
+
+ //浼樺厛绾ф帓搴� 15.鍑哄簱>14.鍏ュ簱>13.绌烘澘鍑哄簱>12.绌烘澘鍏ュ簱>11.绉诲簱
if(wrkMast.getIoType() == 1 ){//鍏ュ簱
+ 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.setEndNode(wrkMast.getLocNo());//鐩爣搴撲綅
+
}else if(wrkMast.getIoType() == 101 ){//鍑哄簱
+ workIssuedResult.setPriorityCode(15);//浼樺厛绾�
task.setTaskType(1);//鍑哄簱
task.setStartNode(wrkMast.getSourceLocNo());//婧愬簱浣�
task.setEndNode(outDevp);
+
}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");
--
Gitblit v1.9.1