From 408f70e524beb80f555dcd2285cbddb979dbcf35 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 06 九月 2023 14:12:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
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 842e968..11a327c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -530,8 +530,29 @@
public R manDetlIn(JSONObject json, User user) {
Date date = new Date();
String jsonLocNo = (String) json.get("locNo");
+
+ List<ManLocDetl> locDetls = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>().eq("loc_no", jsonLocNo));
Node node = nodeService.selectOne(new EntityWrapper<Node>()
.eq("name", jsonLocNo));
+
+// if (node.getParentName().equals("A") || node.getParentName().equals("B")){
+// if (node.getRow1() == 1 && locDetls.size() >=11){
+// return R.error("璇ュ簱浣嶆帓宸叉弧");
+// }
+// if (node.getRow1() == 6 && locDetls.size() >=4){
+// return R.error("璇ュ簱浣嶆帓宸叉弧");
+// }
+// if (node.getRow1() == 12 && locDetls.size() >=4){
+// return R.error("璇ュ簱浣嶆帓宸叉弧");
+// }
+//
+// }
+// if (locDetls.size() >=12){
+// return R.error("璇ュ簱浣嶆帓宸叉弧");
+// }
+
+
+
JSONArray combMats = json.getJSONArray("combMats");
for (int i = 0; i < combMats.size(); i++) {
OrderDetl jsonOrderDetl = combMats.getObject(i, OrderDetl.class);
@@ -576,7 +597,8 @@
if(!manLocDetlService.insert(manLocDetl)){
return R.error("鎻掑叆骞冲簱鐗╂枡澶辫触锛�");
}
- } else {
+ }
+ else {
if (checkManLocDetl.getWeight() == null){
checkManLocDetl.setWeight(0.0);
}
--
Gitblit v1.9.1