From 265483cb46b5e951e3f6f9b6ed4ecdc94e6b371d Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 29 五月 2024 16:29:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 ff8690d..9f6b164 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -13,12 +13,21 @@
// 鍗曟嵁缂栧彿
private String orderNo;
- // 鎵樼洏鏉＄爜
+ // 璐ф灦鏉＄爜
private String barcode;
+
+ // 璐ф灦鏉＄爜
+ private Short containerType;
// 搴撲綅缂栧彿
private String locno;
+ // 搴撲綅绫诲瀷锛� 1銆佸緟鍖呰鎴愬搧锛�2銆佸師鏉愭枡锛�3銆佺澹�
+ private Integer locType;
+
+ //绗簩鍗曚綅鏁伴噺
+ private Double anfme;
+
private List<CombMat> combMats;
@Data
--
Gitblit v1.9.1