Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

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

@@ -6625,4 +6625,32 @@ public class MesPcnEnumUtil {
         }
     }
 
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum THA_MONITOR_STATUS {
+        MONITORING(10, "MONITORING", "监听中"),
+        MONITOR_COMPLETE(20, "MONITOR_COMPLETE", "监听完成");
+
+        private int value;
+        private String code;
+        private String description;
+
+        THA_MONITOR_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;
+        }
+    }
+
 }

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

@@ -4,14 +4,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 
 /**
@@ -59,4 +59,11 @@ public class WmsPrintingQueue extends BaseBean{
     @Column(name="VENDOR_NO")
     @ApiParam("供应商编码")
     private String vendorNo;
+
+    public WmsPrintingQueue() {
+    }
+
+    public WmsPrintingQueue(Long id) {
+        this.id = id;
+    }
 }

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

@@ -104,6 +104,10 @@ public class WmsSerialSnTrans extends BaseBean {
     @ApiParam("操作类型")
     private List<Integer> transTypeLst;
 
+    public int getIsOkVal() {
+        return this.isOk == null ? 0 : this.isOk;
+    }
+
     public WmsSerialSnTrans(WmsSerialSn wmsSerialSn, Integer transType) {
         this.organizeCode = wmsSerialSn.getOrganizeCode();
         this.batchNo = wmsSerialSn.getBatchNo();

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

@@ -16,6 +16,8 @@ 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 :检测结果汇总表
@@ -97,9 +99,27 @@ public class WmsTestResultSummary extends BaseBean {
     private String sn;
 
     @Transient
+    @ApiParam("BH号集合")
+    private Map<String,Integer> bhTypes;
+
+    @Transient
     @ApiParam("库存条码二维码")
     private String serialSn;
 
+    @Transient
+    @ApiParam("返回给mes")
+    private List<WmsTestResultSummary> wmsForMes;
+
+    @Transient
+    @ApiParam("是否合格最大值")
+    private Integer maxQualified;
+
+
+    @Transient
+    @ApiParam("是否合格最小值")
+    private Integer minQualified;
+
+
     public WmsTestResultSummary(String organizeCode, String bhCode,
                                 String workCenterCode, String partNo,
                                 String partName, String flagNo, Integer isQualified,
@@ -135,6 +155,14 @@ public class WmsTestResultSummary extends BaseBean {
         this.bhType = bhType;
     }
 
+    public WmsTestResultSummary(Integer bhType, Integer maxQualified, Integer minQualified, String workCenterCode, String partNo) {
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.bhType = bhType;
+        this.maxQualified = maxQualified;
+        this.minQualified = minQualified;
+    }
+
     public WmsTestResultSummary() { }
 
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsBatchModel.java

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import cn.estsh.i3plus.pojo.wms.bean.WmsSerialSn;
+import cn.estsh.i3plus.pojo.wms.bean.WmsStockSn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : Batch数据模型
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2021-04-05 14:53
+ * @Modify:
+ **/
+@Data
+@Api("Batch数据模型")
+public class WmsBatchModel {
+
+    @ApiParam("二维条码集合")
+    private List<WmsSerialSn> wmsSerialSns;
+
+    @ApiParam("条码集合")
+    private List<WmsStockSn> wmsStockSnList;
+
+    @ApiParam("Batch号")
+    private String bhCode;
+
+    @ApiParam("上一个熔深Batch号")
+    private String firstSnBatch;
+
+    @ApiParam("新事务单号")
+    private String moveNo;
+
+    @ApiParam("是否正常件")
+    private boolean flag;
+
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("操作人")
+    private String userName;
+
+}