From 2832d39ad91a6de161bf9b8f8e3307bf6bc7fb65 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期三, 10 四月 2024 23:41:55 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs --- src/main/java/com/zy/asrs/entity/param/CombParam.java | 9 +++++++++ 1 files changed, 9 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 ff8690d..37e6ea1 100644 --- a/src/main/java/com/zy/asrs/entity/param/CombParam.java +++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java @@ -16,9 +16,18 @@ // 鎵樼洏鏉$爜 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