From aa310a47a05110a393c508921c92fa17ea95b491 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 01 三月 2024 13:08:12 +0800
Subject: [PATCH] 导入修改
---
src/main/java/com/zy/asrs/controller/MobileController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index ac86564..c26c5be 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -487,6 +487,7 @@
public R plaDetlCheck(@RequestBody JSONObject json){
String batch = json.get("batch").toString();
Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
+ Integer type = Integer.parseInt(json.get("type").toString());
if(Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
@@ -495,7 +496,7 @@
if ((Cools.isEmpty(pla))){
return R.error("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�");
}
- if(!Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_0)){
+ if(!Cools.eq(pla.getStatus(), GlobleParameter.PLA_STATUS_0) && type != 2){
return R.error("璇ュ寘鐗╂枡涓嶄负寰呭叆搴撶姸鎬侊紝鏃犳硶杩涜鍏ュ簱鎿嶄綔");
}
return R.ok(pla);
@@ -505,6 +506,7 @@
pla绉诲簱
*/
@RequestMapping("/plaDetl/move/v1")
+ @ManagerAuth
public R plaDetlMove(@RequestBody JSONObject json){
String batch = json.get("batch").toString();
@@ -519,6 +521,9 @@
if ((Cools.isEmpty(pla))){
return R.error("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�");
}
+ if(!Cools.eq(pla.getStatus(),GlobleParameter.PLA_STATUS_1)){
+ return R.error("璇ュ寘鐗╂枡鐘舵�佷笉涓哄凡鍏ュ簱鐘舵�侊紝鏃犳硶杞Щ");
+ }
Node node = nodeService.selectByUuid(locNo);
if(Cools.isEmpty(node)){
--
Gitblit v1.9.1