Merge branch 'test' of frank.yu/i3plus-pojo into test

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

@@ -21,6 +21,9 @@ public class PackageTravelModel implements Serializable {
     private static final long serialVersionUID = -7031472442162953544L;
 
     @ApiParam("客户零件号")
+    private String packageNo;
+
+    @ApiParam("客户零件号")
     private String customerPartNo;
 
     @ApiParam("零件二维码")
@@ -62,7 +65,8 @@ public class PackageTravelModel implements Serializable {
     @ApiParam("执行时间")
     private String createUser;
 
-    public PackageTravelModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterCode, String processName, String ctCode, String ctNo, String modelNo, String fnLocationNo, String ctLocationNo, String createDatetime, String createUser) {
+    public PackageTravelModel(String packageNo,String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterCode, String processName, String ctCode, String ctNo, String modelNo, String fnLocationNo, String ctLocationNo, String createDatetime, String createUser) {
+        this.packageNo = packageNo;
         this.customerPartNo = customerPartNo;
         this.serialNumber = serialNumber;
         this.partNo = partNo;

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

@@ -51,8 +51,11 @@ public class ProductDetailResult {
     @ApiParam(value = "修改日期")
     public String modifyDatetime;
 
+    @ApiParam(value = "生产线名称")
+    public String workCenterName;
 
-    public ProductDetailResult(String serialNumber, String partNo,String customerPartNo, String partNameRdd, String workCenterCode, String processCode, String processName, String qcStatus, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
+
+    public ProductDetailResult(String serialNumber, String partNo,String customerPartNo, String partNameRdd, String workCenterCode, String processCode, String processName, String qcStatus, String createUser, String createDatetime, String modifyUser, String modifyDatetime,String workCenterName) {
         this.serialNumber = serialNumber;
         this.partNo = partNo;
         this.customerPartNo = customerPartNo;
@@ -65,5 +68,6 @@ public class ProductDetailResult {
         this.createDatetime = createDatetime;
         this.modifyUser = modifyUser;
         this.modifyDatetime = modifyDatetime;
+        this.workCenterName = workCenterName;
     }
 }

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

@@ -43,8 +43,10 @@ public class ProductResult {
     private BigDecimal unqualifiedRate;
     @ApiParam("报废率")
     private BigDecimal scrapRate;
+    @ApiParam("生产线名称")
+    private String workCenterName;
 
-    public ProductResult(String workCellCode,String partNo, String customerPartNo,String partNameRdd, String workCenterCode, String processCode, String processName, long qualified, long unqualified, long scrap) {
+    public ProductResult(String workCellCode,String partNo, String customerPartNo,String partNameRdd, String workCenterCode, String processCode, String processName, long qualified, long unqualified, long scrap,String workCenterName) {
         this.workCellCode = workCellCode;
         this.partNo = partNo;
         this.customerPartNo = customerPartNo;
@@ -55,5 +57,6 @@ public class ProductResult {
         this.qualified = qualified;
         this.unqualified = unqualified;
         this.scrap = scrap;
+        this.workCenterName = workCenterName;
     }
 }

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

@@ -31,7 +31,7 @@ public class ProductSnConditionModel implements Serializable {
     private String prodCfgTypeCode;
 
     @ApiParam("产线")
-    private String workCenterCode;
+    private String workCenterName;
 
     @ApiParam("工序名称")
     private String processName;
@@ -48,12 +48,12 @@ public class ProductSnConditionModel implements Serializable {
     @ApiParam("质量状态Name")
     private String qcStatusName;
 
-    public ProductSnConditionModel(String serialNumber, String customerPartNo, String partNo, String prodCfgTypeCode, String workCenterCode, String processName, String workCellName, String createDatetime, Integer qcStatus) {
+    public ProductSnConditionModel(String serialNumber, String customerPartNo, String partNo, String prodCfgTypeCode, String workCenterName, String processName, String workCellName, String createDatetime, Integer qcStatus) {
         this.serialNumber = serialNumber;
         this.customerPartNo = customerPartNo;
         this.partNo = partNo;
         this.prodCfgTypeCode = prodCfgTypeCode;
-        this.workCenterCode = workCenterCode;
+        this.workCenterName = workCenterName;
         this.processName = processName;
         this.workCellName = workCellName;
         this.createDatetime = createDatetime;

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

@@ -32,7 +32,7 @@ public class ProductSnModel implements Serializable {
     private String qrCode;
 
     @ApiParam("产线")
-    private String workCenterCode;
+    private String workCenterName;
 
     @ApiParam("工序名称")
     private String processName;
@@ -40,12 +40,12 @@ public class ProductSnModel implements Serializable {
     @ApiParam("工位名称")
     private String workCellName;
 
-    @ApiParam(value = "执行人")
-    public String createUser;
-
     @ApiParam(value = "扫码时间")
     public String createDatetime;
 
+    @ApiParam(value = "执行人")
+    public String createUser;
+
     @ApiParam("质量代码")
     private Integer qcStatus;
 
@@ -53,16 +53,16 @@ public class ProductSnModel implements Serializable {
     private String qcStatusName;
 
 
-    public ProductSnModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterCode, String processName, String workCellName, String createUser, String createDatetime, Integer qcStatus) {
+    public ProductSnModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, String processName, String workCellName, String createUser, String createDatetime, Integer qcStatus) {
         this.customerPartNo = customerPartNo;
         this.serialNumber = serialNumber;
         this.partNo = partNo;
         this.qrCode = qrCode;
-        this.workCenterCode = workCenterCode;
+        this.workCenterName = workCenterName;
         this.processName = processName;
         this.workCellName = workCellName;
-        this.createUser = createUser;
         this.createDatetime = createDatetime;
+        this.createUser = createUser;
         this.qcStatus = qcStatus;
     }
 }