报表优化

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

@@ -21,6 +21,9 @@ public class ProductDetailResult {
     @ApiParam("零件号")
     private String partNo;
 
+    @ApiParam
+    private String customerPartNo;
+
     @ApiParam("零件描述")
     private String partNameRdd;
 
@@ -49,9 +52,10 @@ public class ProductDetailResult {
     public String modifyDatetime;
 
 
-    public ProductDetailResult(String serialNumber, String partNo, 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) {
         this.serialNumber = serialNumber;
         this.partNo = partNo;
+        this.customerPartNo = customerPartNo;
         this.partNameRdd = partNameRdd;
         this.workCenterCode = workCenterCode;
         this.processCode = processCode;

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

@@ -19,6 +19,8 @@ public class ProductResult {
     private String workCellCode;
     @ApiParam("零件号")
     private String partNo;
+    @ApiParam("零件号")
+    private String customerPartNo;
     @ApiParam("零件描述")
     private String partNameRdd;
     @ApiParam("生产线")
@@ -42,9 +44,10 @@ public class ProductResult {
     @ApiParam("报废率")
     private BigDecimal scrapRate;
 
-    public ProductResult(String workCellCode,String partNo, 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) {
         this.workCellCode = workCellCode;
         this.partNo = partNo;
+        this.customerPartNo = customerPartNo;
         this.partNameRdd = partNameRdd;
         this.workCenterCode = workCenterCode;
         this.processCode = processCode;

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

@@ -22,6 +22,8 @@ public class ScrapOfPlatoModel {
 
     @ApiParam("零件号")
     private String partNo;
+    @ApiParam("客户零件号")
+    private String customerPartNo;
     @ApiParam("项目")
     private String prodCfgTypeCode;
     @ApiParam("缺陷代码")
@@ -41,8 +43,9 @@ public class ScrapOfPlatoModel {
     private BigDecimal scrapRatioPlato;
 
 
-    public ScrapOfPlatoModel(String partNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects) {
+    public ScrapOfPlatoModel(String partNo, String customerPartNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects) {
         this.partNo = partNo;
+        this.customerPartNo = customerPartNo;
         this.prodCfgTypeCode = prodCfgTypeCode;
         this.defectCode = defectCode;
         this.defectName = defectName;