Merge branch 'dev' into test

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java

@@ -12,5 +12,5 @@ import lombok.Data;
 @Data
 public class RuleGroupProgress {
     private String message;
-    private Long progress;
+    private Integer progress;
 }

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

@@ -953,4 +953,184 @@ public class PtlPcnEnumUtil {
         }
     }
 
+    /**
+     * PTL_主任务状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PTL_MAIN_TASK_STATUS {
+        CREATE(10, "CREATE", "新建"),
+        RECEIPT(20, "RECEIPT", "执行中"),
+        RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"),
+        CANCELLED(40, "CANCELLED", "已取消");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PTL_MAIN_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);
+        }
+    }
+
+    /**
+     * PTL_主任务明细物料种类
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MAIN_TASK_DETAIL_PART_CATEGORY {
+        DOOR_LOCK_PART_NO(10, "DOOR_LOCK_PART_NO", "门锁零件号");
+
+        private int value;
+        private String code;
+        private String description;
+
+        MAIN_TASK_DETAIL_PART_CATEGORY(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);
+        }
+    }
+
+    /**
+     * 打印类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRINT_TYPE {
+        PART_NO(10, "PART_NO");
+
+        private int value;
+        private String description;
+
+        PRINT_TYPE(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 ETC_PRINT_STATUS {
+        NOT_HIT(10, "未打"),
+        ALREADY_HIT(20, "已打");
+
+        private int value;
+        private String description;
+
+        ETC_PRINT_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-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchGroupModel.java

@@ -24,4 +24,7 @@ public class WmsSearchGroupModel {
 
     @ApiParam(value = "分页组件")
     private Pager pager;
+
+    @ApiParam(value = "实体类名")
+    private String objClassName;
 }

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

@@ -35,7 +35,7 @@ public class PtlBom extends BaseBean implements Serializable {
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partNo;
 
-    @Column(name = "PART_NAME", columnDefinition = "varchar(20) default '1'", nullable = false)
+    @Column(name = "PART_NAME", columnDefinition = "varchar(255) default '1'", nullable = false)
     @ApiParam("父物料描述")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT)
     private String partName;

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

@@ -0,0 +1,52 @@
+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;
+
+/**
+ * @author adair.song
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "PTL_MAIN_TASK_DETAIL")
+@EqualsAndHashCode(callSuper = true)
+@Api("主任务明细")
+public class PtlMainTaskDetail extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 7144785793974319897L;
+
+    @Column(name = "TASK_NO")
+    @ApiParam("主任务编号")
+    private String taskNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("产品物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("产品物料名称")
+    private String partName;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Integer qty;
+
+    @Column(name = "PART_CATEGORY")
+    @ApiParam("物料种类")
+    private Integer partCategory;
+
+}

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

@@ -0,0 +1,59 @@
+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;
+
+/**
+ * @Description : 打印机配置表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-09-26 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="PTL_PRINTER_CONFIGURE")
+@Api("打印机配置表")
+public class PtlPrinterConfigure extends BaseBean{
+
+    private static final long serialVersionUID = 1234639813072592779L;
+    @Column(name="PRINTER_NO")
+    @ApiParam("打印机编号")
+    private String printerNo;
+
+    @Column(name="PRINTER_NAME")
+    @ApiParam("打印机名称")
+    private String printerName;
+
+    @Column(name="IP")
+    @ApiParam("IP")
+    private String ip;
+
+    @Column(name="PORT")
+    @ApiParam("端口")
+    private Integer port;
+
+    @Column(name="OBJECT_DESCRIPTION")
+    @ApiParam(value ="描述")
+    private String objectDescription;
+
+    @Column(name="POSITION")
+    @ApiParam("位置")
+    private String position;
+
+    @Column(name="TYPE")
+    @ApiParam("类型")
+    private Integer type;
+}

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

@@ -0,0 +1,55 @@
+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;
+
+/**
+ * @Description : 待打印队列表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-09-27 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="PTL_PRINTING_QUEUE")
+@Api("待打印队列表")
+public class PtlPrintingQueue extends BaseBean{
+
+    private static final long serialVersionUID = 1111639813072592779L;
+    @Column(name="PRINT_IDENTIFICATION")
+    @ApiParam("打印标识")
+    private String printIdentification;
+
+    @Column(name="PRINT_TYPE")
+    @ApiParam("打印类型")
+    private Integer printType;
+
+    @Column(name="PRINT_NO")
+    @ApiParam("打印机编号")
+    private String printNo;
+
+    @Column(name="PRINT_MUMBER")
+    @ApiParam("打印机张数")
+    private Integer printNumber = 1;
+
+    @Column(name="TEMPLATE_NO")
+    @ApiParam("模板编号")
+    private String templateNo;
+
+    @Column(name="PRINT_STATUS")
+    @ApiParam("打印状态")
+    private Integer printStatus;
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMainTaskDetailRepository.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.PtlMainTaskDetail;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlPrinterConfigure;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+public interface PtlMainTaskDetailRepository extends BaseRepository<PtlMainTaskDetail, Long> {
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlMainTaskRepository.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.PtlActionModule;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlMainTask;
+
+/**
+ * @author jessica.chen
+ * @date 2020/2/27 14:41
+ * @desc
+ */
+
+public interface PtlMainTaskRepository extends BaseRepository<PtlMainTask, Long> {
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPrinterConfigureRepository.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.PtlPrinterConfigure;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlPrintingQueue;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+public interface PtlPrinterConfigureRepository extends BaseRepository<PtlPrinterConfigure, Long> {
+
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlPrintingQueueRepository.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.PtlActionModule;
+import cn.estsh.i3plus.pojo.ptl.bean.PtlPrintingQueue;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/2/12 17:41
+ * @desc
+ */
+
+public interface PtlPrintingQueueRepository extends BaseRepository<PtlPrintingQueue, Long> {
+
+}

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

@@ -75,4 +75,8 @@ public class WmsSnOperateRecord extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description")
     private Integer operateType;
 
+	@Column(name = "ref_sn")
+	@ApiParam(value = "关联二维码")
+	private String refSN;
+
 }

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

@@ -295,6 +295,14 @@ public class WmsStockSn extends BaseBean {
     private String parentReturnPart;
 
     @Transient
+    @ApiParam("保质期开始时间")
+    private String qualityDateTimeStart;
+
+    @Transient
+    @ApiParam("保质期结束时间")
+    private String qualityDateTimeEnd;
+
+    @Transient
     @ApiParam(value = "预计完成时间")
     private String planCompleteTime;
 

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

@@ -1301,6 +1301,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);
+        DdlPreparedPack.timeBuilder(wmsStockSn.getQualityDateTimeStart(),
+                wmsStockSn.getQualityDateTimeEnd(), "qualityDate", result, false);
         if (wmsStockSn.getIsValid() != null) {
             DdlPreparedPack.getNumEqualPack(wmsStockSn.getIsValid(), "isValid", result);
         }