Merge remote-tracking branch 'origin/test' into test

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

@@ -2591,8 +2591,10 @@ public class MesPcnEnumUtil {
         RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"),
         PROCESS_CONTENT("processContent", "过程组件内容"),
         TIME_MODULE_CONTENT("timeModuleContent", "定时组件内容"),
-//        TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"),
+        TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件"),
         TIME_MODULE_START("timeModuleStart", "定时组件开始"),
+        ADDITIONAL_TIPS("additionalTips", "额外帮助信息显示"),
+        ADDITIONAL_TIPS_HIDE("additionalTipsHide", "额外帮助信息隐藏"),
         TIME_MODULE_STOP("timeModuleStop", "定时组件暂停");
         //TIME_MODULE_INIT("timeModuleInit", "初始化时间展示组件");
 
@@ -3556,7 +3558,8 @@ public class MesPcnEnumUtil {
         JUMP_STEP(10, "JUMP_STEP", "跳过工步"),
         REDO_PROCESS(20, "REDO_PROCESS", "重做工序"),
         JUMP_PROCESS(30, "JUMP_PROCESS", "跳过工序"),
-        NORMAL_COMPLETE(40, "NORMAL_COMPLETE", "正常完成");
+        NORMAL_COMPLETE(40, "NORMAL_COMPLETE", "正常完成"),
+        CLEAR_CACHE(50, "CLEAR_CACHE", "工步已清空缓存，执行完工步之后无需放入StationRequestBean");
         
         private int value;
         private String code;

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

@@ -98,6 +98,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("客户代码")
     private String custCode;
 
+    @Column(name = "IN_LOCATION_TIME")
+    @ApiParam("入库时间")
+    private String inLocationTime;
+
     @Transient
     @ApiParam("封箱状态")
     private String sealStatus;
@@ -140,6 +144,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("目标库位代码")
     private String destLocationCode;
 
+    @Transient
+    @ApiParam("不良处理类型")
+    private String defectActionType;
+
     public MesPackage() {
     }
 
@@ -150,4 +158,13 @@ public class MesPackage extends BaseBean implements Serializable {
         this.qty = qty;
         this.packSpecQty = packSpecQty;
     }
+
+    public MesPackage(String partNo, String partNameRdd,String packageNo, Double qty, String defectActionType, String createDatetime) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.packageNo = packageNo;
+        this.qty = qty;
+        this.defectActionType = defectActionType;
+        this.createDatetime = createDatetime;
+    }
 }

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

@@ -67,6 +67,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
     @ApiParam("配置代码")
     private String prodCfgCode;
 
+    @Column(name = "IS_SMALL_SIZE")
+    @ApiParam("是否小尺寸物料")
+    private Integer isSmallSize = 1;
+
     @Transient
     @ApiParam("物料名称")
     private String partName;

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

@@ -106,13 +106,14 @@ public class MesEquipmentModel implements Serializable {
     }
 
     //根据条件查询设备所有有效数据-设备作业任务下拉框 queryMesEquipmentListByParams
-    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory) {
+    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory,
+                             String modifyDatetime) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
         this.status = status;
         this.workCenterCode = workCenterCode;
-        this.equipmentCategory = equipmentCategory;
+        this.modifyDatetime = modifyDatetime;
     }
 
     //根据生产线，工位获取设备集合 findMesEquipmentList

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -11,7 +10,10 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
 
 /**
  * @Description :作业记录参数表
@@ -40,7 +42,10 @@ public class WmsActionLogData extends BaseBean {
     @ApiParam(value = "交易类型编号")
     public String transTypeCode;
 
-    @Transient
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "业务单号")
+    public String orderNo;
+
     @Column(name = "MOVE_NO")
     @ApiParam(value = "移动单单号")
     public String moveNo;

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-PROD-SNAPSHOT
+sonar.projectVersion=1.0-TEST-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./