Merge remote-tracking branch 'i3plus-pojo/dev' into dev

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

@@ -1389,4 +1389,352 @@ public class PtlPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * ptl-pcn定时任务状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PTL_PCN_TASK_STATUS {
+
+        OPEN(1, "开启"),
+        CLOSE(2, "关闭");
+
+        private int value;
+        private String description;
+
+        PTL_PCN_TASK_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * mes-pcn定时任务同步结果状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PTL_PCN_TASK_SYNC_STATUS {
+
+        SUCCESS(1, "ptl主服务定时任务工作清单同步成功"),
+        ERROR(2, "ptl主服务定时任务工作清单同步失败");
+
+        private int value;
+        private String description;
+
+        PTL_PCN_TASK_SYNC_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 单据主表类型(ASN,PO,MOVE,QC)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MASTER_ORDER_TYPE {
+        CREATE(10, "NORMAL", "正常");
+
+        private int value;
+        private String code;
+        private String description;
+
+        MASTER_ORDER_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+    /**
+     * 区域任务状态(ASN,PO,MOVE,QC)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MASTER_ORDER_STATUS {
+        CREATE(10, "CREATE", "创建"),
+        RECEIPT(20, "IN_PROGRESS", "处理中"),
+        RECEIPT_FINISH(30, "COMPLETED", "已完成"),
+        CANCELLED(40, "CANCELLED", "已取消");
+
+        private int value;
+        private String code;
+        private String description;
+
+        MASTER_ORDER_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+    /**
+     * 区域任务类型(ASN,PO,MOVE,QC)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum AREA_SECTION_TASK_TYPE {
+        CREATE(10, "CREATE", "JIT任务"),
+        RECEIPT(20, "IN_PROGRESS", "单据任务"),
+        RECEIPT_FINISH(30, "COMPLETED", "单点任务");
+
+        private int value;
+        private String code;
+        private String description;
+
+        AREA_SECTION_TASK_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+    /**
+     * 区域任务状态(ASN,PO,MOVE,QC)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum AREA_TASK_STATUS {
+        CREATE(10, "CREATE", "创建"),
+        RECEIPT(20, "IN_PROGRESS", "处理中"),
+        RECEIPT_FINISH(30, "COMPLETED", "已完成");
+
+        private int value;
+        private String code;
+        private String description;
+
+        AREA_TASK_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
+     * 区域任务类型(ASN,PO,MOVE,QC)
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum AREA_TASK_TYPE {
+        CREATE(10, "JIT_TASK", "JIT任务"),
+        RECEIPT(20, "DOCUMENT_TASK", "单据任务"),
+        RECEIPT_FINISH(30, "SINGLE_POINT_TASK", "单点任务");
+
+        private int value;
+        private String code;
+        private String description;
+
+        AREA_TASK_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlArea.java

@@ -14,7 +14,10 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author Wynne.Lu
@@ -42,4 +45,16 @@ public class PtlArea extends BaseBean implements Serializable {
     @ApiParam("区域名称")
     private String areaName;
 
+    @Transient
+    @ApiParam("区段集合")
+    private List<PtlSection> ptlSectionList=new ArrayList<>();
+
+    @Transient
+    @ApiParam("区域名称")
+    private String name;
+
+
+    public String getName() {
+        return areaName;
+    }
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTask.java

@@ -84,4 +84,12 @@ public class PtlAreaSectionTask extends BaseBean implements Serializable {
     @Column(name = "STATUS")
     @ApiParam("区段任务状态")
     private Integer status;
+
+    @Column(name = "SEQ")
+    @ApiParam("区段任务顺序号")
+    private Integer seq;
+
+    @Column(name = "qty")
+    @ApiParam("数量")
+    private Integer qty;
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java

@@ -28,7 +28,7 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @Api("区段亮灯任务明细")
 public class PtlAreaSectionTaskDetail extends BaseBean implements Serializable {
-    private static final long serialVersionUID = -7563481752643393714L;
+    private static final long serialVersionUID = -7563431552643393714L;
 
     @Column(name = "SECTION_TASK_NO")
     @ApiParam("区段任务编号")

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaTask.java

@@ -88,4 +88,8 @@ public class PtlAreaTask extends BaseBean implements Serializable {
     @Column(name = "STATUS")
     @ApiParam("任务状态")
     private Integer status;
+
+    @Column(name = "qty")
+    @ApiParam("数量")
+    private Integer qty;
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcn.java

@@ -25,9 +25,9 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "PTL_PCN_NODE")
+@Table(name = "PTL_PCN")
 @Api("PCN节点")
-public class PtlNode extends BaseBean implements Serializable {
+public class PtlPcn extends BaseBean implements Serializable {
     private static final long serialVersionUID = -9140094723555406392L;
     @Column(name = "PCN_CODE")
     @ApiParam("PCN代码")

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlPcnConnectLog.java

@@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.ptl.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-22-17:20
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "PTL_PCN_CONNECT_LOG")
+@Api("PCN节点连接日志")
+public class PtlPcnConnectLog extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 2756240593256441951L;
+
+    @Column(name = "PCN_CODE")
+    @ApiParam("PCN代码")
+    private String pcnCode;
+
+    @Column(name = "PCN_NAME")
+    @ApiParam("PCN名称")
+    private String pcnName;
+
+    @Column(name = "PCN_VERSION")
+    @ApiParam("PCN版本")
+    private String pcnVersion;
+
+    @Column(name = "CONNECT_IP")
+    @ApiParam("连接IP")
+    private String connectIp;
+
+    @Column(name = "IS_CONNECT")
+    @ApiParam("是否连接")
+    private Integer isConnect;
+
+    @Column(name = "REMARK")
+    @ApiParam("备注")
+    private String Remark;
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlSection.java

@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -52,4 +53,11 @@ public class PtlSection extends BaseBean implements Serializable {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String areaNo;
 
+    @Transient
+    @ApiParam("区域名称")
+    private String name;
+
+    public String getName() {
+        return sectionName;
+    }
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlNodeRepository.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.ptl.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.ptl.bean.PtlNode;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlPcn;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface PtlNodeRepository extends BaseRepository<PtlNode, Long> {
+public interface PtlNodeRepository extends BaseRepository<PtlPcn, Long> {
 }

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnConnectLogRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnConnectLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-24-17:13
+ * @Modify:
+ **/
+@Repository
+public interface PtlPcnConnectLogRepository extends BaseRepository<PtlPcnConnectLog, Long> {
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlPcn;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-24-17:13
+ * @Modify:
+ **/
+@Repository
+public interface PtlPcnRepository extends BaseRepository<PtlPcn, Long> {
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPcnTaskLogRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.ptl.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlPcnTaskLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-08-27
+ * @Modify:
+ **/
+@Repository
+public interface PtlPcnTaskLogRepository extends BaseRepository<PtlPcnTaskLog, Long> {
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/sqlpack/PtlHqlPack.java

@@ -149,7 +149,7 @@ public class PtlHqlPack {
      * @param organizeCode
      * @return
      */
-    public static DdlPackBean getPtlPcnByCondition(PtlNode ptlPcn, String organizeCode) {
+    public static DdlPackBean getPtlPcnByCondition(PtlPcn ptlPcn, String organizeCode) {
         DdlPackBean packBean = getAllBaseData(organizeCode);
         if (!StringUtils.isEmpty(ptlPcn.getConnectIp())) {
             DdlPreparedPack.getStringLikerPack(ptlPcn.getConnectIp(), "connectIp", packBean);
@@ -218,4 +218,91 @@ public class PtlHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 区域任务主表
+     *
+     * @param ptlAreaTask 区域任务主表
+     * @return
+     */
+    public static DdlPackBean packPtlAreaTask(PtlAreaTask ptlAreaTask) {
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskNo(), "taskNo", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaTask.getPartNo(), "partNo", result);
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeStart())
+                && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaTask.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(ptlAreaTask.getCreateDateTimeStart(), ptlAreaTask.getCreateDateTimeEnd()
+                    , "createDatetime", result, true);
+        }
+        DdlPreparedPack.getNumEqualPack(ptlAreaTask.getStatus(), "status", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaTask.getTaskType(), "taskType", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaTask.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getNumEqualPack(ptlAreaTask.getIsValid(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result);
+        return result;
+    }
+
+    /**
+     * 主任务表
+     *
+     * @param ptlMainTask 主任务表
+     * @return
+     */
+    public static DdlPackBean packPtlMainTask(PtlMainTask ptlMainTask) {
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(ptlMainTask.getTaskNo(), "taskNo", result);
+        DdlPreparedPack.getStringEqualPack(ptlMainTask.getPartNo(), "partNo", result);
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeStart())
+                && org.apache.commons.lang3.StringUtils.isNotBlank(ptlMainTask.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(ptlMainTask.getCreateDateTimeStart(), ptlMainTask.getCreateDateTimeEnd()
+                    , "createDatetime", result, true);
+        }
+        DdlPreparedPack.getNumEqualPack(ptlMainTask.getStatus(), "status", result);
+        DdlPreparedPack.getStringEqualPack(ptlMainTask.getTaskType(), "taskType", result);
+        DdlPreparedPack.getStringEqualPack(ptlMainTask.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getNumEqualPack(ptlMainTask.getIsValid(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result);
+        return result;
+    }
+    /**
+     * 区段
+     *
+     * @param ptlAreaSectionTask 区段任务
+     * @return
+     */
+    public static DdlPackBean packPtlAreaSectionTask(PtlAreaSectionTask ptlAreaSectionTask) {
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaTaskNo(), "areaTaskNo", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getPartNo(), "partNo", result);
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeStart())
+                && org.apache.commons.lang3.StringUtils.isNotBlank(ptlAreaSectionTask.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(ptlAreaSectionTask.getCreateDateTimeStart(), ptlAreaSectionTask.getCreateDateTimeEnd()
+                    , "createDatetime", result, true);
+        }
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getAreaNo(), "areaNo", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getSectionNo(), "sectionNo", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTask.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getNumEqualPack(ptlAreaSectionTask.getIsValid(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result);
+        return result;
+    }
+
+    /**
+     * 区段任务明细
+     *
+     * @param ptlAreaSectionTaskDetail 区段任务明细
+     * @return
+     */
+    public static DdlPackBean packPtlAreaSectionTaskDetail(PtlAreaSectionTaskDetail ptlAreaSectionTaskDetail) {
+        DdlPackBean result = new DdlPackBean();
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTaskDetail.getSectionTaskNo(), "sectionTaskNo", result);
+        DdlPreparedPack.getStringEqualPack(ptlAreaSectionTaskDetail.getOrganizeCode(), "organizeCode", result);
+        DdlPreparedPack.getNumEqualPack(ptlAreaSectionTaskDetail.getIsValid(), "isValid", result);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", result);
+        return result;
+    }
 }