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

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

@@ -8605,4 +8605,38 @@ public class MesEnumUtil {
             return description;
         }
     }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TOOLING_TYPE {
+
+        WORK_CLOTHES(10, "工装"),
+        INSPECTION_TOOL(20, "检具"),
+        MOULD(30, "模具");
+
+        private int value;
+        private String description;
+
+        TOOLING_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;
+        }
+    }
 }

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

@@ -44,4 +44,8 @@ public class MesEquFaultPhenomenon extends BaseBean implements Serializable {
     @Column(name = "EQUIPMENT_CODE")
     @ApiParam("设备代码")
     private String equipmentCode;
+
+    @Column(name = "FILE_ID")
+    @ApiParam("文件id")
+    private String fileId;
 }

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

@@ -69,6 +69,10 @@ public class MesObjectCfg extends BaseBean implements Serializable {
     @ApiParam("是否显示")
     private Integer isShow;
 
+    @Column(name = "PLC_CODE")
+    @ApiParam("PLC代码")
+    private String plcCode;
+
     @Transient
     @ApiParam("是否存储名")
     private String isSaveName;

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

@@ -91,6 +91,9 @@ public class MesEquTaskModel implements Serializable {
     @ApiParam("优先级")
     private String priorityName;
 
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
 
     public MesEquTaskModel() {
 
@@ -99,7 +102,7 @@ public class MesEquTaskModel implements Serializable {
     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) {
+                           String modifyUser, String modifyDatetime, String faultLocation, Integer repairType, Integer priority, String designator, String equipmentCode) {
         this.id = id;
         this.taskNo = taskNo;
         this.taskType = taskType;
@@ -121,5 +124,6 @@ public class MesEquTaskModel implements Serializable {
         this.repairType = repairType;
         this.priority = priority;
         this.designator = designator;
+        this.equipmentCode = equipmentCode;
     }
 }

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

@@ -42,7 +42,7 @@ public class SysLogRoleChange extends BaseBean {
     @ApiModelProperty(value = "用户名", access = "用户名")
     private String userName;
 
-    @Column(name = "PREVIOUS_ROLES")
+    @Column(name = "PREVIOUS_ROLES",columnDefinition = "TEXT")
     @ApiModelProperty(value = "之前的角色", access = "之前的角色")
     private String previousRoles;
 

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

@@ -257,6 +257,15 @@ public class WmsMoveToERP extends BaseBean {
     @Transient
     private Double transQtySum;
 
+    @Transient
+    private Integer totalNum;
+
+    @Transient
+    private Integer successNum;
+
+    @Transient
+    private Integer falseNum;
+
     public Double getTransQtySumVal() {
         return this.transQtySum == null ? 0 : this.transQtySum.doubleValue();
     }

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

@@ -51,4 +51,15 @@ public class WmsVendorWindow extends BaseBean {
     @Column(name = "WEEK_DAY")
     @ApiParam(value = "星期")
     private String weekDay;
+
+    public WmsVendorWindow(WmsVendorWindow wmsVendorWindow) {
+        this.vendorNo = wmsVendorWindow.getVendorNo();
+        this.vendorName = wmsVendorWindow.getVendorName();
+        this.windowTime = wmsVendorWindow.getWindowTime();
+        this.delayHour = wmsVendorWindow.getDelayHour();
+        this.weekDay = wmsVendorWindow.getWeekDay();
+    }
+
+    public WmsVendorWindow() {
+    }
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsVendorWindowDto.java

@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.GenericGenerator;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+/**
+ * @Description : WmsVendorWindowDto
+ * @Author :gsz
+ * @Date 2021/6/29 16:32
+ * @Modify
+ **/
+@Data
+@Api("到货窗口输出类")
+public class WmsVendorWindowDto {
+    @Id
+    @GeneratedValue(generator = "IDGenerator")
+    @GenericGenerator(name = "IDGenerator", strategy = "assigned")
+    @Column(name = "ID")
+    @ApiParam(value = "主键", example = "0")
+    public Long id;
+
+
+    @ApiParam(value = "窗口时间")
+    private String vendorWindowTime;
+
+    @ApiParam(value = "星期一供应商")
+    private String mondayVendor;
+
+    @ApiParam(value = "星期二供应商")
+    private String tuesdayVendor;
+
+    @ApiParam(value = "星期三供应商")
+    private String wednesdayVendor;
+
+    @ApiParam(value = "星期四供应商")
+    private String thursdayVendor;
+
+    @ApiParam(value = "星期五供应商")
+    private String fridayVendor;
+
+    @ApiParam(value = "星期六供应商")
+    private String saturdayVendor;
+
+    @ApiParam(value = "星期日供应商")
+    private String sundayVendor;
+
+    public WmsVendorWindowDto() {
+    }
+
+    public WmsVendorWindowDto(WmsVendorWindowDto wmsVendorWindowDto) {
+        this.vendorWindowTime = wmsVendorWindowDto.getVendorWindowTime();
+        this.mondayVendor = wmsVendorWindowDto.getMondayVendor();
+        this.tuesdayVendor = wmsVendorWindowDto.getTuesdayVendor();
+        this.wednesdayVendor = wmsVendorWindowDto.getWednesdayVendor();
+        this.thursdayVendor = wmsVendorWindowDto.getThursdayVendor();
+        this.fridayVendor = wmsVendorWindowDto.getFridayVendor();
+        this.saturdayVendor = wmsVendorWindowDto.getSaturdayVendor();
+        this.sundayVendor = wmsVendorWindowDto.getSundayVendor();
+    }
+}