From 9e086905993eab6b45fb95a3faba14402404bd94 Mon Sep 17 00:00:00 2001
From: hmpc <hmpc>
Date: 星期日, 02 三月 2025 09:57:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 30 +++++++++++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +-
src/main/java/com/zy/asrs/entity/WrkMast.java | 52 +++++++++++++-------------
3 files changed, 59 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4e157dc..43f1159 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -13,6 +13,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
+import java.util.List;
/**
* Created by vincent on 2024/10/16
@@ -57,6 +58,35 @@
}
/**
+ * 娣诲姞鍑哄簱鍗�
+ */
+ @PostMapping("/task/cs/down/default/v2")
+ @AppAuth(memo = "WCS浠诲姟涓嬪彂")
+ public synchronized R wcsTaskDistribution2(@RequestHeader(required = false) String appkey,
+ @RequestBody List<WcsTaskDistributionParam> param1,
+ HttpServletRequest request) {
+ auth(appkey, param1, request);
+ for (WcsTaskDistributionParam param:param1){
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getTaskNo())) {
+ return R.error("宸ヤ綔鍙穂taskNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getStartSta()) || param.getStartSta$()==0) {
+ return R.error("璧风偣[startSta]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getEndSta()) || param.getEndSta$()==0) {
+ return R.error("缁堢偣[endSta]涓嶈兘涓虹┖");
+ }
+// openService.wcsTaskDistribution(param);
+
+ openService.wcsTaskDistribution(param);
+ }
+ return R.ok();
+ }
+
+ /**
* 鏁版嵁鍚屾
*/
@PostMapping("/status/cs/default/v1")
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 92d4e2c..1787bc2 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -498,32 +498,6 @@
public Integer getStaNoCs(){
switch (staNo){
- case 101:
- return 119;
- case 103:
- return 123;
- case 105:
- return 127;
- case 107:
- return 131;
- case 109:
- return 132;
- case 119:
- return 101;
- case 123:
- return 103;
- case 127:
- return 105;
- case 131:
- return 107;
- case 132:
- return 109;
- }
- return 0;
- }
-
- public Integer getSourceNoCs(){
- switch (sourceStaNo){
case 120:
return 102;
case 124:
@@ -548,4 +522,30 @@
return 0;
}
+ public Integer getSourceNoCs(){
+ switch (sourceStaNo){
+ case 101:
+ return 119;
+ case 103:
+ return 123;
+ case 105:
+ return 127;
+ case 107:
+ return 131;
+ case 109:
+ return 132;
+ case 119:
+ return 101;
+ case 123:
+ return 103;
+ case 127:
+ return 105;
+ case 131:
+ return 107;
+ case 132:
+ return 109;
+ }
+ return 0;
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index d451a62..3393e65 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -402,14 +402,14 @@
}
} else {
//娴嬭瘯鐢�
- wrkMast.setWrkSts(5L);
+ wrkMast.setWrkSts(4L);
wrkMast.setAppeTime(now);
wrkMastService.updateById(wrkMast);
WrkMast wrkMast1 = new WrkMast();
int workNo = commonService.getWorkNo(0);
wrkMast1.setWrkNo((long) workNo);
- wrkMast1.setSourceStaNo(wrkMast.getStaNoCs());
- wrkMast1.setStaNo(wrkMast.getSourceNoCs());
+ wrkMast1.setSourceStaNo(wrkMast.getSourceNoCs());
+ wrkMast1.setStaNo(wrkMast.getStaNoCs());
wrkMast1.setWrkSts(1L);
wrkMast1.setIoType(1);
wrkMast1.setModiTime(now);
--
Gitblit v1.9.1