diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index cea18b8..4a8d200 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -15,7 +15,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum IS_FREE { - CHARGING(0, "计费"), GRATIS(1, "免费"); + CHARGING(1, "计费"), GRATIS(2, "免费"); private int value; private String description; @@ -1331,4 +1331,109 @@ public class WmsEnumUtil { } } + /** + * 作业记录参数状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ALD_EXECUTE_STATUS { + NORMAL(1, "创建"), + PROCESSING(10, "处理中"), + COMPLETED(20, "已完成"); + private int value; + private String description; + + ALD_EXECUTE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 是否 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TRUE_OR_FALSE { + CHARGING(1, "是"), GRATIS(2, "否"); + + private int value; + private String description; + + TRUE_OR_FALSE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + *作业流程动作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ACTION_GROUP_DETAILS_VALUE_TYPE { + ONETIMEONLY(10, "只输入一次"), + MANYTIME(20, "输入多次"), + MAYTIMEUNIQUE(30, "输入多次不允许重复"), + ACTIONFINISH(40, "本流程结束"); + + private int value; + private String description; + + ACTION_GROUP_DETAILS_VALUE_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java index e90d14b..8694646 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -24,7 +26,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="SYS_NUMBER_RULE") +@Table(name="SYS_ORDER_RULE") @Api(value="单号规则",description = "单号规则") public class SysOrderNoRule extends BaseBean { @@ -36,36 +38,39 @@ public class SysOrderNoRule extends BaseBean { @ApiParam(value = "规则代码") private String orderNoRuleCode; - @Column(name = "numberRule") @ApiParam(value = "单号规则") private String orderNoRule; @Column(name = "SERIAL_NO_SEED") @ApiParam(value = "流水号种子",example = "-1") - private Integer serialNoSeed; + @JsonSerialize(using = ToStringSerializer.class) + private Long serialNoSeed; @Column(name = "ORDER_NO_INCREMENT") @ApiParam(value = "流水号步长",example = "-1") - private Integer serialNoIncrement; + @JsonSerialize(using = ToStringSerializer.class) + private Long serialNoIncrement; @Column(name = "SERIAL_NO_LENGTH") @ApiParam(value = "流水号长度",example = "-1") - private Integer serialNoLength; + @JsonSerialize(using = ToStringSerializer.class) + private Long serialNoLength; @Column(name = "IS_CYCLE") @ApiParam(value = "达到最大值后是否循环",example = "1") private Integer isCycle; - @Column(name = "LAST_MAKE_SERIAL_NO") - @ApiParam(value = "上次新增流水号",example = "-1") - private Integer lastMakeSerialNo; + @Column(name = "SERIAL_NO") + @ApiParam(value = "当前流水号",example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long serialNo; - @Column(name = "LAST_MAKE_ORDER_NO") - @ApiParam(value = "上次新增单号") - private String lastMakeOrderNo; + @Column(name = "ORDER_NO") + @ApiParam(value = "当前单号") + private String orderNo; - @Column(name = "LAST_MAKE_DATE") - @ApiParam(value = "上次新增时间") - private String lastMakeDatetime; + @Column(name = "ORDER_NO_RULE_STATUS") + @ApiParam(value = "单号规则状态") + private Integer orderNoRuleStatus; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java index 69e272d..0b0d0aa 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java @@ -43,6 +43,10 @@ public class SysRefUserMessage extends BaseBean { @ApiParam(value ="冗余消息类型") private Integer messageTypeRdd; + @Column(name="MESSAGE_SENDER_NAME_RDD") + @ApiParam(value ="冗余发件人名称") + private String messageSenderNameRdd; + @Column(name="RECEIVER_ID") @ApiParam(value ="接收者ID" ,example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeExpression.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeExpression.java index 7bdcc4d..ec5a9b5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeExpression.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeExpression.java @@ -33,10 +33,6 @@ public class SysTaskTimeExpression extends BaseBean { @ApiParam(value ="名称") private String name; - @Column(name="GROUP_NAME") - @ApiParam(value ="组名称") - private String groupName; - @Column(name="EXPRESSION_CONTENT") @ApiParam(value ="表达式内容") private String expressionContent; 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 d8a7177..519c5f0 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 @@ -243,11 +243,10 @@ public class CoreHqlPack { // hql拼接 HqlPack.getStringLikerPack(message.getMessageTitle(),"messageTitle",result); HqlPack.getStringLikerPack(message.getMessageContent(),"messageContent",result); -// HqlPack.getNumLikerPack(sysMessage.getMessageStatusId(),"messageStatusId",result); -// HqlPack.getNumLikerPack(sysMessage.getMessageTypeId(),"messageTypeId",result); -// HqlPack.getNumEqualPack(sysMessage.getMessageRecipientId(),"messageRecipientId",result); -// HqlPack.getNumEqualPack(sysMessage.getMessageSendId(),"messageSendId",result); - HqlPack.timeBuilder(message.getCreateDatetime(),"createDatetime", result, false,false); + HqlPack.getNumEqualPack(message.getMessageType(),"messageType",result); + HqlPack.getStringLikerPack(message.getMessageSenderNameRdd(),"messageSenderNameRdd",result); + HqlPack.getStringLikerPack(message.getMessageReceiversNameRdd(),"messageReceiversNameRdd",result); + HqlPack.timeBuilder(message.getMessageSendTime(),"messageSendTime", result, false,false); return result.toString(); } @@ -395,7 +394,7 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); // and - HqlPack.getStringEqualPack(sysOrderNoRule.getOrderNoRuleCode(),"dictionaryCode",result); + HqlPack.getStringEqualPack(sysOrderNoRule.getOrderNoRuleCode(),"orderNoRuleCode",result); // not HqlPack.getNumNOEqualPack(sysOrderNoRule.getId(),"id",result); @@ -415,4 +414,22 @@ public class CoreHqlPack { return result.toString(); } + + /** + * 用户消息关系表负责查询 + * @param sysRefUserMessage + * @return + */ + public static String packHqlSysRefUserMessage(SysRefUserMessage sysRefUserMessage){ + StringBuffer result = new StringBuffer(); + + HqlPack.getNumEqualPack(sysRefUserMessage.getMessageTypeRdd(),"messageTypeRdd",result); + HqlPack.getNumEqualPack(sysRefUserMessage.getReceiverId(),"receiverId",result); + HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(),"messageTitleRdd",result); + HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(),"messageSenderNameRdd",result); + HqlPack.getNumEqualPack(sysRefUserMessage.getMessageStatus(),"messageStatus",result); + HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(),"receiverTime",result); + + return result.toString(); + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java index 8910354..b887040 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionModuleParam.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -13,38 +15,39 @@ import javax.persistence.Entity; import javax.persistence.Table; /** -* @Description : 作业步骤处理组参数 -* @Reference : -* @Author : dragon.xu -* @CreateDate : 2018-11-22 16:53 -* @Modify: -**/ + * @Description : 作业步骤处理组参数 + * @Reference : + * @Author : dragon.xu + * @CreateDate : 2018-11-22 16:53 + * @Modify: + **/ @Data @Entity @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_ACTION_MODULE_PARAM") +@Table(name = "WMS_ACTION_MODULE_PARAM") @Api("作业步骤处理组参数") public class WmsActionModuleParam extends BaseBean { - @Column(name="AM_ID") - @ApiParam("组件ID") + @Column(name = "AM_ID") + @ApiParam(value = "组件ID", example = "0") + @JsonSerialize(using = ToStringSerializer.class) public Long amID; - @Column(name="PARAM_CODE") + @Column(name = "PARAM_CODE") @ApiParam("参数编码") public String paramCode; - @Column(name="PARAM_NAME") + @Column(name = "PARAM_NAME") @ApiParam("参数名称") public String paramName; - @Column(name="PARAM_VALUE_LIST") + @Column(name = "PARAM_VALUE_LIST") @ApiParam("参数可选值列表") public String paramValueList; - @Column(name="PARAM_TYPE") + @Column(name = "PARAM_TYPE") @ApiParam(value = "参数类型", example = "0") public Integer paramType; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java index e2542a8..f4b0ee9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java @@ -49,4 +49,7 @@ public class WmsActionStepCallParam extends BaseBean { @ApiParam(value = "参数值") private String paramValue; + @ApiParam(value = "组件名称") + private transient String amName; + } 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 0a5730d..c597eff 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 @@ -1002,6 +1002,7 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsActionStepCall.getAmId(), "amId", result); getStringBuilderPack(wmsActionStepCall, result); + HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result); return result.toString(); } @@ -1112,6 +1113,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); HqlPack.getNumEqualPack(wmsActionStepCallParam.getAgdId(), "agdId", result); + HqlPack.getNumEqualPack(wmsActionStepCallParam.getSeq(), "seq", result); getStringBuilderPack(wmsActionStepCallParam, result); return result.toString();