冲突

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -599,6 +599,53 @@ 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;
+        }
+    }
 
     /**
      * 外部单据：移库单详情状态
@@ -1283,6 +1330,42 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 作业记录参数状态
+     */
+    @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;
+        }
+    }
+
     /**
      * 是否
      */

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;
 }

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)

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;

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();
+    }
 }

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;
+
 }

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();