From 5110b6563db73a2869e0ac09e717928289cdfdde Mon Sep 17 00:00:00 2001 From: lsh <1> Date: 星期五, 19 一月 2024 09:45:37 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/param/TrussCombParam.java | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java b/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java index be30999..cd25e71 100644 --- a/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java +++ b/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java @@ -20,16 +20,17 @@ public class TrussCombParam { private String barcode;// 瀛楃涓� 鎵樼洏鐮� 璁㈠崟鍏辩敤 //涓婁紶 - private Integer palletizingNo = 147;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙� - private Integer staStart = 147;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙� - private Integer palletizingNo2;// 鏄� 瀛楃涓� 鐩爣鐮佸灈浣嶇紪鍙� 璁㈠崟鍏辩敤 //涓婁紶 + private Integer souSta;// 瀛楃涓� 鍘熺珯鐐� 璁㈠崟鍏辩敤 + private Integer palletizingNo;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙� + private Integer staStart;// 鏄� 瀛楃涓� 鐮佸灈浣嶇紪鍙� + private Integer palletizingNo2;// 鏄� 瀛楃涓� 鐩爣鐮佸灈浣嶇紪鍙� 璁㈠崟鍏辩敤 //涓婁紶 //PDA private Integer staEnd;// 鏄� 瀛楃涓� 鐩爣鐮佸灈浣嶇紪鍙� 璁㈠崟鍏辩敤 //涓婁紶 - private String boxType;// 鏄� 瀛楃涓� 鏈ㄧ绫诲瀷 brand //涓婁紶 + private String boxType;// 鏄� 瀛楃涓� 鏈ㄧ绫诲瀷 brand //涓婁紶 //PDA private String uuid;// 瀛楃涓� 鏃堕棿鎴� //涓婁紶 private String createTime;// 瀛楃涓� 鍒涘缓鏃堕棿 - private String orderNo;// 瀛楃涓� 璁㈠崟鍙� //涓婁紶 + private String orderNo;// 瀛楃涓� 璁㈠崟鍙� //涓婁紶 //PDA - private List<MatList> matList;// 鏄� 鍒楄〃 鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級 //涓婁紶 + private List<MatList> matList;// 鏄� 鍒楄〃 鎷嗗灈璐х墿淇℃伅锛�2绠憋紝灏剧鍙兘1绠憋級 //涓婁紶 //PDA @Data public static class MatList{ @@ -39,9 +40,10 @@ private String position;// 鏄� 瀛楃涓� 鏈ㄧ浣嶇疆锛堟媶鍨涙椂闇�瑕侊級 origin //涓婁紶 private Double weight;// 鏄� 灏忔暟鍨� 閲嶉噺 //涓婁紶 private Integer anfme;// 鏁板瓧鍨� 鏈ㄧ涓摐绠旀暟閲� //涓婁紶 - private String batch;// 瀛楃涓� 绠卞彿 + private String batch;// 瀛楃涓� 绠卞彿 //PDA private String specs;// 瀛楃涓� 瑙勬牸 - private String standby4;// 鍗蜂俊鎭疘d //涓婁紶 + private String model;// 瀛楃涓� 瑙勬牸 +// private String standby4;// 鍗蜂俊鎭疘d //涓婁紶 private List<MatDetlList> matDetlList;// 鏄� 鍒楄〃 鏈ㄧ涓摐绠斾俊鎭� } -- Gitblit v1.9.1