From eb894e3c1dde980cb6cbaf559782bedb801db2ca Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期五, 25 四月 2025 10:44:19 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java index f236e11..ebe145a 100644 --- a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java +++ b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java @@ -11,7 +11,11 @@ public class PalletizingCompleteParam { private String barcode;// 鏄� 瀛楃涓� 鎵樼洏鐮� - private String palletizingNo;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙� + private Integer palletizingNo;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙� + private Integer palletizingNo2;// 鏄� 瀛楃涓� 鐩爣浣嶇疆缂栧彿 + private String boxType;// 鏄� 瀛楃涓� 鏈ㄧ绫诲瀷 + private String orderNo;// 鏄� 瀛楃涓� 璁㈠崟缂栧彿 + private String uuid;// 鏄� 瀛楃涓� 璁㈠崟缂栧彿 private String createTime;// 鏄� 瀛楃涓� 鍒涘缓鏃堕棿 private List<MatList> matLists;// 鏄� 鍒楄〃 鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級 @@ -26,22 +30,17 @@ private Integer anfme;// 鏄� 鏁板瓧鍨� 鏈ㄧ涓摐绠旀暟閲� private String batch;// (鏄惁鍒嗘壒) 瀛楃涓� 鎵规鍙� private String specs;// (鏄惁闇�瑕侊級 瀛楃涓� 瑙勬牸 + private String standby4;// 鍗蜂俊鎭痷uid + private List<MatDetlList> matDetlList;// 鏄� 鍒楄〃 鏈ㄧ涓摐绠斾俊鎭� } - public Integer getDevNo$(){ - if (!Cools.isEmpty(this.palletizingNo)){ - switch (this.palletizingNo){ - case "1": - return 220; - case "2": - return 216; - case "3": - return 118; - default: - return null; - } - } - return null; + @Data + public static class MatDetlList{ + private String boxNoDetl;// 鏄� 瀛楃涓� 閾滅當缂栧彿锛堝敮涓�瀛楁锛� + private String positionDetl;// 鏄� 瀛楃涓� 閾滅當浣嶇疆锛堟媶鍨涙椂闇�瑕侊級 + private Double weightDetl;// 鏄� 灏忔暟鍨� 閲嶉噺 + private String batchDetl;// (鏄惁鍒嗘壒) 瀛楃涓� 鎵规鍙� + private String specsDetl;// (鏄惁闇�瑕侊級 瀛楃涓� 瑙勬牸 } } -- Gitblit v1.9.1