开发涂装检查工位和一次、二次箱条码Un-Pack-后端开发业务逻辑

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -4266,8 +4266,8 @@ public class MesPcnEnumUtil {
     public enum BAD_HANDLE_TYPE {
         BACK_SPRAY(10, "BACK_SPRAY", "返喷"),
         SCRAPPED(20, "SCRAPPED", "报废"),
-        POLISH(30, "POLISH", "抛光"),
-        DETERMINED(40, "DETERMINED", "待定");
+        POLISHING(30, "POLISHING", "抛光"),
+        DETERMIND(40, "DETERMIND", "待定");
 
         private int value;
         private String code;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintCheckModel.java

@@ -1,12 +1,12 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 
+import cn.estsh.i3plus.pojo.mes.bean.MesDefect;
 import cn.estsh.i3plus.pojo.mes.bean.MesWindowModuleParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Column;
 import java.util.List;
 
 /**
@@ -39,22 +39,18 @@ public class PaintCheckModel {
     @ApiParam("界面编号")
     private String windowNo;
 
-    @ApiParam("缺陷类型")
-    private String defectType;
-
-    @ApiParam("缺陷描述")
-    private String defectDesc;
-
     @ApiParam("缺陷标识值")
     private String defectFlagValue;
 
     @ApiParam("不良品处理类型")
     private Integer defectActionType;
 
-    @Column(name = "PROD_CFG_TYPE_CODE")
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
 
+    @ApiParam("缺陷列表")
+    private List<MesDefect> defectList;
+
     @ApiParam("界面组件参数数据")
     List<MesWindowModuleParam> windowModuleParamList;
 }