Merge branch 'test' into dev

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

@@ -705,7 +705,8 @@ public class MesEnumUtil {
         BOARD("BOARD", "看板类型"),
         EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
         EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
-        EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象");
+        EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
+        BH_PACKAGE_TYPE_VALUE("EQU_DEFECT_PHENOMENON", "B&H包装条码赋值样品类型值");
 
         private String value;
         private String description;

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

@@ -369,8 +369,12 @@ public class MesPcnEnumUtil {
         REPAIR("REPAIR", "处理措施"),
         SCRAP("SCRAP", "报废原因"),
         QC_CHECK_STAND("QC_CHECK_STAND", "质量检测标准"),
-        WC_CHECK("WC_CHECK", "开线检查项");
-
+        WC_CHECK("WC_CHECK", "开线检查项"),
+        BOARD("BOARD", "看板类型"),
+        EQU_DEFECT_CAUSE("EQU_DEFECT_CAUSE", "故障原因"),
+        EQU_DEFECT_METHOD("EQU_DEFECT_METHOD", "故障处理措施"),
+        EQU_DEFECT_PHENOMENON("EQU_DEFECT_PHENOMENON", "故障现象"),
+        BH_PACKAGE_TYPE_VALUE("EQU_DEFECT_PHENOMENON", "B&H包装条码赋值样品类型值");
         private String value;
         private String description;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java

@@ -99,4 +99,8 @@ public class IfPackageDetail extends BaseBean  implements Serializable {
     @Column(name = "CT_NO")
     @ApiParam("容器编号")
     private String ctNo;
+
+    @Column(name = "SN_TYPE")
+    @ApiParam("条码类型")
+    private String snType;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java

@@ -110,6 +110,10 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("容器编号")
     private String ctNo;
 
+    @Column(name = "SN_TYPE")
+    @ApiParam("条码类型")
+    private String snType;
+
     public MesPackage() {
     }
 

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

@@ -76,6 +76,10 @@ public class QmsStockSnExtBh extends BaseBean {
     public Integer pickStatus;
 
     @Transient
+    @ApiParam("挑选状态")
+    public Integer pickResult;
+
+    @Transient
     @ApiParam("物料号")
     public String partNo;
 
@@ -87,9 +91,7 @@ public class QmsStockSnExtBh extends BaseBean {
     @ApiParam("客户发往地")
     public String flagNo;
 
-    @Transient
-    @ApiParam("挑选状态")
-    public Integer pickResult;
+
 
     @Transient
     @ApiParam("二维码")
@@ -114,6 +116,10 @@ public class QmsStockSnExtBh extends BaseBean {
         this.bhType = bhType;
     }
 
+    public QmsStockSnExtBh(String batchNo, Integer bhType) {
+        this.batchNo = batchNo;
+        this.bhType = bhType;
+    }
     public QmsStockSnExtBh() {
     }
 

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

@@ -428,6 +428,35 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("BH类型")
     private Integer bhType;
 
+    @Transient
+    @ApiParam("处理状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_WORK_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer workStatus;
+
+    @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 Integer pickResult;
+
     public WmsStockSn() {
     }
 
@@ -647,6 +676,22 @@ public class WmsStockSn extends BaseBean {
 
     }
 
+    public WmsStockSn(String organizeCode, String batchNo, Integer bhType, String locateNo, String partNo,
+                      String partNameRdd, String workCenterCode, String createUser, String createDatetime,
+                      String modifyUser, String modifyDatetime) {
+        this.organizeCode = organizeCode;
+        this.batchNo = batchNo;
+        this.bhType = bhType;
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workCenterCode = workCenterCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+
+    }
 
 
 }