Merge branch 'dev' into test

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-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/SnPrintDataModel.java

@@ -19,7 +19,7 @@ import java.util.List;
 public class SnPrintDataModel {
 
     @ApiParam("打印数据")
-    private List<SnPrintValueModel> valueList;
+    private List<StepPrintSnModel> valueList;
 
     @ApiParam("打印模板及参数")
     private MesLabelTemplate labelTemplate;

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

@@ -13,7 +13,7 @@ import lombok.Data;
  **/
 @Data
 @Api("打印信息汇总")
-public class SnPrintModel extends SnPrintValueModel {
+public class SnPrintModel extends StepPrintSnModel {
 
     @ApiParam("过程条码")
     private SnPrintDataModel serialPrintDataModel;

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

@@ -1,72 +0,0 @@
-package cn.estsh.i3plus.pojo.mes.pcn.model;
-
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-
-/**
- * @Description: 打印信息
- * @Reference:
- * @Author: wangjie
- * @CreateDate:2019-08-27-13:24
- * @Modify:
- **/
-@Data
-@Api("打印信息")
-public class SnPrintValueModel extends MesProduceSn {
-    @ApiParam("打印描述")
-    private String printDesc;
-
-    @ApiParam("条码")
-    private String barCode;
-
-    @ApiParam("物料号")
-    private String partNo;
-
-    @ApiParam("批次号")
-    private String batchNo;
-
-    @ApiParam("箱数量")
-    private String boxQty;
-
-    @ApiParam("订单号")
-    private String orderNo;
-
-    @ApiParam("生产日期")
-    private String productionTime;
-
-    @ApiParam("包装编码")
-    private String packageNo;
-
-    @ApiParam("包装规格")
-    private String packageSpec;
-
-    @ApiParam("供应商")
-    private String supplier;
-
-    @ApiParam("客户名称")
-    private String customerName;
-
-    @ApiParam("客户零件号")
-    private String customerPartNo;
-
-    @ApiParam("客户物料名称")
-    private String customerPartName;
-
-    @ApiParam("物料名称")
-    private String partNameRdd;
-
-    @ApiParam("单位")
-    private String unit;
-
-    @ApiParam("特殊批号")
-    private String fixLotNo;
-
-    @ApiParam("生产工单号")
-    private String workOrderNo;
-
-    @ApiParam("生产线代码")
-    private String workCenterCode;
-
-}

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

@@ -72,4 +72,7 @@ public class StepPrintSnModel extends MesProduceSn {
     @ApiParam("生产线代码")
     private String workCenterCode;
 
+    @ApiParam("包装层级 1-第一层，2-第二层，3-第三层，4-第四层")
+    private Integer packLevel;
+
 }

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;