From c253255495465d4406fcaddeb7be40d15fce290a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 21 三月 2024 13:00:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs

---
 src/main/java/com/zy/asrs/entity/param/CombParam.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index ac61a0b..0809357 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -19,11 +19,26 @@
     // 搴撲綅缂栧彿
     private String locno;
 
+    // 搴撲綅绫诲瀷锛� 1銆佸緟鍖呰鎴愬搧锛�2銆佸師鏉愭枡锛�3銆佺澹�
+    private Integer locType;
+
+    //绗簩鍗曚綅鏁伴噺
+    private Double anfme;
+
     private List<CombMat> combMats;
 
     @Data
     public static class CombMat {
 
+        //鏂欐兂鐮�
+        private String containerCode;
+
+        //閿�鍞鍗曞彿
+        private String csocode;
+
+        //閿�鍞鍗曡鍙�
+        private String isoseq;
+
         // 鐗╂枡缂栧彿
         private String matnr;
 

--
Gitblit v1.9.1