From e0eb81177dc930fb50d34a9fb161544a814c41a5 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 23 Nov 2018 14:28:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/platform/bean/SysOrderNoRule.java | 33 +++++++++++++--------- .../pojo/platform/bean/SysRefUserMessage.java | 4 +++ .../pojo/platform/bean/SysTaskTimeExpression.java | 4 --- .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 26 +++++++++++++---- 4 files changed, 43 insertions(+), 24 deletions(-) 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..24f6c84 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,19 @@ public class CoreHqlPack { return result.toString(); } + + /** + * 用户消息关系表负责查询 + * @param sysRefUserMessage + * @return + */ + public static String packHqlSysRefUserMessage(SysRefUserMessage sysRefUserMessage){ + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(sysRefUserMessage.getMessageTitleRdd(),"messageTitleRdd",result); + HqlPack.getStringLikerPack(sysRefUserMessage.getMessageSenderNameRdd(),"messageSenderNameRdd",result); + HqlPack.getStringLikerPack(sysRefUserMessage.getReceiverTime(),"receiverTime",result); + + return result.toString(); + } } \ No newline at end of file From 7154172d3bf9d481452a4bbe8d982bee2426e032 Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Sat, 24 Nov 2018 11:07:38 +0800 Subject: [PATCH 2/6] test --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 51 ++-------------------- 1 file changed, 4 insertions(+), 47 deletions(-) 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 097f901..b76f5e5 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 @@ -599,53 +599,6 @@ public class WmsEnumUtil { } } - /** - * 外部单据：移库单详情单位 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum OUT_MOVEMENT_DETAILS_UNIT { - CREATE(1, "AA"), - RECEIPT(2, "BB"), - RECEIPT_FINISH(3, "CC"), - CLOSED(4, "DD"), - CANCELLED(5, "EE"); - - private int value; - private String description; - - OUT_MOVEMENT_DETAILS_UNIT(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; - } - - public static int descOf(String desc) { - int tmp = 1; - for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(desc)) { - tmp = values()[i].value; - } - } - return tmp; - } - } /** * 外部单据：移库单详情状态 @@ -1331,4 +1284,8 @@ public class WmsEnumUtil { } } + @Override + public String toString() { + return super.toString(); + } } From 6cab7b9d09bbf5bb494213ddb5b237624804e4d3 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Sat, 24 Nov 2018 17:42:43 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B6=88=E6=81=AF=20webs?= =?UTF-8?q?ocket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 3 +++ 1 file changed, 3 insertions(+) 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 24f6c84..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 @@ -423,8 +423,11 @@ public class CoreHqlPack { 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(); From ae7c00576a7256c9491a24d64aa9bbfe3a558cfd Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Sat, 24 Nov 2018 17:45:39 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9E=9A=E4=B8=BE=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 35 ++++++++++++++++++++++ .../pojo/wms/bean/WmsActionStepCallParam.java | 3 ++ .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 3 files changed, 39 insertions(+) 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..e1bd0b5 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 @@ -1331,4 +1331,39 @@ 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; + } + } + } 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..8077466 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 @@ -1112,6 +1112,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(); From c1e1a8733308089deebd11699b5ae8179ea356bb Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Sat, 24 Nov 2018 19:09:04 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=B8=80=E6=AC=A1=E6=80=A7=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 36 +++++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) 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 74388b1..6f0ad4c 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; @@ -1283,9 +1283,37 @@ public class WmsEnumUtil { 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; + } - @Override - public String toString() { - return super.toString(); + 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; + } } } From efa5da8667859ca8a3bed9e4ec9f81a4042129b5 Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Sat, 24 Nov 2018 20:37:21 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) 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 575b828..c5a60d7 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(); }