新增场景产品等级 料号颜色解析

ym-packing/src/main/java/com/cnbm/packing/dto/PrintModelDTO.java

@@ -80,10 +80,10 @@ public class PrintModelDTO implements Serializable {
 	@ApiModelProperty(value = "是否启用，0 停用；1 启用")
 	private Integer isEnable;
 
-	@ApiModelProperty(value = "场景，前端传字符串过来，目前固定这几个：DZ BIPV")
+	@ApiModelProperty(value = "场景，前端传字符串过来，t_scenes 把value传过来放进去，不要放id")
 	private String scenes;
 
-	@ApiModelProperty(value = "产品等级，目前固定这几个 : A1 A2 A3 A4 NK")
+	@ApiModelProperty(value = "产品等级，t_product_level 把value传过来放进去，不要放id")
 	private String productGrade;
 
 }

ym-packing/src/main/java/com/cnbm/packing/dto/ProductLevelDTO.java

@@ -0,0 +1,60 @@
+package com.cnbm.packing.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+/**
+ * 产品等级 表
+ *
+ * @author codeGenerator
+ * @since  2023-12-21
+ */
+@Data
+@ApiModel(value = "产品等级 表DTO对象")
+public class ProductLevelDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private Long id;
+
+	@ApiModelProperty(value = "产品名")
+	private String productName;
+
+	@ApiModelProperty(value = "产品等级，A1/A2/A3/A4/NK")
+	private LocalDateTime productLevel;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private Integer valid;
+
+	@ApiModelProperty(value = "创建人")
+	private Long creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private Long updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private Integer version;
+
+}

ym-packing/src/main/java/com/cnbm/packing/dto/ScenesDTO.java

@@ -0,0 +1,57 @@
+package com.cnbm.packing.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+/**
+ * 场景 表
+ *
+ * @author codeGenerator
+ * @since  2023-12-21
+ */
+@Data
+@ApiModel(value = "场景 表DTO对象")
+public class ScenesDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+
+	@ApiModelProperty(value = "ID")
+	private Long id;
+
+	@ApiModelProperty(value = "场景名")
+	private String scenesName;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+	@ApiModelProperty(value = "删除标志，是否有效:1 可用 0不可用")
+	private Integer valid;
+
+	@ApiModelProperty(value = "创建人")
+	private Long creatorId;
+
+	@ApiModelProperty(value = "创建人姓名")
+	private String creatorName;
+
+	@ApiModelProperty(value = "创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty(value = "更新人")
+	private Long updaterId;
+
+	@ApiModelProperty(value = "更新人姓名")
+	private String updaterName;
+
+	@ApiModelProperty(value = "更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty(value = "版本号")
+	private Integer version;
+
+}

ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxDTO.java

@@ -116,6 +116,9 @@ public class WoPackagingBoxDTO implements Serializable {
 	private String orderNum;
 
 	@ApiModelProperty(value = "基板列表")
-	private List<WoPackagingBoxSubstrate> substrateList;;
+	private List<WoPackagingBoxSubstrate> substrateList;
+
+	@ApiModelProperty(value = "颜色（物料号匹配）")
+	private String color;
 
 }

ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxSubstrateDTO.java

@@ -185,4 +185,7 @@ public class WoPackagingBoxSubstrateDTO implements Serializable {
 	@ApiModelProperty(value = "最近打印时间(转)")
 	private String printTime1;
 
+	@ApiModelProperty(value = "颜色（物料号匹配）")
+	private String color;
+
 }