diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java index 366a100..b712a37 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTask.java +++ b/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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 50edbaf..44ddce3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/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); // 添加默认排序 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index 613ee34..c0a9d25 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/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;