From c31bf5a8902485b750b5814a0d1c54ecc65d2c96 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 31 八月 2024 10:12:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 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 cb743d0..3ad8124 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -666,7 +666,7 @@
orderService.checkComplete(order.getOrderNo());
SaasUtils.insertLog(0,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
- null,null,null,null,null);
+ null,null,null,null,null,null);
}
@@ -808,7 +808,7 @@
}
}
SaasUtils.insertLog(1,jsonLocNo,jsonOrderDetl.getMatnr(), jsonOrderDetl.getAnfme(),user.getUsername(),
- null,null,null,null,null);
+ null,null,null,null,null,null);
}
return R.ok("涓嬫灦瀹屾垚");
@@ -1233,7 +1233,7 @@
plaService.updateById(pla);
SaasUtils.insertLog(0,locNo,pla.getBrand(),pla.getWeightAnfme(),user.getUsername(),
- null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+ null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
}
@Override
@@ -1287,7 +1287,7 @@
}
plaService.updateById(pla);
SaasUtils.insertLog(1,locNo,pla.getBrand(),anfme,null,null,
- pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+ pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
//鏇存柊璁㈠崟鏄庣粏
Order order = orderService.selectByNo(orderNo);
@@ -1323,7 +1323,7 @@
plaService.updateById(pla);
- SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,null,null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
+ SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,null,null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
}
@@ -1378,15 +1378,34 @@
throw new CoolException("璇锋鏌ヨ緭鍏ョ殑搴撲綅鐮�");
}
plaEntityWrapper.eq("loc_no",barcode);
-
+ plaEntityWrapper.notLike("status","鍏ㄩ儴鍑哄簱");
}else {
throw new CoolException("鏉＄爜淇℃伅鏈夎!");
}
- plaEntityWrapper.eq(false,"status","鍏ㄩ儴鍑哄簱");
List<Pla> plaList = plaService.selectList(plaEntityWrapper);
if (Cools.isEmpty(plaList)){
throw new CoolException("鏈煡璇㈠埌搴撳瓨鐗╂枡淇℃伅");
}
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;
+ }
}
--
Gitblit v1.9.1