From 9e2eb64f6f9cf3f0921818e773f52e8e41b1ad88 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期四, 02 四月 2026 15:42:54 +0800
Subject: [PATCH] 实现多订单组托，并且在pda上区分配盘和来料入库单
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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 cb30c4b..ab5c8d9 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -13,22 +13,49 @@
// 鍗曟嵁缂栧彿
private String orderNo;
+ // 鍗曟嵁缂栧彿
+ private List<String> orderNos;
+
// 鎵樼洏鏉＄爜
private String barcode;
+ // 搴撲綅缂栧彿
+ private String locNo;
+
+ //agv鍘熺珯鐐�
+ private String rsta;
+
private List<CombMat> combMats;
+
+ private Long userId; // 鏂板瀛楁
@Data
public static class CombMat {
- // 鐗╂枡缂栧彿
- private String matNo;
+ private String orderNo;
- // 鎵瑰彿
- private String batch;
+ // 鐗╂枡缂栧彿
+ private String matnr = "";
+
+ // 搴忓垪鐮�
+ private String batch = "";
+ private String brand = "";
+ private String standby1 = "";
+ private String standby2 = "";
+ private String standby3 = "";
+
+ private String boxType1 = "1";
+ private String boxType2 = "1";
+ private String boxType3 = "1";
// 鐗╂枡鏁伴噺
- private Double count;
+ private Double anfme;
+
+ // 鍟嗗搧鍚嶇О
+ private String maktx;
+
+ // 瑙勬牸
+ private String specs;
}
--
Gitblit v1.9.1