From 69b319f74a13f506595b64b86b1bade1c815db37 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 02 八月 2025 10:59:25 +0800
Subject: [PATCH] 修复任务档明细转库存明细没有箱号问题
---
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 a00c9ed..503051b 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -36,12 +36,20 @@
//閿�鍞鍗曡鍙�
private String deadTime;
- public LocDetlAdjust(String matnr, String batch, Double count, String threeCode, String deadTime) {
+ //鏂欑鐮�
+ private String suppCode;
+
+ //鎵樼洏鐮�
+ private String zpallet;
+
+ public LocDetlAdjust(String matnr, String batch, Double count, String threeCode, String deadTime, String suppCode, String zpallet) {
this.matnr = matnr;
this.batch = batch;
this.count = count;
this.threeCode = threeCode;
this.deadTime = deadTime;
+ this.suppCode = suppCode;
+ this.zpallet = zpallet;
}
}
@@ -53,14 +61,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(), adjust.getThreeCode(), adjust.getDeadTime()));
+ copyList.add(new LocDetlAdjustParam.LocDetlAdjust(adjust.getMatnr(), adjust.getBatch(), adjust.getCount(), adjust.getThreeCode(), adjust.getDeadTime(), adjust.getSuppCode(), adjust.getZpallet()));
}
}
list = copyList;
--
Gitblit v1.9.1