Merge branch 'dev' into test

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

@@ -12,6 +12,82 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * MesRepair 处理措施
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_REPAIR_TYPE {
+
+        SCRATCH(10, "划痕"),
+        FRACTURE(20, "破碎"),
+        SCRAP_TYPE3(30, "缺失");
+
+        private int value;
+        private String description;
+
+        MES_REPAIR_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+    * 设备台账报表查询标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EQUIPMENT_REPORT_TYPE {
+
+        TASK(10, "作业任务"),
+        PLAN(20, "周期计划"),
+        REPAIR(30, "维修记录"),
+        CHECK(40, "点检记录"),
+        MAINTAIN(50, "保养记录");
+
+        private int value;
+        private String description;
+
+        EQUIPMENT_REPORT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * MesScrap 报废原因
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -43,4 +43,16 @@ public class MesProduceCtgyPicture extends BaseBean {
     @Column(name = "PICTURE_NAME")
     @ApiParam("图片名称")
     private String pictureName;
+
+    @Column(name = "FILE_ORIGIN_NAME")
+    @ApiParam("FILE_ORIGIN_NAME")
+    private String fileOriginName;
+
+    @Column(name = "FILE_SIZE")
+    @ApiParam("FILE_SIZE")
+    private String fileSize;
+
+    @Column(name = "FILE_TYPE_ID")
+    @ApiParam("FILE_TYPE_ID")
+    private String fileTypeId;
 }

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

@@ -65,11 +65,11 @@ public class MesProduceSn extends BaseBean implements Serializable {
     private Integer printStatus;
 
     @Column(name = "WORK_CENTER_CODE")
-    @ApiParam("工作中心代码")
+    @ApiParam("生产线")
     private String workCenterCode;
 
     @Column(name = "WORK_CELL_CODE")
-    @ApiParam("工作单元代码")
+    @ApiParam("工位")
     private String workCellCode;
 
     @Column(name = "ROUTE_CODE")

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

@@ -108,6 +108,10 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("包装条码")
     private String packageSn;
 
+    @Column(name="OPERATE_TYPE")
+    @ApiParam("操作类型")
+    private Integer operateType;
+
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;

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

@@ -30,7 +30,7 @@ public class MesProduceCtgyPicture extends BaseBean {
 
     @Column(name = "PRODUCE_CTGY_CODE")
     @ApiParam("产品类型代码")
-    private String produceCtgyCode;
+    private String produceCategoryCode;
 
     @Column(name = "SIDE_LOCATION")
     @ApiParam("面位")
@@ -43,4 +43,16 @@ public class MesProduceCtgyPicture extends BaseBean {
     @Column(name = "PICTURE_NAME")
     @ApiParam("图片名称")
     private String pictureName;
+
+    @Column(name = "FILE_SIZE")
+    @ApiParam("FILE_SIZE")
+    private String fileSize;
+
+    @Column(name = "FILE_TYPE_ID")
+    @ApiParam("FILE_TYPE_ID")
+    private String fileTypeId;
+
+    @Column(name = "FILE_TYPE_NAME")
+    @ApiParam("FILE_TYPE_NAME")
+    private String fileTypeName;
 }

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

@@ -121,6 +121,10 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("托盘号")
     private String tray;
 
+    @Column(name="OPERATE_TYPE")
+    @ApiParam("操作类型")
+    private Integer operateType;
+
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;

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

@@ -108,6 +108,10 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("包装条码")
     private String packageSn;
 
+    @Column(name="OPERATE_TYPE")
+    @ApiParam("操作类型")
+    private Integer operateType;
+
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;

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

@@ -8,7 +8,9 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -60,4 +62,8 @@ public class ProdOrgModel extends BaseBean {
 
     @ApiParam("当前级")
     private Integer level;
+
+    @Transient
+    @ApiParam("工位类型")
+    private Integer workCellType;
 }

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

@@ -1428,8 +1428,8 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesProduceCtgyPicture(MesProduceCtgyPicture mesProduceCtgyPicture, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesProduceCtgyPicture, organizeCode);
-        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCtgyCode())) {
-            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCtgyCode(), "produceCtgyCode", packBean);
+        if (!StringUtils.isEmpty(mesProduceCtgyPicture.getProduceCategoryCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getProduceCategoryCode(), "produceCtgyCode", packBean);
         }
         if (!StringUtils.isEmpty(mesProduceCtgyPicture.getPictureName())) {
             DdlPreparedPack.getStringLikerPack(mesProduceCtgyPicture.getPictureName(), "pictureName", packBean);
@@ -1573,4 +1573,35 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 维修记录
+     * @param mesEquTaskRepairRecord
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEquTaskRepairRecord(MesEquTaskRepairRecord mesEquTaskRepairRecord, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquTaskRepairRecord, organizeCode);
+        if (!StringUtils.isEmpty(mesEquTaskRepairRecord.getEquipmentCode())) {
+            DdlPreparedPack.getStringEqualPack(mesEquTaskRepairRecord.getEquipmentCode(), "equipmentCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * 点检或保养记录
+     * @param mesEquTaskStandardRecord
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEquTaskStandardRecord(MesEquTaskStandardRecord mesEquTaskStandardRecord, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquTaskStandardRecord, organizeCode);
+        if (!StringUtils.isEmpty(mesEquTaskStandardRecord.getEquipmentCode())) {
+            DdlPreparedPack.getStringEqualPack(mesEquTaskStandardRecord.getEquipmentCode(), "equipmentCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquTaskStandardRecord.getTaskType())) {
+            DdlPreparedPack.getNumEqualPack(mesEquTaskStandardRecord.getTaskType(), "taskType", packBean);
+        }
+        return packBean;
+    }
 }