From 608fb6f9529ce51291ef682638a5efc7dd51ac63 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 18 十一月 2025 08:21:08 +0800
Subject: [PATCH] 1.完善找库位 2.新增erp订单删除后,wms订单跟着删除功能 3.新增订单完成后,上报erp,erp报错后显现在出货单中 4.新增一键查询到异常完成订单 5.对销售单据和其他单据进行区分出库 6.对中间表订单状态进行完善 7.新增锁单功能 8.新增任务查询维护加上订单号

---
 src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 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..fda07cf 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;
 
 /**
@@ -28,6 +30,32 @@
         // 鍙樻洿鏁伴噺
         private Double count;
 
+        public LocDetlAdjust(String matnr, String batch, Double count) {
+            this.matnr = matnr;
+            this.batch = batch;
+            this.count = count;
+        }
+    }
+
+    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