Merge remote-tracking branch 'origin/test' into test

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

@@ -19,7 +19,7 @@ public class DefectRecordModel implements Serializable {
     private static final long serialVersionUID = 4994719388513997046L;
 
     @ApiParam("产线")
-    private String workCenterCode;
+    private String workCenterName;
 
     @ApiParam("工序名称")
     private String processName;
@@ -52,8 +52,8 @@ public class DefectRecordModel implements Serializable {
     public String createDatetime;
 
 
-    public DefectRecordModel(String workCenterCode, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime) {
+    public DefectRecordModel(String workCenterName, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime) {
-        this.workCenterCode = workCenterCode;
+        this.workCenterName = workCenterName;
         this.processName = processName;
         this.qcStatus = qcStatus;
         this.defectName = defectName;

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

@@ -36,7 +36,7 @@ public class PackageTravelModel implements Serializable {
     private String qrCode;
 
     @ApiParam("产线")
-    private String workCenterCode;
+    private String workCenterName;
 
     @ApiParam("工序名称")
     private String processName;
@@ -65,13 +65,13 @@ public class PackageTravelModel implements Serializable {
     @ApiParam("执行时间")
     private 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) {
+    public PackageTravelModel(String packageNo,String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, 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;
         this.qrCode = qrCode;
-        this.workCenterCode = workCenterCode;
+        this.workCenterName = workCenterName;
         this.processName = processName;
         this.ctCode = ctCode;
         this.ctNo = ctNo;

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

@@ -16,7 +16,7 @@ import java.io.Serializable;
 @ApiModel("产品履历报表-产品信息")
 public class ProductSnModel implements Serializable {
 
-    private static final long serialVersionUID = 5217363746963291483L;
+    private static final long serialVersionUID = 7137684552464509466L;
 
 
     @ApiParam("客户零件号")
@@ -53,7 +53,7 @@ public class ProductSnModel implements Serializable {
     private String qcStatusName;
 
 
-    public ProductSnModel(String customerPartNo, String serialNumber, String partNo, String qrCode, String workCenterName, 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 createDatetime, String createUser, Integer qcStatus) {
         this.customerPartNo = customerPartNo;
         this.serialNumber = serialNumber;
         this.partNo = partNo;