From 5ae3d9f543b045bd05873e6126793d58837d14dd Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期四, 24 十一月 2022 17:17:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 63f9a24..c942b02 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -96,6 +96,13 @@
if (countLoc > 0 || countWrk > 0) {
throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
}
+ //璁剧疆闈瀗ull鎵瑰彿锛�
+ for (CombParam.CombMat combMat : param.getCombMats()) {
+ if (combMat.getBatch() == null){
+ combMat.setBatch("");
+ }
+ }
+
Date now = new Date();
@@ -191,6 +198,7 @@
}
+ // 鍟嗗搧涓婃灦
@Override
public void onSale(CombParam param) {
Date now = new Date();
@@ -211,14 +219,14 @@
throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鏁伴噺鏈夎锛�");
}
if (Cools.isEmpty(combMat.getBatch())){
- throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�");
+// throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�");
}
ManLocDetl manLocDetl = new ManLocDetl();
manLocDetl.setLocNo(locno);
manLocDetl.setNodeId(node.getId());
manLocDetl.setMaktx(mat.getMaktx());
manLocDetl.setMatnr(mat.getMatnr());
- manLocDetl.setBatch(combMat.getBatch());
+ manLocDetl.setBatch(Cools.isEmpty(combMat.getBatch()) ? "" : combMat.getBatch());
manLocDetl.setAnfme(combMat.getAnfme());
manLocDetl.setModiTime(now);
if (!manLocDetlService.insert(manLocDetl)) {
@@ -227,6 +235,7 @@
}
}
+ // 鍟嗗搧涓嬫灦
@Override
public void offSale(OffSaleParam offSaleParam) {
ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
@@ -242,6 +251,9 @@
manLocDetlMapper.updateAnfme0(anfme,manLocDetl.getNodeId());
}
+ // 鏌ユ壘鍟嗗搧
+
+
@Override
@Transactional
public void adjust(MobileAdjustParam param, Long userId) {
--
Gitblit v1.9.1