diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 2328a81..a549eee 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -209,8 +209,11 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYS_LOCALE_RESOURCE_TYPE { - COMMON(1, "通用"),EXCEPTION(2, "异常"), - MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮"), + COMMON(1, "通用"), + EXCEPTION(2, "异常"), + MODULE(10, "模块"), + METHOD(11, "功能"), + BUTTON(12, "按钮"), WEB(13, "前端"); private int value; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 82b0e3c..6c2a780 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1022,7 +1022,8 @@ public class ImppEnumUtil { PASSWORD(2, "密码安全策略"), MAIL(3, "邮件配置"), CONTACT(4, "联系人"), - BASIS(5, "基础"); + BASIS(5, "基础"), + CONFIG(6, "系统配置"); private int value; private String description; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index dbfbd1a..63e0250 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -43,8 +43,8 @@ public class SysLabelTemplate extends BaseBean { private String templateContent; // 参数拼接,多参数都好分隔,后台在做处理 - @ApiParam(value ="模板参数拼接") @Transient + @ApiParam(value ="模板参数拼接") private String paramsPack; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index a01642f..f0201cb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -81,4 +81,31 @@ public class WmsTaskInfo extends BaseBean { @Column(name = "IS_CHECK_SN") @ApiParam("是否校验条码") public Integer isCheckSn; + + @Transient + @ApiParam("计划日期") + private String zdate; + + @Transient + @ApiParam("计划时间") + private String ztime; + + @Transient + @ApiParam(value = "客户编号") + private String custNo; + + @Transient + @ApiParam(value = "供应商编号") + private String vendorNo; + + public WmsTaskInfo(){}; + + public WmsTaskInfo(String orderNo ,Integer taskStatus , String zdate ,String ztime,String custNo,String vendorNo){ + this.orderNo = orderNo; + this.taskStatus = taskStatus; + this.zdate = zdate; + this.ztime = ztime; + this.custNo = custNo; + this.vendorNo = vendorNo; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 4dffc39..8398302 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -45,7 +45,9 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr); - DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd(),"createDatetime",hqlStr,true); + if(StringUtils.isNotBlank(bean.getCreateDateTimeStart())&&StringUtils.isNotBlank(bean.getCreateDateTimeEnd())){ + DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd(),"createDatetime",hqlStr,true); + } return hqlStr; }