From 53b72a8f8de415b4aa9ccc17c6658f0698e8a344 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Thu, 14 Jan 2021 18:22:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8A=A5=E8=A1=A8202101141821?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java | 6 +++--- .../java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java index e7bcf70..97085b3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/DefectRecordModel.java +++ b/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) { - this.workCenterCode = workCenterCode; + public DefectRecordModel(String workCenterName, String processName, Integer qcStatus, String defectName, String defectLocation, String customerPartNo, String serialNumber, String createUser, String createDatetime) { + this.workCenterName = workCenterName; this.processName = processName; this.qcStatus = qcStatus; this.defectName = defectName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java index 55a17c9..ce69059 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java +++ b/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("客户零件号") From 479b81cb0825e5b197d54d8bb6c2ee424187ce67 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Thu, 14 Jan 2021 19:11:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8A=A5=E8=A1=A820210114?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java index ce69059..378d263 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnModel.java @@ -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; From 0871833d26b40e06ab39fa5814154f186fbd0331 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Fri, 15 Jan 2021 09:04:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8A=A5=E8=A1=A820210115?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java index ce9d922..8878a06 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/PackageTravelModel.java +++ b/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;