Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java

@@ -35,6 +35,9 @@ public class BypassModel {
     @ApiParam("状态")
     private String status;
 
+    @ApiParam("检测结果")
+    private Integer result;
+
     @ApiParam("颜色")
     private String color;
 

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

@@ -1,8 +1,10 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -53,5 +55,6 @@ public class WmsBhChildDetectionItem extends BaseBean {
     @Column(name = "VALUE_TYPE")
     @ApiParam("值类型")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_VALUE_TYPE.class)
     private Integer valueType;
 }

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

@@ -1,8 +1,10 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -62,11 +64,13 @@ public class WmsPartItemCheck extends BaseBean {
     @Column(name = "VALUE_TYPE")
     @ApiParam("子检测箱值类型")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "BH_VALUE_TYPE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_VALUE_TYPE.class)
     private Integer valueType;
 
     @Column(name = "STANDARD")
     @ApiParam("标准值")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "BH_PART_CHECK_STD")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_PART_CHECK_STD.class)
     private Integer standard;
 
     @Column(name = "MAX")