From 9f3f31e66b2ffb217155b9bcd294da4ec12b6e34 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 16 十月 2023 15:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
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 5108e8b..a00c9ed 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -21,7 +21,7 @@
@Data
public static class LocDetlAdjust {
- // 鍗曟嵁鍙�
+ // 鐗╂枡鍙�
private String matnr;
// 搴忓垪鐮�
@@ -30,10 +30,18 @@
// 鍙樻洿鏁伴噺
private Double count;
- public LocDetlAdjust(String matnr, String batch, Double count) {
+ // 閿�鍞鍗曞彿
+ private String threeCode;
+
+ //閿�鍞鍗曡鍙�
+ private String deadTime;
+
+ public LocDetlAdjust(String matnr, String batch, Double count, String threeCode, String deadTime) {
this.matnr = matnr;
this.batch = batch;
this.count = count;
+ this.threeCode = threeCode;
+ this.deadTime = deadTime;
}
}
@@ -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.getThreeCode(), adjust.getDeadTime()));
}
}
list = copyList;
--
Gitblit v1.9.1