Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java

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

@@ -1047,4 +1047,38 @@ public class ImppEnumUtil {
             return tmp;
         }
     }
+
+    //messageReceiverType
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MESSAGE_RECEIVER_TYPE {
+        INTERNAL(1, "内部人员接收"),
+        EXTERNAL(2, "外部人员接收"),
+        URGENT(3, "紧急联系人接收");
+        private int value;
+        private String description;
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        private MESSAGE_RECEIVER_TYPE(int value, String description) {
+            this.value = value;
+            this.description = 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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -11,6 +11,55 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  **/
 public class WmsEnumUtil {
     /**
+     * 拆分规则
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SPLIT_OR_MERGE_RULE {
+        WH(10, "WH", "仓库"), ZONE(20, "ZONE", "存储区"), PART(30, "PART", "物料");
+        private int value;
+        private String code;
+        private String description;
+
+        SPLIT_OR_MERGE_RULE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+    }
+
+    /**
      * 订单明细信息 是否免费
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -451,6 +500,40 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 库位状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum LOCATE_STATUS {
+        CREATE(10, "空库位"), FINISH(20, "非空"), FAIL(30, "已满");
+
+        private int value;
+        private String description;
+
+        LOCATE_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)
@@ -710,9 +793,14 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OUT_MOVEMENT_MASTER_LINK_ORDER_TYPE {
-        ASN(1, "ASN"),
+        ASN(10, "ASN"),
-        PO(10, "PO"),
+        PO(20, "PO"),
-        SO(20, "SO");
+        SO(30, "SO"),
+        MOVE(40, "MOVE"),
+        IN_STOCK(50, "IN_STOCK"),
+        SHIPPING(60, "SHIPPING"),
+        QC(70, "QC"),
+        CS(80, "CS");
 
         private int value;
         private String description;
@@ -776,6 +864,40 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 单据是否生成任务状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IS_GENERAL_TASK {
+        CREATE(10, "创建"), INIT(20, "初始化"), IS_GENERAL(30, "已生成"), NO_GENERAL(40, "不生成");
+
+        private int value;
+        private String description;
+
+        IS_GENERAL_TASK(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;
+        }
+    }
+
+    /**
      * 业务表：库存条码状态
      * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
      */
@@ -1174,9 +1296,9 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ALD_EXECUTE_STATUS {
-        NORMAL(1, "创建"),
+        NORMAL(10, "创建"),
-        PROCESSING(10, "处理中"),
+        PROCESSING(20, "处理中"),
-        COMPLETED(20, "已完成");
+        COMPLETED(30, "已完成");
         private int value;
         private String description;
 
@@ -1497,6 +1619,7 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 流程明细动作类型
      * 10=交互动作,20=后台动作,30=提交动作

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java

@@ -55,6 +55,10 @@ public class SysConfig extends BaseBean {
     @ApiParam(value ="参数值")
     private String configValue;
 
+    @Column(name="CONFIG_VALUE_OPTION")
+    @ApiParam(value ="参数值选项（参数类型为多选时使用），格式：{key:'',value:''}")
+    private String configValueOption;
+
     @Column(name="CONFIG_DESCRIPTION")
     @ApiParam(value ="参数描述")
     private String configDescription;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java

@@ -55,8 +55,12 @@ public class SysMessage extends BaseBean {
     @ApiParam(value ="发送者名称" )
     private String messageSenderNameRdd;
 
+    @Column(name="MESSAGE_RECEIVER_TYPE")
+    @ApiParam(value ="收件人类型(枚举：ImppEnumUtil.MESSAGE_TYPE)" , example ="-1")
+    private Integer messageReceiverType;
+
     @Column(name="MESSAGE_RECEIVERS_ID")
-    @ApiParam(value ="发送者id" )
+    @ApiParam(value ="收件者id" )
     private String messageReceiversId;
 
     @Column(name="MESSAGE_RECEIVERS_NAME_RDD")

modules/i3plus-pojo-wms/pom.xml

@@ -18,6 +18,10 @@
             <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-base</artifactId>
         </dependency>
+        <dependency>
+            <groupId>i3plus.platform</groupId>
+            <artifactId>i3plus-platform-common</artifactId>
+        </dependency>
     </dependencies>
 
 

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

@@ -7,10 +7,12 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.annotation.Transient;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.List;
 
 /**
  * @Description : ASN订单主表
@@ -71,4 +73,8 @@ public class WmsASNMaster extends BaseBean {
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
     public Integer isTask;
+
+    @Transient
+    @ApiParam(value = "单据明细集合")
+    public List<WmsASNMasterDetails> wmsASNMasterDetailsList;
 }

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

@@ -7,10 +7,12 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.annotation.Transient;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.List;
 
 /**
  * @Description : ASN订单明细信息
@@ -109,4 +111,5 @@ public class WmsASNMasterDetails extends BaseBean {
     @Column(name="REC_QTY")
     @ApiParam(value = "已收数量", example = "0")
     public Double recQty;
+
 }

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

@@ -7,10 +7,12 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.annotation.Transient;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.List;
 
 /**
  * @Description : 盘点单主表信息
@@ -55,4 +57,9 @@ public class WmsCSOrderMaster extends BaseBean {
     @Column(name = "IS_INVENTORY")
     @ApiParam(value = "是否允许清点", example = "1")
     public Integer isInventory;
+
+    @Transient
+    @ApiParam(value = "盘点明细集")
+    public List<WmsCSOrderDetails> wmsCSOrderDetailsList;
+
 }

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

@@ -13,7 +13,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
- * @Description :移库单详情实体(用于转储类业务)
+ * @Description :移库单明细实体(用于转储类业务)
  * @Reference :
  * @Author : dragon.xu
  * @CreateDate : 2018-11-13 16:06
@@ -25,7 +25,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "WMS_DOC_MOVEMENT_DETAILS")
-@Api("移库单详情表")
+@Api("移库单明细表")
 public class WmsDocMovementDetails extends BaseBean {
     @Column(name = "ORDER_NO")
     @ApiParam(value = "单号")
@@ -47,13 +47,29 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "单位")
     private String unit;
 
-    @Column(name = "SRC_WH")
+    @Column(name = "SRC_WH_NO")
-    @ApiParam(value = "发出库仓库")
+    @ApiParam("源仓库代码")
-    private String srcWh;
+    public String srcWhNo;
 
-    @Column(name = "DEST_WH")
+    @Column(name = "SRC_ZONE_NO")
-    @ApiParam(value = "接收库仓库")
+    @ApiParam("源存储区代码")
-    private String destWh;
+    public String srcZoneNo;
+
+    @Column(name = "SRC_LOCATE_NO")
+    @ApiParam("源库位代码")
+    public String srcLocateNo;
+
+    @Column(name = "DEST_WH_NO")
+    @ApiParam("目标仓库代码")
+    public String destWhNo;
+
+    @Column(name = "DEST_ZONE_NO")
+    @ApiParam("目标存储区代码")
+    public String destZoneNo;
+
+    @Column(name = "DEST_LOCATE_NO")
+    @ApiParam("目标库位代码")
+    public String destLocateNo;
 
     @Column(name = "QTY")
     @ApiParam(value = "需求数量", example = "1")

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

@@ -7,10 +7,12 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.annotation.Transient;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.util.List;
 
 /**
  * @Description :移库单实体(用于转储类业务)
@@ -107,4 +109,7 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "优先级", example = "1")
     public Integer priority;
 
+    @Transient
+    @ApiParam(value = "移库单明细集合")
+    private List<WmsDocMovementDetails> wmsDocMovementDetailsList;
 }

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

@@ -66,11 +66,11 @@ public class WmsMoveDetails extends BaseBean {
     public String unit;
 
     @Column(name="SRC_WH_NO")
-    @ApiParam("仓库代码")
+    @ApiParam("源仓库代码")
     public String srcWhNo;
 
     @Column(name="SRC_ZONE_NO")
-    @ApiParam("存储区代码")
+    @ApiParam("源存储区代码")
     public String srcZoneNo;
 
     @Column(name="SRC_LOCATE_NO")

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

@@ -72,9 +72,9 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("容器编号")
     public String packAgeNo;
 
-    @Column(name="QTY")
+    @Column(name="SRC_QTY")
-    @ApiParam(value = "已收数量", example = "0")
+    @ApiParam(value = "源数量", example = "0")
-    public Double qty;
+    public Double srcQty;
 
     @Column(name="SRC_LOCATE_NO")
     @ApiParam("源库位代码")
@@ -92,6 +92,14 @@ public class WmsMoveSn extends BaseBean {
     @Transient
     private Long finishedCounts;
 
+    @Column(name="DEST_QTY")
+    @ApiParam(value = "目标数量", example = "0")
+    public Double destQty;
+
+    @Column(name="QTY")
+    @ApiParam(value = "数量", example = "0")
+    public Double qty;
+
     public WmsMoveSn(){}
 
     public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){

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

@@ -9,11 +9,13 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.data.annotation.Transient;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.Transient;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description : 作业类型
@@ -100,4 +102,8 @@ public class WmsOpType extends BaseBean{
     @Column(name = "IS_MULITI")
     @ApiParam(value = "是否允许多人操作", example = "0")
     private Integer isMuliti;
+
+    @Transient
+    @ApiParam(value = "单据集")
+    private List<Map<String, List>> orderList;
 }

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

@@ -28,6 +28,10 @@ import javax.persistence.Table;
 @Api("作业任务表")
 public class WmsTaskInfo extends BaseBean {
 
+    @Column(name = "ORDER_NO")
+    @ApiParam("单号")
+    public String orderNo;
+
     @Column(name = "MOVE_NO")
     @ApiParam("移动单号")
     public String moveNo;

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

@@ -32,11 +32,23 @@ public class WmsTaskSrc extends BaseBean {
     @ApiParam("作业类型编号")
     public String opTypeCode;
 
-    @Column(name="ORDER_TYPE")
-    @ApiParam("业务类型")
-    public String orderType;
-
     @Column(name = "DATA_SRC")
     @ApiParam("数据来源")
     public String dataSrc;
+
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    public String busiType;
+
+    @Column(name = "PRIORITY")
+    @ApiParam("优先级")
+    public String priority;
+
+    @Column(name = "IS_SN")
+    @ApiParam("是否有条码")
+    public String isSn;
+
+    @Column(name = "TRANS_CODE")
+    @ApiParam("默认交易类型")
+    public String transCode;
 }

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

@@ -5,7 +5,7 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsOpType;
 import org.springframework.stereotype.Repository;
 
 /**
- * @Description : 作业类型
+ * @Description : 作业类型DAO层
  * @Reference :
  * @Author : amy
  * @CreateDate : 2018-11-07 14:46

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTaskDetails;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTaskInfo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 对象持久层公用方法控制(作业任务明细信息)
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-03-06 17:16
+ * @Modify:
+ **/
+@Repository
+public interface WmsTaskDetailsRepository extends BaseRepository<WmsTaskDetails, Long> {
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsOpType;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTaskSrc;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 作业任务数据来源DAO层
+ * @Reference :
+ * @Author : dragon.xu
+ * @CreateDate : 2019-03-06 14:41
+ * @Modify:
+ **/
+@Repository
+public interface WmsTaskSrcRepository extends BaseRepository<WmsTaskSrc, Long> {
+}

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

@@ -1,11 +1,17 @@
 package cn.estsh.i3plus.pojo.wms.sqlpack;
 
+import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.base.tool.SqlPack;
 import cn.estsh.i3plus.pojo.wms.bean.*;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * @Description : 仓库管理对象封装
@@ -74,7 +80,27 @@ public class WmsHqlPack {
 
         return result.toString();
     }
-
+    /**
+     * 查询任务合并的移库单明细 查询条件封装
+     *
+     * @param orderNos
+     * @return
+     */
+    public static String packHqlWmsDocMovementDetailsByOrderNos(List<String> orderNos) {
+        StringBuffer result = new StringBuffer();
+        StringBuffer orderNoStr = new StringBuffer();
+        for (int i = 0; i < orderNos.size(); i++) {
+            if (i == orderNos.size()) {
+                orderNoStr.append("'" + orderNos.get(i) + "'");
+            } else {
+                orderNoStr.append("'" + orderNos.get(i) + "',");
+            }
+        }
+        result.append(" and model.isDeleted=" + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() +
+                "and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() +
+                "and model.orderNo in (" + orderNos + ")" + " order by model.partNo,model.orderNo");
+        return result.toString();
+    }
     /**
      * 库存移动单查询封装
      *
@@ -378,8 +404,37 @@ public class WmsHqlPack {
 
         return result.toString();
     }
+    /**
+     * 查询满足处理周期的作业类型 查询条件封装
+     *
+     * @param wmsOpType
+     * @return
+     */
+    public static String packHqlWmsOpTypeTime(WmsOpType wmsOpType) {
+        StringBuffer result = new StringBuffer();
+
+        getStringBuilderPack(wmsOpType, result);
+        result.append(" and isnull(model.lastTransTime) or timestampdiff(Minute,nvl(model.lastTransTime,'2000'),now()) >= model.cycleMins");
+        return result.toString();
+    }
 
     /**
+     * 作业任务数据来源 查询条件封装
+     *
+     * @param wmsTaskSrc
+     * @return
+     */
+    public static String packHqlWmsTaskSrc(WmsTaskSrc wmsTaskSrc) {
+        StringBuffer result = new StringBuffer();
+
+        //作业类型代码
+        HqlPack.getStringLikerPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result);
+
+        getStringBuilderPack(wmsTaskSrc, result);
+
+        return result.toString();
+    }
+    /**
      * 存储区信息 查询条件封装
      *
      * @param wmsZones