From 853a65ae9b42fe890b66ecc3bdb427f69b23d210 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 01 四月 2026 17:36:48 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 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 065f774..2a5e995 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -1,14 +1,17 @@
package com.zy.asrs.entity.param;
+import com.core.common.Cools;
import lombok.Data;
+import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
/**
* Created by vincent on 2020/6/18
*/
@Data
-public class LocDetlAdjustParam {
+public class LocDetlAdjustParam implements Serializable {
// 搴撲綅鍙�
private String locNo;
@@ -22,12 +25,44 @@
// 鍟嗗搧缂栧彿
private String matnr;
- // 鎵瑰彿
+ // 搴忓垪鐮�
private String batch;
// 鍙樻洿鏁伴噺
private Double count;
+ private String suppCode;
+
+ private String boxType1;
+
+ public LocDetlAdjust(String matnr, String batch, Double count, String suppCode, String boxType1) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.count = count;
+ this.suppCode = suppCode;
+ this.boxType1 = boxType1;
+ }
+ }
+
+ public void integrate() {
+ if (Cools.isEmpty(list)) {
+ return;
+ }
+ List<LocDetlAdjust> copyList = new ArrayList<>();
+ for (LocDetlAdjust adjust : list) {
+ boolean exit = false;
+ for (LocDetlAdjust copy : copyList) {
+ if (adjust.getMatnr().equals(copy.getMatnr()) && Cools.eq(adjust.getBatch(), copy.getBatch())) {
+ copy.setCount(copy.getCount() + adjust.getCount());
+ exit = true;
+ break;
+ }
+ }
+ if (!exit) {
+ copyList.add(new LocDetlAdjustParam.LocDetlAdjust(adjust.getMatnr(), adjust.getBatch(), adjust.getCount(), adjust.getSuppCode(), adjust.getBoxType1()));
+ }
+ }
+ list = copyList;
}
--
Gitblit v1.9.1