From 3db6c2d4a320891666b55780595b6793667342fd Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 08 三月 2024 14:48:54 +0800
Subject: [PATCH] 添加牌号作为唯一物料的筛选条件
---
src/main/java/com/zy/asrs/controller/MobileController.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index ec4aa72..01339ec 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -429,6 +429,7 @@
JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString());
for (Object o : jsonArray){
JSONObject jsonObject = (JSONObject)o;
+ String brand = json.get("brand").toString();
String batch = jsonObject.get("batch").toString();
Integer packageNo = Integer.parseInt(jsonObject.get("packageNo").toString());
if(Cools.isEmpty(locNo) || Cools.isEmpty(batch) || Cools.isEmpty(packageNo)){
@@ -438,7 +439,7 @@
if(true){
User user = new User();
user.setUsername("test");
- mobileService.plaPakin(locNo,batch,packageNo,user);
+ mobileService.plaPakin(brand,locNo,batch,packageNo,user);
}
}
return R.ok("鍏ュ簱鎴愬姛");
@@ -448,6 +449,7 @@
// @ManagerAuth(memo="pla鍑哄簱")
public R plaPackOut1(@RequestBody JSONObject json){
String locNo = json.get("locNo").toString();
+ String brand = json.get("brand").toString();
String batch = json.get("batch").toString();
Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
String orderNo = json.get("orderNo").toString();
@@ -459,7 +461,7 @@
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
- mobileService.plaPakout(locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme);
+ mobileService.plaPakout(brand,locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme);
return R.ok();
}
@@ -467,6 +469,7 @@
// @ManagerAuth(memo="pla鍑哄簱")
public R plaPackOut(@RequestBody JSONObject json){
String locNo = json.get("locNo").toString();
+ String brand = json.get("brand").toString();
String batch = json.get("batch").toString();
Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
String orderNo = json.get("orderNo").toString();
@@ -478,13 +481,14 @@
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
- mobileService.plaPakout(locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme);
+ mobileService.plaPakout(brand,locNo,batch,packageNo,orderNo,orderDetlId,wrkNo,anfme);
return R.ok();
}
@RequestMapping("/plaDetl/check/v1")
public R plaDetlCheck(@RequestBody JSONObject json){
+ String brand = json.get("brand").toString();
String batch = json.get("batch").toString();
Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
Integer type = Integer.parseInt(json.get("type").toString());
@@ -492,7 +496,7 @@
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
- Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
if ((Cools.isEmpty(pla))){
return R.error("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�");
}
@@ -508,7 +512,7 @@
@RequestMapping("/plaDetl/move/v1")
@ManagerAuth
public R plaDetlMove(@RequestBody JSONObject json){
-
+ String brand = json.get("brand").toString();
String batch = json.get("batch").toString();
Integer packageNo = Integer.parseInt(json.get("packageNo").toString());
String locNo = json.get("locNo").toString();
@@ -517,7 +521,7 @@
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
- Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo);
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo,brand);
if ((Cools.isEmpty(pla))){
return R.error("璇ュ寘鐗╂枡鏈綍鍏ワ紝鏃犳硶鏌ヨ鍒扮浉鍏充俊鎭�");
}
--
Gitblit v1.9.1