Merge branch 'test' of jhforever.wang/wangjie-i3plus-pojo into test

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

@@ -18,7 +18,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PART_CHECK_DATA_TYPE {
         ALL_DATA(1, "所有数据"),
-        LAST_DATA(2, "最后一条数据");
+        LAST_DATA(2, "最后一条数据"),
+        ALL_DATA_AND_LAST_DATA(3, "所有数据且最后一条数据必须合格");
 
         private int value;
         private String description;

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

@@ -31,6 +31,9 @@ public class DataReviewModel {
     @ApiParam("对象代码")
     private String objectCode;
 
+    @ApiParam("末检是否合格")
+    private String lastDataResult;
+
     @ApiParam("是否合格标识")
     private Integer reviewFlag;
 
@@ -38,7 +41,7 @@ public class DataReviewModel {
     private String reviewResult;
 
     @ApiParam("显示标识")
-    private String showFlag;
+    private Integer showFlag;
 
     @ApiParam("颜色")
     private String color;

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

@@ -24,4 +24,7 @@ public class ProductDataCacheModel {
     @ApiParam("创建时间")
     private String createDatetime;
 
+    @ApiParam("是否必须是合格")
+    private Boolean isNecessary = false;
+
 }