From b6b46e1c4d390c80cf9bd7d4daa23202f2d11a22 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 13:47:57 +0800
Subject: [PATCH] 站点管理编辑高低库位

---
 src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java |   38 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 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..d0a09c9 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,46 @@
         // 鍟嗗搧缂栧彿
         private String matnr;
 
-        // 鎵瑰彿
+        // 搴忓垪鐮�
         private String batch;
 
         // 鍙樻洿鏁伴噺
         private Double count;
 
+        //瀹㈡埛淇℃伅
+        private String manu;
+
+        //澶囨敞
+        private String memo;
+
+        public LocDetlAdjust(String matnr, String batch, Double count, String manu, String memo) {
+            this.matnr = matnr;
+            this.batch = batch;
+            this.count = count;
+            this.manu = manu;
+            this.memo = memo;
+        }
+    }
+
+    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.getManu(), adjust.getMemo()));
+            }
+        }
+        list = copyList;
     }
 
 

--
Gitblit v1.9.1