Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

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;
@@ -1194,7 +1194,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MOVE_ORDER_STATUS {
-        CREATE(0, "创建"),BE_HANDLE(5, "待处理"),FINISH(10, "已处理");
+        CREATE(1, "创建"),BE_HANDLE(10, "待处理"),FINISH(20, "已处理");
 
         private int value;
         private String description;
@@ -1331,4 +1331,72 @@ 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;
+        }
+    }
 }

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")
+    @Column(name = "SERIAL_NO")
-    @ApiParam(value = "上次新增流水号",example = "-1")
+    @ApiParam(value = "当前流水号",example = "-1")
-    private Integer lastMakeSerialNo;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long serialNo;
 
-    @Column(name = "LAST_MAKE_ORDER_NO")
+    @Column(name = "ORDER_NO")
-    @ApiParam(value = "上次新增单号")
+    @ApiParam(value = "当前单号")
-    private String lastMakeOrderNo;
+    private String orderNo;
 
-    @Column(name = "LAST_MAKE_DATE")
+    @Column(name = "ORDER_NO_RULE_STATUS")
-    @ApiParam(value = "上次新增时间")
+    @ApiParam(value = "单号规则状态")
-    private String lastMakeDatetime;
+    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.getNumEqualPack(message.getMessageType(),"messageType",result);
-//        HqlPack.getNumLikerPack(sysMessage.getMessageTypeId(),"messageTypeId",result);
+        HqlPack.getStringLikerPack(message.getMessageSenderNameRdd(),"messageSenderNameRdd",result);
-//        HqlPack.getNumEqualPack(sysMessage.getMessageRecipientId(),"messageRecipientId",result);
+        HqlPack.getStringLikerPack(message.getMessageReceiversNameRdd(),"messageReceiversNameRdd",result);
-//        HqlPack.getNumEqualPack(sysMessage.getMessageSendId(),"messageSendId",result);
+        HqlPack.timeBuilder(message.getMessageSendTime(),"messageSendTime", result, false,false);
-        HqlPack.timeBuilder(message.getCreateDatetime(),"createDatetime", 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/WmsActionLog.java

@@ -0,0 +1,121 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 作业记录表
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-23 11:10
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_ACTION_LOG")
+@Api(value="作业记录表",description = "作业记录表")
+public class WmsActionLog extends BaseBean {
+
+    @Column(name="TASK_ID")
+    @ApiParam(value = "作业任务编号", example = "1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    public Long taskId;
+
+    //get单独处理
+    public Long getTaskId() {
+        if(taskId != null) {
+            return taskId.longValue();
+        }else{
+            return taskId;
+        }
+    }
+
+    @Column(name="TRANS_TYPE_CODE")
+    @ApiParam(value = "交易类型编号")
+    public String transTypeCode;
+
+    @ApiParam(value = "交易类型名称")
+    public transient String transTypeName;
+
+    @Column(name="AG_ID")
+    @ApiParam(value = "作业流程编号", example = "1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    public Long agId;
+
+    //get单独处理
+    public Long getAgId() {
+        if(agId != null) {
+            return agId.longValue();
+        }else{
+            return agId;
+        }
+    }
+
+    @Column(name="AG_NAME_C")
+    @ApiParam(value = "作业流程名称")
+    public String agNameC;
+
+    @Column(name="ACTION_USER_NAME")
+    @ApiParam(value = "作业人员")
+    public String actionUserName;
+
+    @Column(name="FIX_ID")
+    @ApiParam(value = "设备编号")
+    public String fixId;
+
+    @Column(name="ORDER_NO")
+    @ApiParam(value = "单据编号")
+    public String orderNo;
+
+    @Column(name="START_TIME")
+    @ApiParam(value = "开始作业时间")
+    public String startTime;
+
+    @Column(name="END_TIME")
+    @ApiParam(value = "结束作业时间")
+    public String endTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="开始作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00")
+    public transient String startTimeStart;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="开始作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59")
+    public transient String startTimeEnd;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="结束作业时间查询用，查询起始日期",example = "2018-01-01 01:00:00")
+    public transient String endTimeStart;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="结束作业时间查询用，查询结束日期",example = "2018-12-31 23:59:59")
+    public transient  String endTimeEnd;
+
+    // 状态:1=创建,10=处理中,20=已完成
+    @Column(name="ACTION_STATUS")
+    @ApiParam(value = "作业状态", example = "1")
+    public Integer actionStatus;
+
+    @Column(name="TOTAL_STEP")
+    @ApiParam(value = "总步数", example = "1")
+    public Integer totalStep;
+
+    @Column(name="CURRENT_STEP")
+    @ApiParam(value = "当前步骤", example = "1")
+    public Integer currentStep;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java

