diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index b4f4a10..e1d4eae 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -615,7 +615,8 @@ public class BlockSoftSwitchEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATABASE_OPERATE_TYPE{ READ(1,"读取"), - WRITE(2,"写入"); + WRITE(2,"写入"), + BATCH_WRITE(3,"批量写入"); private int value; private String description; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index 01fd23c..5555d83 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -70,6 +70,12 @@ public class SysLocaleResource extends BaseBean { @ApiParam(value ="产品类型", example = "0",access = "softTyp DOC: http://doc.estsh.com/docs/i3plus_api/i3plus_api-impp") @AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, refForeignKey = "value", value = "description",required = false) private Integer softType; + public int getSoftTypeVal(){ + if(softType==null){ + return CommonEnumUtil.SOFT_TYPE.IMPP.getValue(); + } + return softType.intValue(); + } //系统自带需要有初始化表,只能修改value,无法删除。 @Column(name="is_system") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java index 6257a7b..03ab889 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java @@ -13,10 +13,12 @@ import lombok.EqualsAndHashCode; import org.apache.commons.lang3.math.NumberUtils; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; + import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.List; /** * @Description : 适配器出入参 @@ -53,6 +55,10 @@ public class BsSuitCaseParam extends BaseBean { @ApiParam(value = "参数名称)") private String paramName; + @Column(name = "PARENT_PARAM_Id") + @ApiParam(value = "上级参数id") + private String parentParamId; + @Column(name = "PARENT_PARAM_NAME") @ApiParam(value = "上级参数名称)") private String parentParamName; @@ -80,7 +86,18 @@ public class BsSuitCaseParam extends BaseBean { @Transient @ApiParam(value = "参数值") - private String paramValue; + private Object paramValue; + + public String getParamValueStr() { + if (paramValue == null) { + return null; + } + return paramValue.toString(); + } + + @Transient + @ApiParam(value = "子级参数") + private List bsSuitCaseParamList; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java index e85deb6..c1d94dc 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java @@ -7,10 +7,8 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; + +import javax.persistence.*; /** * @Description : 适配记录参数 @@ -38,6 +36,7 @@ public class BsSuitRecordParam extends BaseBean { @ApiParam(value = "参数名称") private String paramName; + @Lob @Column(name = "PARAM_VAL") @ApiParam(value = "参数值") private String paramVal; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index e5063c6..b1a9344 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java @@ -338,6 +338,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean); DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true); + DdlPreparedPack.timeBuilder(bsSuitRecord.getSuitStartTime(), "suitStartTime", ddlPackBean, false, true); ddlPackBean.setOrderByStr(bsSuitRecord.orderBy()); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java index 79c7f34..65e800d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -132,4 +133,9 @@ public class WmsDocFgDetail extends BaseBean { @Column(name="COMMIT_DATE") @ApiParam("提交日期") public String commitDate; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value = "BOM生效日期") + @Column(name = "EFF_START_TIME") + private String effStartTime; }