From 89d29d37b5ca10e4eab854a292102bbc07be614a Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 20 二月 2024 08:52:18 +0800
Subject: [PATCH] #库存迁移逻辑修改，从工作明细档进行处理
---
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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..d8bb4a7 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -21,19 +21,31 @@
@Data
public static class LocDetlAdjust {
- // 鍟嗗搧缂栧彿
+ // 鐗╂枡鍙�
private String matnr;
- // 鎵瑰彿
+ // 搴忓垪鐮�
private String batch;
// 鍙樻洿鏁伴噺
private Double count;
- public LocDetlAdjust(String matnr, String batch, Double count) {
+ // 閿�鍞鍗曞彿
+ private String threeCode;
+
+ //閿�鍞鍗曡鍙�
+ private String deadTime;
+
+ //鏂欑鐮�
+ private String suppCode;
+
+ public LocDetlAdjust(String matnr, String batch, Double count, String threeCode, String deadTime, String suppCode) {
this.matnr = matnr;
this.batch = batch;
this.count = count;
+ this.threeCode = threeCode;
+ this.deadTime = deadTime;
+ this.suppCode = suppCode;
}
}
@@ -45,14 +57,14 @@
for (LocDetlAdjust adjust : list) {
boolean exit = false;
for (LocDetlAdjust copy : copyList) {
- if (adjust.getMatnr().equals(copy.getMatnr()) && Cools.eq(adjust.getBatch(), copy.getBatch())) {
+ if (adjust.getMatnr().equals(copy.getMatnr()) && Cools.eq(adjust.getBatch(), copy.getBatch()) && Cools.eq(adjust.getSuppCode(),copy.getSuppCode()) && Cools.eq(adjust.getThreeCode(),copy.getThreeCode()) && Cools.eq(adjust.getDeadTime(),copy.getDeadTime())) {
copy.setCount(copy.getCount() + adjust.getCount());
exit = true;
break;
}
}
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(),adjust.getSuppCode()));
}
}
list = copyList;
--
Gitblit v1.9.1