From f1607f9045aaea2ab9161a75bc748d0aba2fe421 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期三, 26 六月 2024 13:29:46 +0800 Subject: [PATCH] logo变更 --- src/main/java/com/zy/asrs/controller/MobileController.java | 10 +++++++++- 1 files changed, 9 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 db99085..19b72fb 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(); @@ -569,6 +573,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 +600,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