From d8d107072cde858bdc4d23318c56d52e91f28c93 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 21 七月 2023 09:47:13 +0800
Subject: [PATCH] #wrkmast==>sheetNo:徐工汉云拆垛标记 0: 未拆 1: 已拆 2:已处理可下一步（转历史档）
---
src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 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 4d48a87..a24c97d 100644
--- a/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LabellerMatParam.java
@@ -1,7 +1,13 @@
package com.zy.asrs.entity.param;
+import com.zy.asrs.entity.WrkDetl;
import lombok.Data;
+import java.util.List;
+
+/*
+ * Created by Monkey D. Luffy on 2023.07.19
+ * */
@Data
public class LabellerMatParam {
@@ -22,14 +28,33 @@
private String WrkNo; // 瀛楃涓� 宸ヤ綔鍙� 锛堣创鏍囨満淇濆瓨锛岃创鏍囧畬鎴愯姹傞檮甯︼級
private String orderNo; // 瀛楃涓� 璁㈠崟鍙�
private String labellingTime; // 瀛楃涓� 璐存爣鏃ユ湡 yyyy-MM-dd HH:mm:ss
- 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; // 瀛楃涓� 澶囩敤
+
+ private List<CombMat> combMats;
+
+
+ @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