Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonTarget.java

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @author Dominic
+ * @date 2021/6/27 10:46
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "ANDON_TARGET")
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Api("安灯目标")
+public class AndonTarget extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -8981868292756664265L;
+
+    @Column(name = "TARGET_TYPE")
+    @ApiParam("目标类型")
+    private String targetType;
+
+    @Column(name = "TARGET")
+    @ApiParam("目标值")
+    private String target;
+
+    @Column(name = "WEEK")
+    @ApiParam("星期")
+    private String week;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/MesShiftRest.java

@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description :mes系统业务动作
+ * @Reference :
+ * @Author : yiming.gu
+ * @CreateDate : 2019-05-20
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "MES_SHIFT_REST")
+@Api("班次休息信息")
+public class MesShiftRest extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 5486276486536860088L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "START_TIME")
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @Column(name = "REST_TIMES", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam("休息时长")
+    private Double restTimes;
+
+    @Column(name = "AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name = "REST_DESC")
+    @ApiParam("班休描述")
+    private String restDesc;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java

@@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.andon.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
-import javax.persistence.Column;
 import java.io.Serializable;
 
 /**
@@ -90,6 +89,15 @@ public class AndonBoardModel implements Serializable {
     @ApiParam(value = "小时")
     public String hour;
 
+    @ApiParam(value = "运行时长(分钟)")
+    public String runMinute;
+
+    @ApiParam(value = "平均故障时长(分钟)")
+    public String avgExceptionTime;
+
+    @ApiParam(value = "MTBF(总运行时间/停线次数)")
+    public String mtbf;
+
     public int getTotalTimeVal() {
         return totalTime == null ? 0 : totalTime;
     }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonTargetRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonTarget;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 安灯目标
+ * @Reference :
+ * @Author : dominic
+ * @CreateDate : 2021/6/27 11:39
+ * @Modify:
+ **/
+@Repository
+public interface IAndonTargetRepository extends BaseRepository<AndonTarget, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/MesShiftRestRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.MesShiftRest;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-05-20
+ * @Modify:
+ **/
+@Repository
+public interface MesShiftRestRepository extends BaseRepository<MesShiftRest, Long> {
+}

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

@@ -8503,4 +8503,106 @@ public class MesEnumUtil {
             return description;
         }
     }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TASK_INTEGRAL_JUNCTION {
+
+        TEMPORARY_RESOLVED(10, "临时解决"),
+        LONG_TERM_SOLUTION(20, "长期解决"),
+        UNRESOLVED(30, "未解决");
+
+        private int value;
+        private String description;
+
+        TASK_INTEGRAL_JUNCTION(int value, String description) {
+            this.value = value;
+            this.description = 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;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MAINTENANCE_TYPE {
+
+        PERIODIC_MAINTENANCE(10, "周期性维护"),
+        IMPROVING_MAINTENANCE(20, "改善性维护"),
+        EMERGENCY_MAINTENANCE(30, "紧急维护");
+
+        private int value;
+        private String description;
+
+        MAINTENANCE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = 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;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRIORITY {
+
+        HIGH(10, "高"),
+        CENTER(20, "中"),
+        LOW(30, "低");
+
+        private int value;
+        private String description;
+
+        PRIORITY(int value, String description) {
+            this.value = value;
+            this.description = 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;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 }

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

@@ -264,6 +264,8 @@ public class ScreenEnumUtil {
             }
             return tmp;
         }
+
+
     }
 
     public enum LAYOUT_TYPE {
@@ -786,8 +788,80 @@ public class ScreenEnumUtil {
             }
             return tmp;
         }
+    }
+
+    public enum AUTH_ACCESS_TYPE {
+        NO_AUTH(10, "NO_AUTH", "无权限"),
+        READONLY(20, "READONLY", "只读");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        AUTH_ACCESS_TYPE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(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;
+        }
+    }
 
+    public enum AUTH_KIND_TYPE {
+        USER(10, "USER", "用户"),
+        ROLE(20, "ROLE", "角色");
 
+        private Integer value;
+        private String code;
+        private String description;
+
+        AUTH_KIND_TYPE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String codeOfDescription(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/MesBom.java

@@ -108,6 +108,9 @@ public class MesBom extends BaseBean implements Serializable {
     @ApiParam("报废数")
     private Double wasteQty = 0d;
 
+    @Transient
+    @ApiParam("客户零件号")
+    private String custPartNo;
 
 
     public double getQtyVal() {

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

@@ -45,6 +45,10 @@ public class MesElectrotestingPrintData extends BaseBean implements Serializable
     @ApiParam("佣金号")
     private String commissionNumber;
 
+    @Column(name = "SERIAL_NUMBER")
+    @ApiParam("流水号")
+    private String serialNumber;
+
     @Column(name = "QAD_NO")
     @ApiParam("位置号")
     private String qadNo;

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

@@ -73,6 +73,30 @@ public class MesEquTask extends BaseBean implements Serializable {
     @ApiParam("关联任务")
     private String relateTask;
 
+    @Column(name = "FAULT_LOCATION")
+    @ApiParam("故障位置")
+    private String faultLocation;
+
+    @Column(name = "REPAIR_TYPE")
+    @ApiParam("维修类型")
+    private Integer repairType;
+
+    @Column(name = "PRIORITY")
+    @ApiParam("优先级")
+    private Integer priority;
+
+    @Column(name = "DESIGNATOR")
+    @ApiParam("指派人")
+    private String designator;
+
+    @Transient
+    @ApiParam("维修类型")
+    private String repairTypeName;
+
+    @Transient
+    @ApiParam("优先级")
+    private String priorityName;
+
     @Transient
     @ApiParam(value = "设备代码")
     private String equipmentCode;

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

@@ -65,6 +65,10 @@ public class MesEquTaskDetail extends BaseBean implements Serializable {
     @ApiParam("维修标识")
     private Integer repairFlag;
 
+    @Column(name = "FILE_ID")
+    @ApiParam("文件id")
+    private String fileId;
+
     @Transient
     @ApiParam(value = "点检保养记录")
     private List<MesEquTaskStandardRecord> equTaskStandardRecordList;

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

@@ -92,6 +92,10 @@ public class MesEquipment extends BaseBean implements Serializable {
     @ApiParam("备注")
     private String memo;
 
+    @Column(name = "FIXED_ASSETS_NO")
+    @ApiParam("固定资产编号")
+    private String fixedAssetsNo;
+
     @Transient
     @ApiParam(value = "名称")
     private String name;

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

@@ -85,4 +85,8 @@ public class MesQuarantineRecord extends BaseBean {
     @Column(name = "REPAIR_NAME")
     @ApiParam("维修名称")
     private String repairName;
+
+    @Column(name = "IS_CANCEL_REPAIR")
+    @ApiParam("取消报废")
+    private Integer isCancelScrap;
 }

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

@@ -58,6 +58,18 @@ public class MesTooling extends BaseBean implements Serializable {
     @ApiParam("提醒次数")
     private Integer remindCount;
 
+    @Column(name = "WARNING_TIME")
+    @ApiParam("预警次数")
+    private Integer warningTime;
+
+    @Column(name = "NOTIFY_USER_EMP_NO")
+    @ApiParam("通知员工号")
+    private String notifyUserEmpNo;
+
+    @Column(name = "NOTIFY_USER_NAME")
+    @ApiParam("通知员工名称")
+    private String notifyUserName;
+
     @Transient
     @ApiParam("使用次数")
     private Integer useCount;

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

@@ -19,7 +19,7 @@ public class MesEquTaskModel implements Serializable {
     @ApiParam("作业状态")
     private Integer taskStatus;
 
-    @ApiParam(value="生产线")
+    @ApiParam(value = "生产线")
     private String workCenterCode;
 
     @ApiParam("计划日期")
@@ -73,12 +73,33 @@ public class MesEquTaskModel implements Serializable {
     @ApiParam("mes设备作业任务页面按钮控制")
     private MesButtonFlagModel mesButtonFlagModel;
 
+    @ApiParam("故障位置")
+    private String faultLocation;
+
+    @ApiParam("维修类型")
+    private Integer repairType;
+
+    @ApiParam("优先级")
+    private Integer priority;
+
+    @ApiParam("指派人")
+    private String designator;
+
+    @ApiParam("维修类型")
+    private String repairTypeName;
+
+    @ApiParam("优先级")
+    private String priorityName;
+
 
     public MesEquTaskModel() {
 
     }
 
-    public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+    public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode,
+                           String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask,
+                           String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime,
+                           String modifyUser, String modifyDatetime, String faultLocation, Integer repairType, Integer priority, String designator) {
         this.id = id;
         this.taskNo = taskNo;
         this.taskType = taskType;
@@ -96,5 +117,9 @@ public class MesEquTaskModel implements Serializable {
         this.createDatetime = createDatetime;
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
+        this.faultLocation = faultLocation;
+        this.repairType = repairType;
+        this.priority = priority;
+        this.designator = designator;
     }
 }

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

@@ -100,6 +100,9 @@ public class MesEquipmentModel implements Serializable {
     @ApiParam("作业校验模式")
     private Integer checkModel;
 
+    @ApiParam("固定资产编号")
+    private String fixedAssetsNo;
+
 
     public MesEquipmentModel() {
 
@@ -143,7 +146,7 @@ public class MesEquipmentModel implements Serializable {
     }
 
     //获取设备分页数据 queryMesEquipmentByPager
-    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer checkModel) {
+    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, Integer checkModel, String fixedAssetsNo) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -168,6 +171,7 @@ public class MesEquipmentModel implements Serializable {
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
         this.checkModel = checkModel;
+        this.fixedAssetsNo = fixedAssetsNo;
     }
 
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesToolingDetailRepository.java

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesToolingDetail;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2021/6/26 5:57 PM
+ * @Modify:
+ */
+public interface MesToolingDetailRepository extends BaseRepository<MesToolingDetail, Long> {
+}

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java

@@ -46,7 +46,7 @@ public class SysLogRoleChange extends BaseBean {
     @ApiModelProperty(value = "之前的角色", access = "之前的角色")
     private String previousRoles;
 
-    @Column(name = "CURRENT_ROLES")
+    @Column(name = "CURRENT_ROLES", columnDefinition = "TEXT")
     @ApiModelProperty(value = "当前的角色", access = "当前的角色")
     private String currentRoles;
 

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrAction.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -12,8 +11,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -43,7 +40,6 @@ public class ScrAction extends BaseBean implements Serializable {
 
     @Column(name = "ACTION_TYPE")
     @ApiModelProperty("动作类型")
-    @Enumerated(EnumType.STRING)
+    private Integer actionType;
-    private ScreenEnumUtil.ACTION_TYPE actionType;
 
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataAuth.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -12,8 +11,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -33,6 +30,10 @@ import java.io.Serializable;
 public class ScrDataAuth extends BaseBean implements Serializable {
     private static final long serialVersionUID = 8099384243374450186L;
 
+    @Column(name = "SCREEN_CODE")
+    @ApiModelProperty("页面代码")
+    private String screenCode;
+
     @Column(name = "MODEL_CODE")
     @ApiModelProperty("model代码")
     private String modelCode;
@@ -41,30 +42,29 @@ public class ScrDataAuth extends BaseBean implements Serializable {
     @ApiModelProperty("model字段代码")
     private String modelFieldCode;
 
-    @Column(name = "MODEL_FIELD_CONDITION")
+    @Column(name = "ROLE")
-    @ApiModelProperty("model字段条件")
-    private String modelFieldCondition;
-
-    @Column(name = "ACCESS_ROLES")
     @ApiModelProperty("可以访问的角色")
-    private String accessRoles;
+    private String role;
 
-    @Column(name = "DENIED_ROLES")
+    @Column(name = "ACCESS_TYPE")
-    @ApiModelProperty("拒绝访问的角色")
+    @ApiModelProperty("访问类型")
-    private String deniedRoles;
+    private Integer accessType;
 
-    @Column(name = "ACCESS_USERS")
+    @Column(name = "AUTH_KIND_TYPE")
-    @ApiModelProperty("可以访问的用户")
+    @ApiModelProperty("行权限类型")
-    private String accessUsers;
+    private Integer authKindType;
 
-    @Column(name = "DENIED_USERS")
+    @Column(name="AUTH_VALUE")
-    @ApiModelProperty("拒绝访问的用户")
+    @ApiModelProperty("权限制")
-    private String deniedUsers;
+    private String authValue;
+
+    @Column(name = "MODEL_FIELD_CONDITION")
+    @ApiModelProperty("model字段条件")
+    private String modelFieldCondition;
 
     @Column(name = "AUTH_TYPE")
     @ApiModelProperty("权限类型 （行，列）")
-    @Enumerated(EnumType.STRING)
+    private Integer authType;
-    private ScreenEnumUtil.AUTH_TYPE authType;
 
 
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObject.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
@@ -14,9 +13,8 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -35,52 +33,33 @@ import java.io.Serializable;
 public class ScrDataObject extends BaseBean implements Serializable {
     private static final long serialVersionUID = -270662014158685376L;
 
-    @Column(name = "DATA_SOURCE_ID")
+    @Column(name = "DATASOURCE_ID")
     @ApiModelProperty(value = "数据源ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long dataSourceId;
+    private Long datasourceId;
 
     @Column(name = "DATA_OBJECT_CODE")
     @ApiModelProperty(value = "数据对象代码")
     private String dataObjectCode;
 
+    @Column(name = "DATA_OBJECT_NAME")
+    @ApiModelProperty(value = "数据对象名称")
+    private String dataObjectName;
+
     @Column(name = "TABLE_NAME")
     @ApiModelProperty(value = "表或视图名称")
     private String tableName;
 
-    @Column(name = "DATA_TYPE")
+    @Column(name = "TABLE_TYPE")
-    @ApiModelProperty(value = "数据类型")
+    @ApiModelProperty(value = "表还是视图")
-    @Enumerated(EnumType.STRING)
+    private Integer tableType;
-    private ScreenEnumUtil.DATA_OBJECT_SOURCE dataType;
-
-    @Column(name = "FIELD_CODE")
-    @ApiModelProperty(value = "字段代码")
-    private String fieldCode;
-
-    @Column(name = "FIELD_NAME")
-    @ApiModelProperty(value = "字段名称")
-    private String fieldName;
-
-
-    @Column(name = "FIELD_TYPE")
-    @ApiModelProperty(value = "字段类型")
-    private String fieldType;
-
-    @Column(name = "FIELD_SIZE")
-    @ApiModelProperty(value = "字段长度")
-    private Integer fieldSize;
-
-    @Column(name = "DISPLAY_NAME")
-    @ApiModelProperty(value = "字段名称")
-    private String displayName;
 
-    @Column(name = "DESCRIPTION")
+    @Transient
-    @ApiModelProperty(value = "描述")
+    @ApiModelProperty(value = "数据源代码")
-    private String description;
+    private String datasourceCode;
 
-    @Column(name = "NULLABLE")
+    @Transient
-    @ApiModelProperty("是否能为空")
+    @ApiModelProperty(value="数据源名称")
-    @Enumerated(EnumType.STRING)
+    private String datasourceName;
-    private ScreenEnumUtil.NULLABLE nullable;
 
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectIndex.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -12,8 +11,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -39,15 +36,26 @@ public class ScrDataObjectIndex extends BaseBean implements Serializable {
 
     @Column(name = "INDEX_TYPE")
     @ApiModelProperty("约束类型")
-    @Enumerated(EnumType.STRING)
+    private Integer indexType;
-    private ScreenEnumUtil.INDEX_TYPE indexType;
 
     @Column(name = "GROUP_NO")
     @ApiModelProperty("组号")
     private Integer groupNo;
 
+    @Column(name = "SEQ_NO")
+    @ApiModelProperty("组号")
+    private Integer seqNo;
+
     @Column(name = "FIELD_CODE")
     @ApiModelProperty("字段代码")
     private String fieldCode;
 
+    @Column(name = "INDEX_NAME")
+    @ApiModelProperty("索引名字")
+    private String indexName;
+
+    @Column(name = "IS_UNIQUE")
+    @ApiModelProperty("是否唯一")
+    private Integer isUnique;
+
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDataObjectProperty.java

@@ -0,0 +1,76 @@
+package cn.estsh.i3plus.pojo.screen.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/3/22 下午1:27
+ * @desc 数据对象管理
+ */
+@Entity
+@Table(name = "SCR_DATA_OBJECT_PROPERTY")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel("数据对象管理")
+public class ScrDataObjectProperty extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -2729101772049144018L;
+
+    @Column(name = "DATA_OBJECT_CODE")
+    @ApiModelProperty(value = "数据对象代码")
+    private String dataObjectCode;
+
+    @Column(name = "DISPLAY_NAME")
+    @ApiModelProperty(value = "字段名称")
+    private String displayName;
+
+    @Column(name = "DATA_TYPE")
+    @ApiModelProperty(value = "数据类型")
+    private Integer dataType;
+
+    @Column(name = "DATA_TYPE_NAME")
+    @ApiModelProperty(value = "数据类型名称")
+    private String dataTypeName;
+
+    @Column(name = "FIELD_TYPE")
+    @ApiModelProperty(value = "java类型")
+    private String fieldType;
+
+    @Column(name = "FIELD_CODE")
+    @ApiModelProperty(value = "字段代码")
+    private String fieldCode;
+
+    @Column(name = "NULLABLE")
+    @ApiModelProperty("是否能为空")
+    private Integer nullable;
+
+    @Column(name = "FIELD_NAME")
+    @ApiModelProperty(value = "字段名称")
+    private String fieldName;
+
+    @Column(name = "FIELD_SIZE")
+    @ApiModelProperty(value = "字段长度")
+    private Integer fieldSize;
+
+    @Column(name = "DESCRIPTION")
+    @ApiModelProperty(value = "描述")
+    private String description;
+
+
+}

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrDatasource.java

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -13,8 +11,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -45,13 +41,11 @@ public class ScrDatasource extends BaseBean implements Serializable {
 
     @Column(name = "SOURCE_CONNECTION_STATUS")
     @ApiModelProperty(value = "数据源状态", name = "状态：可用，不可用 看枚举当中是否存在")
-    @Enumerated(EnumType.STRING)
+    private Integer sourceConnectionStatus;
-    private ScreenEnumUtil.DATASOURCE_CONNECTION_STATUS sourceConnectionStatus;
 
     @Column(name = "SOURCE_TYPE")
     @ApiModelProperty(value = "数据源类型", name = "CommonEnumUtil.DATA_SOURCE_TYPE")
-    @Enumerated(EnumType.STRING)
+    private Integer sourceType;
-    private CommonEnumUtil.DATA_SOURCE_TYPE sourceType;
 
     @Column(name = "SOURCE_HOST")
     @ApiModelProperty(value = "数据源连接地址")

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrEventAction.java

@@ -44,6 +44,10 @@ public class ScrEventAction extends BaseBean implements Serializable {
     private String executeActionCode;
 
     @Column(name = "POST_ACTION_CODE")
-    @ApiModelProperty("执行前动作代码")
+    @ApiModelProperty("执行后动作代码")
     private String postActionCode;
+
+    @Column(name = "EXCEPTION_ACTION_CODE")
+    @ApiModelProperty("报错时动作代码")
+    private String exceptionActionCode;
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrLayout.java

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -13,8 +11,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -44,7 +40,6 @@ public class ScrLayout extends BaseBean implements Serializable {
 
     @Column(name = "LAYOUT_TYPE")
     @ApiModelProperty("布局类型")
-    @Enumerated(EnumType.STRING)
+    private Integer layoutType;
-    private ScreenEnumUtil.LAYOUT_TYPE layoutType;
 
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModel.java

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -12,8 +11,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -37,16 +34,16 @@ public class ScrModel extends BaseBean implements Serializable {
     @ApiModelProperty("model代码")
     private String modelCode;
 
+    @Column(name = "MODEL_NAME")
+    @ApiModelProperty("model名称")
+    private String modelName;
+
     @Column(name = "MODEL_TYPE")
     @ApiModelProperty("model的类型")
-    @Enumerated(EnumType.STRING)
+    private Integer modelType;
-    private ScreenEnumUtil.MODEL_TYPE modelType;
 
     @Column(name = "DATA_OBJECT_CODE")
     @ApiModelProperty("数据对象代码")
     private String dataObjectCode;
 
-    @Column(name = "DATA_COlUMN_AUTH")
-    @ApiModelProperty("数据列权限")
-    private String dataColumnAuth;
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelField.java

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -13,8 +11,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.Serializable;
@@ -75,7 +71,7 @@ public class ScrModelField extends BaseBean implements Serializable {
     @ApiModelProperty("是否必填")
     private Boolean isRequired = false;
 
-    @Column(name = "SEQ")
+    @Column(name = "SEQ",columnDefinition = "int(11) default 0")
     @ApiModelProperty("表单顺序")
     private Integer seq;
 
@@ -89,8 +85,7 @@ public class ScrModelField extends BaseBean implements Serializable {
 
     @Column(name = "MODEL_FIELD_DATASOURCE")
     @ApiModelProperty("字段数据来源")
-    @Enumerated(EnumType.STRING)
+    private Integer modelFieldDatasource;
-    private ScreenEnumUtil.MODEL_FIELD_DATASOURCE modelFieldDatasource;
 
     @Column(name = "MODEL_FIELD_DATASOURCE_PROPS")
     @ApiModelProperty("model字段来源属性")
@@ -103,5 +98,4 @@ public class ScrModelField extends BaseBean implements Serializable {
     @Transient
     private Object fieldValue;
 
-
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrModelFieldIndex.java

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -40,8 +39,7 @@ public class ScrModelFieldIndex extends BaseBean implements Serializable {
 
     @Column(name = "INDEX_TYPE")
     @ApiModelProperty("约束类型")
-    @Enumerated(EnumType.STRING)
+    private Integer indexType;
-    private ScreenEnumUtil.INDEX_TYPE indexType;
 
     @Column(name = "GROUP_NO")
     @ApiModelProperty("组号")
@@ -58,11 +56,9 @@ public class ScrModelFieldIndex extends BaseBean implements Serializable {
 
     @Column(name = "PRIMARY_KEY_SWITCH")
     @ApiModelProperty("model主键唯一检查开关")
-    @Enumerated(EnumType.STRING)
+    private Integer primaryKeySwitch;
-    private CommonEnumUtil.TRUE_OR_FALSE primaryKeySwitch;
 
     @Column(name = "UNIQUE_KEY_SWITCH")
     @ApiModelProperty("model唯一键唯一检查开关")
-    @Enumerated(EnumType.STRING)
+    private Integer uniqueKeySwitch;
-    private CommonEnumUtil.TRUE_OR_FALSE uniqueKeySwitch;
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/bean/ScrScreen.java

@@ -1,8 +1,6 @@
 package cn.estsh.i3plus.pojo.screen.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -13,8 +11,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -52,12 +48,10 @@ public class ScrScreen extends BaseBean implements Serializable {
 
     @Column(name = "SCREEN_TYPE")
     @ApiModelProperty("页面类型")
-    @Enumerated(EnumType.STRING)
+    private Integer screenType;
-    private ScreenEnumUtil.SCREEN_TYPE screenType;
 
     @Column(name = "SCREEN_OWNING_SYSTEM")
     @ApiModelProperty("界面所属系统")
-    @Enumerated(EnumType.STRING)
+    private Integer screenOwningSystem;
-    private CommonEnumUtil.SOFT_TYPE screenOwningSystem;
 
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/model/ScrDataObjectIndexModel.java

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.screen.model;
 
 import cn.estsh.i3plus.pojo.screen.bean.ScrDataObject;
 import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectIndex;
+import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectProperty;
 import cn.estsh.i3plus.pojo.screen.bean.ScrDatasource;
 import lombok.Builder;
 import lombok.Data;
@@ -21,7 +22,9 @@ public class ScrDataObjectIndexModel implements Serializable {
 
     private ScrDatasource datasource;
 
-    private List<ScrDataObject> dataObjects;
+    private ScrDataObject dataObject;
 
     private List<ScrDataObjectIndex> dataObjectIndices;
+
+    private List<ScrDataObjectProperty> dataObjectProperties;
 }

modules/i3plus-pojo-screen/src/main/java/cn/estsh/i3plus/pojo/screen/repository/ScrDataObjectPropertyRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.screen.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.screen.bean.ScrDataObjectProperty;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-5-28 下午3:39
+ * @Modify:
+ **/
+public interface ScrDataObjectPropertyRepository extends BaseRepository<ScrDataObjectProperty, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java

@@ -4,14 +4,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 
 /**

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1379,6 +1379,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLeftCode(), "leftCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getPackageNo(), "packageNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsStockSn.getCtNo(), "ctNo", result);
         if (wmsStockSn.getCheckQyt() != null && wmsStockSn.getCheckQyt().intValue() == WmsEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) {
             DdlPreparedPack.getNumberBiggerPackContainsZero(0.0, "qty", result);
         }