From 7444c4c07c82c1ae7816b4d3ee68b8d0eba7f4a0 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 13 四月 2024 12:39:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java | 61 ++++++++++++++++++------------
1 files changed, 36 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java b/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java
index a24c97d..b605867 100644
--- a/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java
@@ -24,37 +24,48 @@
*/
private String requestTime;
- private String labTemplate; // 璐存爣妯℃澘鍙凤紙璐存爣鏈虹郴缁熷畾锛�
+// private String labTemplate; // 璐存爣妯℃澘鍙凤紙璐存爣鏈虹郴缁熷畾锛�
private String WrkNo; // 瀛楃涓� 宸ヤ綔鍙� 锛堣创鏍囨満淇濆瓨锛岃创鏍囧畬鎴愯姹傞檮甯︼級
- private String orderNo; // 瀛楃涓� 璁㈠崟鍙�
- private String labellingTime; // 瀛楃涓� 璐存爣鏃ユ湡 yyyy-MM-dd HH:mm:ss
+// private String orderNo; // 瀛楃涓� 璁㈠崟鍙�
+// private String labellingTime; // 瀛楃涓� 璐存爣鏃ユ湡 yyyy-MM-dd HH:mm:ss
+ private String uuid; // 瀛楃涓� 鏃堕棿鎴�
- private List<CombMat> combMats;
+ private String temp1; // 瀛楃涓� 澶囩敤
+ private String temp2; // 瀛楃涓� 澶囩敤
+
+// private List<CombMat> combMats;
+ private List<BoxNo> boxNos;
@Data
- public static class CombMat{
- private String matnr; // 瀛楃涓� 鍟嗗搧缂栧彿
- private String maktx; // 瀛楃涓� 鍟嗗搧鍚嶇О
- private String specs; // 瀛楃涓� 瑙勬牸
- private String batch; // 瀛楃涓� 鎵规
- private String unit ; //瀛楃涓� 鍗曚綅
- private String anfme; // 瀛楃涓� 鏁伴噺
-
- private String temp1; // 瀛楃涓� 澶囩敤
- private String temp2; // 瀛楃涓� 澶囩敤
+ public static class BoxNo{
+ private String boxNo; // 瀛楃涓� 鏁伴噺
private String temp3; // 瀛楃涓� 澶囩敤
private String temp4; // 瀛楃涓� 澶囩敤
-
- public CombMat(){}
-
- public CombMat(WrkDetl wrkDetl){
- this.matnr = wrkDetl.getMatnr();
- this.maktx = wrkDetl.getMaktx();
- this.specs = wrkDetl.getSpecs();
- this.batch = wrkDetl.getBatch();
- this.unit = wrkDetl.getUnit();
- this.anfme = wrkDetl.getAnfme().toString();
- }
}
+// @Data
+// public static class CombMat{
+// private String matnr; // 瀛楃涓� 鍟嗗搧缂栧彿
+// private String maktx; // 瀛楃涓� 鍟嗗搧鍚嶇О
+// private String specs; // 瀛楃涓� 瑙勬牸
+// private String batch; // 瀛楃涓� 鎵规
+// private String unit ; //瀛楃涓� 鍗曚綅
+// private String anfme; // 瀛楃涓� 鏁伴噺
+//
+// private String temp1; // 瀛楃涓� 澶囩敤
+// private String temp2; // 瀛楃涓� 澶囩敤
+// private String temp3; // 瀛楃涓� 澶囩敤
+// private String temp4; // 瀛楃涓� 澶囩敤
+//
+// public CombMat(){}
+//
+// public CombMat(WrkDetl wrkDetl){
+// this.matnr = wrkDetl.getMatnr();
+// this.maktx = wrkDetl.getMaktx();
+// this.specs = wrkDetl.getSpecs();
+// this.batch = wrkDetl.getBatch();
+// this.unit = wrkDetl.getUnit();
+// this.anfme = wrkDetl.getAnfme().toString();
+// }
+// }
}
--
Gitblit v1.9.1