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

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

@@ -65,6 +65,14 @@ public class MesScrapRecord extends BaseBean implements Serializable {
     @ApiParam("工位")
     private String workCellCode;
 
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("工单编号")
+    private String workOrderNo;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Double qty;
+
     @Column(name = "MEMO")
     @ApiParam("备注")
     private String memo;

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

@@ -55,7 +55,4 @@ public class ButtonComponentReqModel {
     @ApiParam("用户信息")
     private String userInfo;
 
-    @ApiParam("json数据")
-    private String data;
-
 }

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

@@ -21,12 +21,15 @@ public class InjectionProductionControlModel {
     @ApiParam("当前合格数量")
     private String standardQtyCur;
 
-    @ApiParam("当前合格数量")
+    @ApiParam("总完成数量")
     private String completeQty;
 
     @ApiParam("总不合格数量")
     private String scrapQty;
 
+    @ApiParam("已打包数量")
+    private String packageQty;
+
     @ApiParam("包装编号")
     private String packageNo;
 
@@ -39,4 +42,7 @@ public class InjectionProductionControlModel {
     @ApiParam("箱条码状态")
     private String printStatusName;
 
+    @ApiParam("序号")
+    private Integer index;
+
 }