From ae7bca6082139d8f524a5aedd08e940de83356f4 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 05 六月 2024 10:29:57 +0800
Subject: [PATCH] #
---
src/main/webapp/views/node/node.html | 6 ++++++
src/main/java/com/zy/asrs/controller/NodeController.java | 8 ++++----
src/main/java/com/zy/asrs/entity/param/PakOutDTO.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 20 ++++++++++++++++++++
src/main/java/com/zy/asrs/controller/MobileController.java | 8 ++++++++
src/main/java/com/zy/asrs/service/MobileService.java | 2 ++
6 files changed, 41 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 db99085..dc51731 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();
diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java
index 84356f1..fad123f 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -151,10 +151,10 @@
@RequestMapping(value = "/node/update/auth")
@ManagerAuth
public R update(Node node){
- Node node1 = nodeService.selectByUuid(node.getName());
- if (!Cools.isEmpty(node1)) {
- throw new CoolException("璇ョ紪鍙�/鍚嶇О宸插瓨鍦�");
- }
+// Node node1 = nodeService.selectByUuid(node.getName());
+// if (!Cools.isEmpty(node1)) {
+// throw new CoolException("璇ョ紪鍙�/鍚嶇О宸插瓨鍦�");
+// }
if (Cools.isEmpty(node) || null==node.getId()){
return R.error();
}
diff --git a/src/main/java/com/zy/asrs/entity/param/PakOutDTO.java b/src/main/java/com/zy/asrs/entity/param/PakOutDTO.java
index c8b7a00..f6e218f 100644
--- a/src/main/java/com/zy/asrs/entity/param/PakOutDTO.java
+++ b/src/main/java/com/zy/asrs/entity/param/PakOutDTO.java
@@ -25,7 +25,7 @@
if (Cools.isEmpty(this.update_time)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.create_time);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.update_time);
}
public String getStatus$(){
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index be7251a..30129ad 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -64,4 +64,6 @@
List<ManPakOut> getManPakoutByOrderNo(String orderNo);
List<Pla> pdaSelectInfmt(String barcode);
+
+ boolean checkMaximum(String locNo, int packageNum);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 8b83051..a0218de 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1388,4 +1388,24 @@
}
return plaList;
}
+
+ public boolean checkMaximum(String locNo, int packageNum){
+
+ Node node = nodeService.selectByUuid(locNo);
+ Node nodeParent = nodeService.selectById(node.getParentId());
+
+ if(Cools.isEmpty(nodeParent.getMajor())){
+ return true;
+ }
+
+ //褰撳墠搴撳瓨鍖呮暟
+ int count = plaService.selectCount(new EntityWrapper<Pla>().eq("loc_no", locNo)
+ .notIn("status", "鍏ㄩ儴鍑哄簱"));
+
+ if(nodeParent.getMajor() < count + packageNum){
+ return false;
+ }
+
+ return true;
+ }
}
diff --git a/src/main/webapp/views/node/node.html b/src/main/webapp/views/node/node.html
index b049dd7..d087df9 100644
--- a/src/main/webapp/views/node/node.html
+++ b/src/main/webapp/views/node/node.html
@@ -106,6 +106,12 @@
<input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">搴撳瓨涓婇檺</label>
+ <div class="layui-input-block">
+ <input name="major" placeholder="璇疯緭鍏ュ簱瀛樹笂闄愬寘鏁�" class="layui-input">
+ </div>
+ </div>
</div>
</div>
<hr class="layui-bg-gray">
--
Gitblit v1.9.1