From 0a3a59432a0ff8d4169ad7484250a0a0d5bed1f9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 09 一月 2025 19:50:58 +0800
Subject: [PATCH] # 1. 波次预览重复问题     2. PDA组拖超过3个物料后,组拖按钮被遮挡     3. 平库入库物料ID为空     4. PDA出库成功后,界面数据重置,避免重复操作    5. 入库单历史档,按时间倒序排列

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/OrderOutMergeParam.java |   63 +++++++++++++++++--------------
 1 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/OrderOutMergeParam.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/OrderOutMergeParam.java
index 988e69a..3ff754f 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/OrderOutMergeParam.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/OrderOutMergeParam.java
@@ -1,29 +1,34 @@
-package com.zy.asrs.wms.asrs.entity.param;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-public class OrderOutMergeParam implements Serializable {
-
-    private Long locId;
-
-    private String locNo;
-
-    private Long locDetlId;
-
-    private String matnr;
-
-    private String batch;
-
-    private Double anfme;
-
-    private Long operationPort;
-
-    private List<FieldParam> fieldParams;
-
-    private List<Long> orderIds;
-
-}
+package com.zy.asrs.wms.asrs.entity.param;
+
+import com.mysql.cj.log.Log;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class OrderOutMergeParam implements Serializable {
+
+    private Long locId;
+
+    private String locNo;
+
+    private Long locDetlId;
+
+    private String matnr;
+
+    private String batch;
+
+    private Long workQty;
+
+    private Long typeId;
+
+    private Double anfme;
+
+    private Long operationPort;
+
+    private List<FieldParam> fieldParams;
+
+    private List<Long> orderIds;
+
+}

--
Gitblit v1.9.1