【BATCH录入检测值-需要变更】

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

@@ -156,9 +156,12 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsZones",
     @ApiParam(value = "三维位置")
     private String position;
 
+    /**
+     * BH库位类型:10:HOLD库位；20：待检测库位；30:待出库库位
+     */
     @Column(name = "BH_LOCATE_TYPE")
     @ApiParam(value = "BH库位类型")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_LOCATE_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_LOCATE_TYPE.class, refForeignKey = "value", value = "description")
     private Integer bhLocateType;
 
     // 导入用

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

@@ -46,10 +46,9 @@ public class WmsPartCheckType extends BaseBean {
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String partName;
 
-    @Column(name = "CHECK_TYPE")
+    @Column(name = "CHECK_TYPE_CODE")
     @ApiParam("检测大类")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    public String checkTypeCode;
-    private String checkType;
 
     @Column(name = "SAMPLE_SIZE")
     @ApiParam("样本数")

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

@@ -410,7 +410,7 @@ public class WmsStockSn extends BaseBean {
 
     @Transient
     @ApiParam("大检测项类型")
-    public Integer checkType;
+    public String checkTypeCode;
 
     @Transient
     @ApiParam("样本数")

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

@@ -48,21 +48,25 @@ public class WmsTestResultDetails extends BaseBean {
     @ApiParam("物料名称")
     public String partName;
 
-    @Column(name = "CHECK_TYPE")
+    @Column(name = "CHECK_TYPE_CODE")
-    @ApiParam("大检测项类型")
+    @ApiParam("检测大类")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_CHECK_TYPE.class, refForeignKey = "value", value = "description")
+    public String checkTypeCode;
-    public Integer checkType;
 
-    @Column(name = "qr_code")
+    @Column(name = "QR_CODE")
     @ApiParam("二维码")
     public String qrCode;
 
-    @Column(name = "is_qualified")
+    @Column(name = "IS_QUALIFIED")
     @ApiParam("是否合格")
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
     public Integer isQualified;
 
-    @Column(name = "check_value")
+    @Column(name = "IS_FINISH")
+    @ApiParam("是否完成")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    public Integer isFinish;
+
+    @Column(name = "CHECK_VALUE")
     @ApiParam("检测值")
     public String checkValue;
 
@@ -73,9 +77,9 @@ public class WmsTestResultDetails extends BaseBean {
     public WmsTestResultDetails() {
     }
 
-    public WmsTestResultDetails(String partNo, Integer checkType, String bhCode, Long checkSize) {
+    public WmsTestResultDetails(String partNo, String checkTypeCode, String bhCode, Long checkSize) {
         this.partNo = partNo;
-        this.checkType = checkType;
+        this.checkTypeCode = checkTypeCode;
         this.bhCode = bhCode;
         this.checkSize = checkSize;
     }