From de1a08656cf1b5e10dfe3ba31b497ce246daba62 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 28 四月 2021 09:21:45 +0800
Subject: [PATCH] pda组托逻辑调整
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 13 ++++++++++++-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 6 +++---
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 86d30fa..199224d 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -15,8 +15,11 @@
// 鎴愬搧鐮�
private String productCode;
- // 鐢熶骇鍗曞彿
+ //
private String warehouse;
+
+ // 鐢熶骇鍗曞彿
+ private String mnemonic;
private String billNo;
@@ -28,6 +31,14 @@
this.warehouse = warehouse;
}
+ public String getMnemonic() {
+ return mnemonic;
+ }
+
+ public void setMnemonic(String mnemonic) {
+ this.mnemonic = mnemonic;
+ }
+
public static class CombMat {
// 鐗╂枡缂栧彿
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 43e74c4..cd6121c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -123,18 +123,18 @@
waitPakinService.delete(new EntityWrapper<WaitPakin>()
.eq("supplier", param.getBillNo())
.eq("matnr", combMat.getMatNo())
- .eq("warehouse", param.getWarehouse())
+ .eq("mnemonic", param.getMnemonic())
.isNull("zpallet"));
} else {
Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>();
- if ("".equals(param.getWarehouse())) {
+ if ("".equals(param.getMnemonic())) {
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())
+ .eq("mnemonic", param.getMnemonic())
.isNull("zpallet");
}
WaitPakin pakin = new WaitPakin();
--
Gitblit v1.9.1