【任务：1193字段类型修改】

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

@@ -21,7 +21,8 @@ public class MesEnumUtil {
 
         DEFECT("DEFECT", "缺陷"),
         DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
-        REPAIR("REPAIR", "处理措施");
+        REPAIR("REPAIR", "处理措施"),
+        SCRAP("SCRAP", "报废原因");
 
         private String value;
         private String description;

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

@@ -50,7 +50,7 @@ public class IfPackageDetail extends BaseBean {
 
     @Column(name = "QTY")
     @ApiParam("数量")
-    private String qty;
+    private Integer qty;
 
     @Column(name = "PACKAGE_NO2")
     @ApiParam("包装编号2")

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.math.BigDecimal;
 
 /**
  * @Description:
@@ -42,7 +43,7 @@ public class IfProductOffLine extends BaseBean {
 
     @Column(name = "QTY")
     @ApiParam("数量")
-    private String qty;
+    private BigDecimal qty;
 
     @Column(name = "UNIT")
     @ApiParam("单位")

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

@@ -50,7 +50,7 @@ public class IfPackageDetail extends BaseBean {
 
     @Column(name = "QTY")
     @ApiParam("数量")
-    private String qty;
+    private Integer qty;
 
     @Column(name = "PACKAGE_NO2")
     @ApiParam("包装编号2")

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.math.BigDecimal;
 
 /**
  * @Description:
@@ -42,7 +43,7 @@ public class IfProductOffLine extends BaseBean {
 
     @Column(name = "QTY")
     @ApiParam("数量")
-    private String qty;
+    private BigDecimal qty;
 
     @Column(name = "UNIT")
     @ApiParam("单位")

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

@@ -52,4 +52,8 @@ public class MesPartObject extends BaseBean {
     @Transient
     @ApiParam("字段总数")
     private Integer fieldNum;
+
+    @Transient
+    @ApiParam("数据组号")
+    private String groupNo;
 }

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

@@ -45,9 +45,17 @@ public class MesProductData extends BaseBean {
     private String workCellName;
 
     @Column(name = "SERIAL_NUMBER")
-    @ApiParam("产品条码")
+    @ApiParam("过程条码")
     private String serialNumber;
 
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("工单号")
+    private String orderNo;
+
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;