@@ -0,0 +1,99 @@
+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;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :作业记录明细表
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-23 13:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_ACTION_LOG_DETAILS")
+@Api(value="作业记录明细表",description = "作业记录表")
+public class WmsActionLogDetails extends BaseBean {
+
+    @Column(name="AL_ID")
+    @ApiParam(value = "作业流程ID", example = "1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    public Long alId;
+
+    //get单独处理
+    public Long getAlId() {
+        if(alId != null) {
+            return alId.longValue();
+        }else{
+            return alId;
+        }
+    }
+
+    @Column(name="SEQ")
+    @ApiParam(value = "序号", example = "1")
+    public Integer seq;
+
+    @Column(name="OK_SEQ")
+    @ApiParam(value = "成功跳转步骤", example = "1")
+    public Integer okSeq;
+
+    @Column(name="NG_SEQ")
+    @ApiParam(value = "失败跳转步骤", example = "1")
+    public Integer ngSeq;
+
+    // 10=只输入一次,20=输入多次,30=输入多次不允许重复,40=本流程结束
+    @Column(name="VALUE_TYPE")
+    @ApiParam(value = "动作类型", example = "1")
+    public Integer valueType;
+
+    // 1=是,2=否
+    @Column(name="TO_UPPER")
+    @ApiParam(value = "是否转为大写", example = "1")
+    public Integer toUpper;
+
+    @Column(name="LEN_CHECK")
+    @ApiParam(value = "长度检查", example = "1")
+    public Integer lenCheck;
+
+    @Column(name="AS_ID")
+    @ApiParam(value = "作业步骤", example = "1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    public Long asId;
+
+    //get单独处理
+    public Long getAsId() {
+        if(asId != null) {
+            return asId.longValue();
+        }else{
+            return asId;
+        }
+    }
+
+    @Column(name="ALD_STATUS")
+    @ApiParam(value = "执行状态", example = "1")
+    public Integer aldStatus;
+
+    @Column(name="START_TIME")
+    @ApiParam(value = "开始执行时间")
+    public String startTime;
+
+    @Column(name="END_TIME")
+    @ApiParam(value = "结束执行时间")
+    public String endTime;
+
+}

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/repository/WmsActionLogDetailsRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 作业记录明细
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-23 14:03
+ * @Modify:
+ **/
+@Repository
+public interface WmsActionLogDetailsRepository extends BaseRepository<WmsActionLogDetails, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsActionLogRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsActionLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 作业记录表
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-23 14:02
+ * @Modify:
+ **/
+@Repository
+public interface WmsActionLogRepository extends BaseRepository<WmsActionLog, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -823,7 +823,7 @@ public class WmsHqlPack {
 
         HqlPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
         HqlPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(),"orderStatus",result);
-
+        HqlPack.getNumEqualPack(wmsMoveMaster.getOrderType(),"orderType",result);
         getStringBuilderPack(wmsMoveMaster, result);
 
         return result.toString();
@@ -1113,8 +1113,49 @@ 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();
     }
+
+    /**
+     * 作业记录 查询条件封装
+     * @param wmsActionLog
+     * @return
+     */
+    public static String packHqlWmsActionLog(WmsActionLog wmsActionLog) {
+        StringBuffer result = new StringBuffer();
+
+        HqlPack.timeBuilder(wmsActionLog.getStartTimeStart(),wmsActionLog.getStartTimeEnd(),
+                "startTime", result, true);
+        HqlPack.timeBuilder(wmsActionLog.getEndTimeStart(),wmsActionLog.getEndTimeEnd(),
+                "endTime", result, true);
+        // 作业流程编号
+        HqlPack.getNumEqualPack(wmsActionLog.getAgId(),"agId",result);
+        // 作业流程名称
+        HqlPack.getStringLikerPack(wmsActionLog.getAgNameC(),"agNameC",result);
+        // 单据编号
+        HqlPack.getStringLikerPack(wmsActionLog.getOrderNo(),"orderNo",result);
+        getStringBuilderPack(wmsActionLog, result);
+
+        return result.toString();
+    }
+
+    /**
+     * 作业记录明细 查询条件封装
+     * @param wmsActionLogDetails
+     * @return
+     */
+    public static String packHqlWmsActionLogDetails(WmsActionLogDetails wmsActionLogDetails){
+        StringBuffer result = new StringBuffer();
+
+        //作业流程id（对应作业记录明细里自增的id）
+        HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(),"alId",result);
+        getStringBuilderPack(wmsActionLogDetails, result);
+
+        return  result.toString();
+    }
+
+
 }