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

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

@@ -45,5 +45,5 @@ public class MesNumberSerialno extends BaseBean implements Serializable {
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public Integer lockVersion;
+    public transient Integer lockVersion;
 }

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

@@ -52,4 +52,12 @@ public class MesWorkCell extends BaseBean implements Serializable {
     @Column(name = "SEQ")
     @ApiParam("序号")
     private Integer seq;
+
+    @Column(name = "WORK_CELL_IP")
+    @ApiParam("工作单元IP")
+    private String workCellIp;
+
+    @Column(name = "WORK_CELL_PORT")
+    @ApiParam("工作单元端口")
+    private String workCellPort;
 }

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

@@ -46,6 +46,11 @@ public class MesSyncDeadLetter extends BaseBean implements Serializable {
     private String pcnCode;
 
     @Lob
+    @Column(name = "EX_MSG")
+    @ApiParam("同步数据")
+    private String exMsg;
+
+    @Lob
     @Column(name = "DATA")
     @ApiParam("同步数据")
     private String data;

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

@@ -57,6 +57,14 @@ public class MesWorkCell extends BaseBean implements Serializable {
     @ApiParam("序号")
     private Integer seq;
 
+    @Column(name = "WORK_CELL_IP")
+    @ApiParam("工作单元IP")
+    private String workCellIp;
+
+    @Column(name = "WORK_CELL_PORT")
+    @ApiParam("工作单元端口")
+    private String workCellPort;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesEquipment> childTreeList;

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -30,6 +29,7 @@ import javax.persistence.Table;
 public class SysTask extends BaseBean {
 
     private static final long serialVersionUID = -4462661508105857312L;
+
     @Column(name="NAME")
     @ApiParam(value ="名称")
     private String name;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -718,6 +718,7 @@ public class CoreHqlPack {
 
         HqlPack.getStringEqualPack(localeResource.getLanguageCode(),"languageCode",result);
         HqlPack.getStringEqualPack(localeResource.getResourceKey(),"resourceKey",result);
+        HqlPack.getNumEqualPack(localeResource.getSoftType(),"softType",result);
         HqlPack.getNumNOEqualPack(localeResource.getId(),"id",result);
 
         // 添加默认排序

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

@@ -247,6 +247,11 @@ public class WmsPart extends BaseBean {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double cycleRquestQty = 0d;
 
+    @Column(name = "CURING_TIME")
+    @ApiParam(value = "固化时间", example = "0")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Double curingTime = 0d;
+
     public int getIqcVal(){
         return this.iqc == null ? 0 : this.iqc.intValue();
     }
@@ -274,6 +279,10 @@ public class WmsPart extends BaseBean {
         return this.cycleRquestQty == null? 0d:this.cycleRquestQty.doubleValue();
     }
 
+    public Double getCuringTime() {
+        return this.curingTime == null? 0d:this.curingTime.doubleValue();
+    }
+
 
     public WmsPart(String partNo, String partName, Double maxQty, Double minQty, Double cqty, String partType) {
         this.partNo = partNo;