From c23c5d3adeac7dca6cc10e4fe96b8d0693a06d16 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 04 一月 2025 12:47:58 +0800
Subject: [PATCH] #出库规则完成，盘点拣料出库测试完成
---
src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java | 5 +++--
src/main/java/com/zy/common/web/WcsController.java | 30 ++++++++++++++++++++++++++----
pom.xml | 2 +-
3 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 46d1a99..6151db3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
</dependencies>
<build>
- <finalName>ddthasrs</finalName>
+ <finalName>wms</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
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 3c53066..d9c1e8f 100644
--- a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
@@ -57,11 +57,12 @@
task.setOrder(i);
//浼樺厛绾ф帓搴� 15.鍑哄簱>14.鍏ュ簱>13.绌烘澘鍑哄簱>12.绌烘澘鍏ュ簱>11.绉诲簱
- if(wrkMast.getIoType() == 1 ){//鍏ュ簱
+ 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);//浼樺厛绾�
@@ -69,7 +70,7 @@
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());//婧愬簱浣�
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index d426bd7..a28c43a 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -342,7 +342,28 @@
* 瀹屾垚,8-浠诲姟缁撴潫
*/
if (statusParam.getTaskStatus()==0){
- wrkMast.setWrkSts(1L);//1.宸叉帴鏀�
+ //鎷ｆ枡鍜岀洏鐐瑰啀鍏ュ簱鍒ゆ柇
+ if((wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) && wrkMast.getWrkSts() == 14){
+ Date now = new Date();
+ wrkMast.setIoTime(now);
+ wrkMast.setIoType(wrkMast.getIoType() - 50); // 鍏ュ嚭搴撶被鍨�: 103->53,104->54,107->57
+ wrkMast.setWrkSts(1L);//1.宸叉帴鏀�
+ wrkMast.setSourceStaNo(101); // 婧愮珯
+ wrkMast.setStaNo(null); // 鐩爣绔�
+ wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 鐩爣搴撲綅 = 鍑哄簱鏃剁殑婧愬簱浣�
+ wrkMast.setSourceLocNo(""); // 婧愬簱浣嶆竻绌�
+ wrkMast.setModiTime(now);
+ // 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
+ LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
+ locMast.setLocSts("Q");
+ locMast.setModiTime(new Date());
+ if (!locMastService.updateById(locMast)) {
+
+ throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
+ }
+ }else{
+ wrkMast.setWrkSts(1L);//1.宸叉帴鏀�
+ }
}else if (statusParam.getTaskStatus()==1){
wrkMast.setWrkSts(2L);//2.浠诲姟寮�濮�
}else if (statusParam.getTaskStatus()==2){
@@ -350,11 +371,12 @@
}else if (statusParam.getTaskStatus()==3){
wrkMast.setWrkSts(6L);//6.浠诲姟涓柇
} else if (statusParam.getTaskStatus()==4 || statusParam.getTaskStatus()==8){
-// wrkMast.setWrkSts(7L);//6.鏀捐揣瀹屾垚
- if(wrkMast.getIoType()==1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 11){
+ if(wrkMast.getIoType()==1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 11 || wrkMast.getIoType() == 53 ||wrkMast.getIoType() == 57){
wrkMast.setWrkSts(4L);//4.鍏ュ簱瀹屾垚
- }else if (wrkMast.getIoType()==101 || wrkMast.getIoType()==110){
+ }else if (wrkMast.getIoType()==103 || wrkMast.getIoType()==107){
wrkMast.setWrkSts(14L);//14.宸插嚭搴撴湭纭
+ }else if (wrkMast.getIoType()==101 || wrkMast.getIoType()==110){
+ wrkMast.setWrkSts(7L);//7.鍑哄簱瀹屾垚
}
}
wrkMastService.updateById(wrkMast);
--
Gitblit v1.9.1