From 89142d4419ba96a94384b9aca370e70318d4194a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 28 四月 2025 09:52:00 +0800
Subject: [PATCH] 拣货单出库完成，但是库存没减，日志埋点
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 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 8b83051..f921158 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
@@ -1285,14 +1285,17 @@
}else {
pla.setStatus(GlobleParameter.PLA_STATUS_3);
}
+ log.warn("pla鍑哄簱v1,鏇存柊涓哄緟鍑哄簱鎴栧垯鍏ㄩ儴鍑哄簱锛宲la:{},anfme:{}",pla,anfme);
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);
OrderDetl orderDetl = orderDetlService.selectById(plaQty.getOrderDetlId());
-
+ if (orderDetl == null){
+ throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦ㄦ垨鑰呬笉鍖归厤");
+ }
orderDetl.setQty(orderDetl.getQty() + anfme);
orderDetlService.updateById(orderDetl);
@@ -1313,7 +1316,7 @@
throw new CoolException("褰撳墠鐗╂枡鍓╀綑搴撳瓨涓嶈冻");
}
-
+ log.warn("鏃犺鍗曟嫞璐у嚭搴�,鏇存柊涓哄緟鍑哄簱鎴栧垯鍏ㄩ儴鍑哄簱锛宲la:{},anfme:{}",pla,anfme);
pla.setWeightAnfme(pla.getWeightAnfme() - anfme);
if(pla.getWeightAnfme() > 0){
pla.setStatus(GlobleParameter.PLA_STATUS_3);
@@ -1323,7 +1326,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);
}
@@ -1342,7 +1345,7 @@
plaService.updateById(plaNew);
plaOld.setStatus(GlobleParameter.PLA_STATUS_1);
- plaOld.setQtyAnfme(plaOld.getQtyAnfme() - manPakOut.getCount());
+ plaOld.setQtyAnfme(0.0);
plaService.updateById(plaOld);
@@ -1388,4 +1391,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;
+ }
}
--
Gitblit v1.9.1