From 91f2cd5b0f832091f654cce926585d2f05cad114 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 08 四月 2021 23:22:32 +0800
Subject: [PATCH] Merge branches 'dev' and 'master' of https://gitee.com/luxiaotao1123/xtywms into master
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 22 ++++++++++++++--------
1 files changed, 14 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 d099d1a..43e74c4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -99,10 +99,10 @@
.eq("matnr", combMat.getMatNo())
.isNull("zpallet"));
if (one == null) {
- throw new CoolException("閫氱煡鍗曚笉瀛樺湪"+combMat.getMatNo()+"鏁版嵁锛�");
+ throw new CoolException("閫氱煡鍗曚笉瀛樺湪" + combMat.getMatNo() + "鏁版嵁锛�");
}
if (combMat.getCount() > one.getAnfme()) {
- throw new CoolException(combMat.getMatNo()+"鐗╂枡鏁伴噺涓嶈冻锛�");
+ throw new CoolException(combMat.getMatNo() + "鐗╂枡鏁伴噺涓嶈冻锛�");
}
MatCode matCode = matCodeService.selectById(combMat.getMatNo());
if (Cools.isEmpty(matCode)) {
@@ -123,12 +123,20 @@
waitPakinService.delete(new EntityWrapper<WaitPakin>()
.eq("supplier", param.getBillNo())
.eq("matnr", combMat.getMatNo())
+ .eq("warehouse", param.getWarehouse())
.isNull("zpallet"));
} else {
- Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
- .eq("supplier", param.getBillNo())
- .eq("matnr", combMat.getMatNo())
- .isNull("zpallet");
+ Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>();
+ if ("".equals(param.getWarehouse())) {
+ wrapper.eq("supplier", param.getBillNo())
+ .eq("matnr", combMat.getMatNo())
+ .isNull("zpallet");
+ } else {
+ wrapper.eq("supplier", param.getBillNo())
+ .eq("matnr", combMat.getMatNo())
+ .eq("warehouse", param.getWarehouse())
+ .isNull("zpallet");
+ }
WaitPakin pakin = new WaitPakin();
pakin.setAnfme(one.getAnfme() - waitPakin.getAnfme());
if (!waitPakinService.update(pakin, wrapper)) {
@@ -141,8 +149,6 @@
}
-
-
}
--
Gitblit v1.9.1