From 871867d77bf116d9450f2c63c33d3f6e97c8a1e9 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 08 九月 2023 13:17:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 64 +++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 22 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 4750391..d99f017 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -206,8 +206,7 @@
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getOwner(),elem.getWeight());
- detlDto.setPayment(orderDetl.getPayment());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getWeight());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert one != null;
@@ -530,8 +529,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);
@@ -557,8 +577,8 @@
return R.error("鍏ュ簱鏁伴噺澶т簬鍙叆鏁伴噺");
}
//鏌ヨ骞冲簱涓槸鍚︽湁涓�鏍风殑鐗╂枡鍙凤紝鏈夌殑璇濈洿鎺ュ鍔犳暟閲�
-// ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),jsonOrderDetl.getBatch());
-// if (checkManLocDetl == null) {
+ ManLocDetl checkManLocDetl = manLocDetlService.selectInventory(jsonLocNo,orderDetl.getMatnr(),jsonOrderDetl.getBatch());
+ if (checkManLocDetl == null) {
ManLocDetl manLocDetl = new ManLocDetl();
Synchro.Copy(orderDetl, manLocDetl);
@@ -576,24 +596,24 @@
if(!manLocDetlService.insert(manLocDetl)){
return R.error("鎻掑叆骞冲簱鐗╂枡澶辫触锛�");
}
-// }
-// else {
-// if (checkManLocDetl.getWeight() == null){
-// checkManLocDetl.setWeight(0.0);
-// }
-// if (jsonOrderDetl.getWeight() == null){
-// jsonOrderDetl.setWeight(0.0);
-// }
-// if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(),
-// node.getName(),
-// jsonOrderDetl.getMatnr(),
-// jsonOrderDetl.getBatch(),checkManLocDetl.getWeight()+jsonOrderDetl.getWeight()
-// )<=0
-// ){
-// return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
-// }
-//
-// }
+ }
+ else {
+ if (checkManLocDetl.getWeight() == null){
+ checkManLocDetl.setWeight(0.0);
+ }
+ if (jsonOrderDetl.getWeight() == null){
+ jsonOrderDetl.setWeight(0.0);
+ }
+ if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(),
+ node.getName(),
+ jsonOrderDetl.getMatnr(),
+ jsonOrderDetl.getBatch(),checkManLocDetl.getWeight()+jsonOrderDetl.getWeight()
+ )<=0
+ ){
+ return R.error("淇敼骞冲簱鐗╂枡澶辫触锛�");
+ }
+
+ }
orderDetl.setQty(orderDetl.getQty() + jsonOrderDetl.getAnfme());
orderDetl.setWorkQty(orderDetl.getWorkQty() + jsonOrderDetl.getAnfme());
orderDetl.setUpdateTime(date);
--
Gitblit v1.9.1