From 9ea93abc2606948e5724316a4a3ec338ea14a130 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 17 十一月 2025 13:56:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 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 a0218de..02dba32 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.info("pla鍑哄簱v1,璁㈠崟鍑哄簱锛屾洿鏂颁负寰呭嚭搴撴垨鍒欏叏閮ㄥ嚭搴擄紝pla:{},anfme:{}锛屾槸鍚︽浛鎹�:{}",pla,anfme,isReplace);
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.info("鏃犺鍗曟嫞璐у嚭搴�,鏇存柊涓哄緟鍑哄簱鎴栧垯鍏ㄩ儴鍑哄簱锛宲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);
--
Gitblit v1.9.1