From c42346453608186971fad5e80ffd08fd58d38d06 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 16 七月 2025 16:42:45 +0800
Subject: [PATCH] 完善erp对接
---
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 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..696f53a 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -1,7 +1,9 @@
package com.zy.asrs.entity.param;
+import com.core.common.Cools;
import lombok.Data;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -22,12 +24,50 @@
// 鍟嗗搧缂栧彿
private String matnr;
- // 鎵瑰彿
+ // 搴忓垪鐮�
private String batch;
// 鍙樻洿鏁伴噺
private Double count;
+ // 搴忓垪鐮�
+ private String threeCode;
+
+ private Integer danger;
+
+ public LocDetlAdjust(String matnr, String batch, Double count) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.count = count;
+ }
+ public LocDetlAdjust(String matnr, String batch, Double count,Integer danger ,String threeCode ) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.count = count;
+ this.danger = danger;
+ this.threeCode = threeCode;
+ }
+ }
+
+ 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()));
+ }
+ }
+ list = copyList;
}
--
Gitblit v1.9.1