From 2ded9514aa9a93ee440af0b1437d788fb052028b Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期六, 23 八月 2025 08:36:59 +0800
Subject: [PATCH] wms功能完善

---
 src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java |   62 +++++++++++++++++-------------
 1 files changed, 35 insertions(+), 27 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 381d7c2..b742456 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -1,9 +1,7 @@
 package com.zy.asrs.entity.param;
 
-import com.core.common.Cools;
 import lombok.Data;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -30,33 +28,43 @@
         // 鍙樻洿鏁伴噺
         private Double count;
 
-        public LocDetlAdjust(String matnr, String batch, Double count) {
-            this.matnr = matnr;
-            this.batch = batch;
-            this.count = count;
-        }
+        private String zpallet;
+
+        private String model;
+
+        private String manuDate;
+
+        private Double weight;
+        private Double manLength;
+        private Double volume;
+
+//        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;
-    }
+//    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