From dd2aa5252295dd138a225c101732bef9695567d1 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期五, 07 十月 2022 15:25:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/FireOutHandler.java | 8 ++++----
src/main/java/com/zy/asrs/controller/MobileController.java | 4 +++-
src/main/java/com/zy/asrs/entity/LocMast.java | 4 ++++
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 08ee0f9..620e484 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -24,6 +24,7 @@
import com.zy.common.model.WrkDto;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
+import com.zy.common.web.param.SearchLocParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -340,7 +341,8 @@
}
@PostMapping("/test/suspend/auth")
// @ManagerAuth(memo = "鏆傚仠娴嬭瘯")
- public synchronized R suspendTestPACK() {
+ @ResponseBody
+ public synchronized R suspendTestPACK(@RequestBody SearchLocParam param) {
mobileService.suspendTestPACK(); //璇锋眰鏆傚仠娴嬭瘯
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index b5d667e..b450370 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -343,6 +343,10 @@
return "闈欑疆涓�";
case 5:
return "闈欑疆瀹屾垚";
+ case 6:
+ return "鏆傚仠娴嬭瘯";
+ case 7:
+ return "绱ф�ュ嚭搴�";
default:
return String.valueOf(this.packStatus);
}
diff --git a/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java b/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
index a62803c..5ee5e17 100644
--- a/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
@@ -46,10 +46,10 @@
Date now = new Date();
//浼樺厛绾�99锛屽嚭搴撶珯109锛氭秷闃茬锛�101
for(LocMast locMast : locMasts){
- if (locMast.getPackStatus()==2){
- //鍚戞樉绀哄睆鍙戜俊鎭�
- }else {
- //鍚戞樉绀哄睆鍙戜俊鎭�
+ if (locMast.getPackStatus()==2){//2.娴嬭瘯涓�
+ continue;
+ }else if (locMast.getPackStatus()==3){//3.娴嬭瘯瀹屾垚
+ continue;
}
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
--
Gitblit v1.9.1