From b922fe4d80f7e278b1ff958c4c95626b27cf8266 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期五, 12 四月 2024 15:42:14 +0800 Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/zy-asrs into phyzasrs --- src/main/java/com/zy/asrs/entity/param/CombParam.java | 6 ++++++ 1 files changed, 6 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 0504ed9..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,12 +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