优化天津麦格纳报表

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

@@ -7820,4 +7820,41 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 缺陷类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DEFECT_TYPE_CODE {
+        SCRAPPED("SCRAPPED", "报废"),
+        BACK_SPRAY("BACK_SPRAY", "返喷"),
+        POLISHING("POLISHING", " 抛光"),
+        DETERMIND("DETERMIND", " 待定");
+
+        private String code;
+        private String description;
+
+        DEFECT_TYPE_CODE(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java

@@ -101,6 +101,10 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("质量状态")
     private Integer qcStatus;
 
+    @Transient
+    @ApiParam("缺陷类型名称")
+    private String defectActionTypeName;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -3435,4 +3435,22 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(mesExceptionAlertCfg.getIsValid(), "isValid", packBean);
         return packBean;
     }
+
+    public static DdlPackBean getMesPaintDefect(MesDefectRecord defectRecord, String organizeCode) {
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
+        if (!StringUtils.isEmpty(defectRecord.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(defectRecord.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(defectRecord.getWorkCellCode())) {
+            DdlPreparedPack.getStringEqualPack(defectRecord.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (!StringUtils.isEmpty(defectRecord.getDefectActionType())) {
+            DdlPreparedPack.getStringEqualPack(defectRecord.getDefectActionType(), "defectActionType", packBean);
+        }
+        if (!StringUtils.isEmpty(defectRecord.getCreateDateTimeStart()) || !StringUtils.isEmpty(defectRecord.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(defectRecord.getCreateDateTimeStart(), defectRecord.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
+        return packBean;
+    }
 }