From d417e332b39e7da99f637e94ebacf199fb158a72 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 31 五月 2024 18:16:50 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 2d3a845..64e50e3 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -31,18 +31,22 @@
private Double count;
// 閿�鍞鍗曞彿
+ private String orderNo;
+
+ // 閿�鍞鍗曞彿
private String threeCode;
//閿�鍞鍗曡鍙�
private String deadTime;
- //鏂欑鐮�
+ //璐ф灦鐮�
private String suppCode;
- public LocDetlAdjust(String matnr, String batch, Double count, String threeCode, String deadTime, String suppCode) {
+ public LocDetlAdjust(String matnr, String batch, Double count, String orderNo,String threeCode, String deadTime, String suppCode) {
this.matnr = matnr;
this.batch = batch;
this.count = count;
+ this.orderNo = orderNo;
this.threeCode = threeCode;
this.deadTime = deadTime;
this.suppCode = suppCode;
@@ -57,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(),adjust.getSuppCode()));
+ copyList.add(new LocDetlAdjustParam.LocDetlAdjust(adjust.getMatnr(), adjust.getBatch(), adjust.getCount(),adjust.getOrderNo(), adjust.getThreeCode(), adjust.getDeadTime(),adjust.getSuppCode()));
}
}
list = copyList;
--
Gitblit v1.9.1