From 223cba9fa496be3174c047e122cbb85d6fa7764d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 七月 2025 09:56:56 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
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