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/bean/MesWorkOrder.java

@@ -424,6 +424,10 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("模具编号集合")
     private String mouldCodeList;
 
+    @Transient
+    @ApiParam("不良数量")
+    private Integer ngQty;
+
 
 
 

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

@@ -30,10 +30,12 @@ public class QcOrderCheckDataDetailModel {
 
     private Integer checkResult;
 
+    private String serialNumber;
+
 
     public QcOrderCheckDataDetailModel(Integer checkType, String checkItem, String checkStandard, Integer checkCount,
                                        Integer isConcession, Integer isKeyCheckItem, Double max, Double min,
-                                       String checkValue, Integer checkResult) {
+                                       String checkValue, Integer checkResult, String serialNumber) {
         this.checkType = checkType;
         this.checkItem = checkItem;
         this.checkStandard = checkStandard;
@@ -44,5 +46,6 @@ public class QcOrderCheckDataDetailModel {
         this.min = min;
         this.checkValue = checkValue;
         this.checkResult = checkResult;
+        this.serialNumber = serialNumber;
     }
 }