From 5d6c454638445a2e28e478e9d971fbdd73b7eb2c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 18 九月 2024 14:29:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index db99085..57c37d7 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -431,6 +431,10 @@
public R plaPackIn(@RequestBody JSONObject json) throws ParseException {
String locNo = json.get("locNo").toString();
JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString());
+ //鍒ゆ柇姝ゆ鍏ュ簱鏄惁杈惧埌搴撳瓨涓婇檺
+ if(!mobileService.checkMaximum(locNo,jsonArray.size())){
+ return R.error("褰撳墠鍏ュ簱鍖呮暟宸茶秴杩囧簱瀛樹笂闄�");
+ }
for (Object o : jsonArray){
JSONObject jsonObject = (JSONObject)o;
String brand = jsonObject.get("brand").toString();
@@ -451,8 +455,8 @@
return R.ok("鍏ュ簱鎴愬姛");
}
- @RequestMapping("/plaDetl/packin/v2")
- //@ManagerAuth(memo="pla鍏ュ簱")
+ @RequestMapping("/plaDetl/packin/v1锛�")
+ @ManagerAuth(memo="pla鍏ュ簱")
@Transactional
public R plaPackInTestErp(@RequestBody JSONObject json) throws ParseException {
String locNo = json.get("locNo").toString();
@@ -466,10 +470,14 @@
return R.error("鏈夊弬鏁颁负绌猴紝鏃犳硶鍏ュ簱");
}
//娴嬭瘯
- if(true){
+ if(false){
User user = new User();
user.setUsername("test");
mobileService.plaPakin(brand,locNo,batch,packageNo,user);
+ json.put("user",user.getUsername());
+ }else {
+ mobileService.plaPakin(brand,locNo,batch,packageNo,getUser());
+ json.put("user",getUser().getUsername());
}
}
//鍏ュ簱鎴愬姛鍚庝笂鎶RP
@@ -569,6 +577,10 @@
}
List<PlaMoveParam.PlaMove> plas = param.getPlas();
+ //鍒ゆ柇姝ゆ鍏ュ簱鏄惁杈惧埌搴撳瓨涓婇檺
+ if(!mobileService.checkMaximum(locNo,plas.size())){
+ return R.error("褰撳墠鍏ュ簱鍖呮暟宸茶秴杩囧簱瀛樹笂闄�");
+ }
param.getPlas().forEach(p -> {
String brand = p.getBrand();
@@ -592,7 +604,7 @@
plaService.updateById(pla);
SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(),
- locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+ locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
});
--
Gitblit v1.9.1