From bbfb525c87ab208f123f8f5a4c7c6a87df4a3a23 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 26 九月 2023 15:08:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
index fda07cf..d0a09c9 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -24,16 +24,24 @@
// 鍟嗗搧缂栧彿
private String matnr;
- // 鎵瑰彿
+ // 搴忓垪鐮�
private String batch;
// 鍙樻洿鏁伴噺
private Double count;
- public LocDetlAdjust(String matnr, String batch, Double count) {
+ //瀹㈡埛淇℃伅
+ private String manu;
+
+ //澶囨敞
+ private String memo;
+
+ public LocDetlAdjust(String matnr, String batch, Double count, String manu, String memo) {
this.matnr = matnr;
this.batch = batch;
this.count = count;
+ this.manu = manu;
+ this.memo = memo;
}
}
@@ -52,7 +60,7 @@
}
}
if (!exit) {
- copyList.add(new LocDetlAdjustParam.LocDetlAdjust(adjust.getMatnr(), adjust.getBatch(), adjust.getCount()));
+ copyList.add(new LocDetlAdjustParam.LocDetlAdjust(adjust.getMatnr(), adjust.getBatch(), adjust.getCount(), adjust.getManu(), adjust.getMemo()));
}
}
list = copyList;
--
Gitblit v1.9.1