From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期一, 25 十二月 2023 10:23:08 +0800 Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1 --- src/main/java/com/zy/asrs/entity/param/CombParam.java | 18 ++++++++++++++++++ 1 files changed, 18 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 84a4927..ff8690d 100644 --- a/src/main/java/com/zy/asrs/entity/param/CombParam.java +++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java @@ -16,10 +16,22 @@ // 鎵樼洏鏉$爜 private String barcode; + // 搴撲綅缂栧彿 + private String locno; + private List<CombMat> combMats; @Data public static class CombMat { + + //鏂欐兂鐮� + private String containerCode; + + //閿�鍞鍗曞彿 + private String csocode; + + //閿�鍞鍗曡鍙� + private String isoseq; // 鐗╂枡缂栧彿 private String matnr; @@ -30,6 +42,12 @@ // 鐗╂枡鏁伴噺 private Double anfme; + // 鍟嗗搧鍚嶇О + private String maktx; + + // 瑙勬牸 + private String specs; + } } -- Gitblit v1.9.1