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

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

@@ -7167,4 +7167,86 @@ public class WmsEnumUtil {
             return null;
         }
     }
+
+
+    /**
+     * BH处理状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_WORK_STATUS {
+        WAIT_CHECK(10, "WAIT_CHECK", "待检验"),
+        SUBMIT_CHECK(20, "SUBMIT_CHECK", "已送检"),
+        IN_CHECK(30, "IN_CHECK", "检验中"),
+        WAIT_CONFIRM(40, "WAIT_CONFIRM", "待确认"),
+        WAIT_REPARI(50, "WAIT_OUT", "待返修"),
+        WAIT_PICK(60, "WAIT_OUT", "待挑选"),
+        IN_REPARI(70, "WAIT_OUT", "返修中"),
+        IN_PICK(80, "WAIT_OUT", "挑选中"),
+        WAIT_OUT(90, "WAIT_OUT", "待出库"),
+        OUT(100, "WAIT_OUT", "已出库");
+
+        private int value;
+        private String code;
+        private String description;
+
+        BH_WORK_STATUS(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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        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 BH_WORK_STATUS codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
 }

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : BH库存条码扩展表
@@ -27,7 +28,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="QMS_STOCK_SN_EXT_BH")
-@Api("BH检测大类表")
+@Api("BH库存条码扩展表")
 public class QmsStockSnExtBh extends BaseBean {
 
     @Column(name="sn")
@@ -43,4 +44,77 @@ public class QmsStockSnExtBh extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class)
     private Integer bhType;
 
+    @Transient
+    @ApiParam("处理状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_WORK_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer workStatus;
+
+    /*****汇总查询结果信息****/
+    @Transient
+    @ApiParam("产线代码")
+    public String workCenterCode;
+
+    @Transient
+    @ApiParam("是否合格")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    public Integer isQualified;
+
+
+    @Transient
+    @ApiParam("返修状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer reworkStatus;
+
+    @Transient
+    @ApiParam("返修结果")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    public Integer reworkResult;
+
+    @Transient
+    @ApiParam("挑选状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer pickStatus;
+
+    @Transient
+    @ApiParam("物料号")
+    public String partNo;
+
+    @Transient
+    @ApiParam("物料名称")
+    public String partName;
+
+    @Transient
+    @ApiParam("客户发往地")
+    public String flagNo;
+
+    @Transient
+    @ApiParam("挑选状态")
+    public Integer pickResult;
+
+    @Transient
+    @ApiParam("二维码")
+    public String serialSn;
+
+
+    public QmsStockSnExtBh(String organizeCode, String bhCode,
+                           String workCenterCode, String partNo,
+                           String partName, String flagNo, Integer isQualified,
+                           Integer reworkStatus, Integer reworkResult, Integer pickStatus, Integer pickResult, Integer bhType) {
+        this.organizeCode = organizeCode;
+        this.batchNo = bhCode;
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.flagNo = flagNo;
+        this.isQualified = isQualified;
+        this.reworkStatus = reworkStatus;
+        this.reworkResult = reworkResult;
+        this.pickStatus = pickStatus;
+        this.pickResult = pickResult;
+        this.bhType = bhType;
+    }
+
+    public QmsStockSnExtBh() {
+    }
+
 }

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

@@ -88,4 +88,21 @@ public class WmsSerialSn extends BaseBean {
     @ApiParam(value = "数量", example = "0")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double qty;
+
+    public WmsSerialSn() {
+
+    }
+
+    public WmsSerialSn(String organizeCode, String batchNo, String stockSn, String partNo, String partNameRdd, String serialSn, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+        this.organizeCode = organizeCode;
+        this.batchNo = batchNo;
+        this.stockSn = stockSn;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.serialSn = serialSn;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
 }

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

@@ -416,6 +416,18 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("样本数")
     private Integer sampleSize;
 
+    @Transient
+    @ApiParam("BATCH号")
+    private String batchNo;
+
+    @Transient
+    @ApiParam(value = "产品条码")
+    private String serialSn;
+
+    @Transient
+    @ApiParam("BH类型")
+    private Integer bhType;
+
     public WmsStockSn() {
     }
 
@@ -617,4 +629,24 @@ public class WmsStockSn extends BaseBean {
         this.refSrc = batchCode;
     }
 
+    public WmsStockSn(String organizeCode, String batchNo, String sn, String workCenterCode, String partNo,
+                      String partNameRdd, String shippingFlag, String leftCode, String createUser, String createDatetime,
+                      String modifyUser, String modifyDatetime) {
+        this.organizeCode = organizeCode;
+        this.batchNo = partNo;
+        this.sn = sn;
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.shippingFlag = shippingFlag;
+        this.leftCode = leftCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+
+    }
+
+
+
 }

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

@@ -84,6 +84,31 @@ public class WmsTestResultSummary extends BaseBean {
     @ApiParam("BH类型")
     private Integer bhType;
 
+    @Transient
+    @ApiParam("库存条码")
+    private String sn;
+
+    @Transient
+    @ApiParam("库存条码二维码")
+    private String serialSn;
+
+    public WmsTestResultSummary(String organizeCode, String bhCode,
+                                String workCenterCode, String partNo,
+                                String partName, String flagNo, Integer isQualified,
+                                Integer reworkStatus, Integer reworkResult, Integer pickStatus, Integer pickResult) {
+        this.organizeCode = organizeCode;
+        this.bhCode = bhCode;
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.flagNo = flagNo;
+        this.isQualified = isQualified;
+        this.reworkStatus = reworkStatus;
+        this.reworkResult = reworkResult;
+        this.pickStatus = pickStatus;
+        this.pickResult = pickResult;
+    }
+
     public WmsTestResultSummary(String organizeCode, String bhCode,
                                 String workCenterCode, String partNo,
                                 String partName, String flagNo, Integer isQualified,
@@ -100,7 +125,6 @@ public class WmsTestResultSummary extends BaseBean {
         this.pickStatus = pickStatus;
         this.pickResult = pickResult;
         this.bhType = bhType;
-
     }
 
     public WmsTestResultSummary() {