From 1bebe59cc2e08b1e39417fc73cf38a9aec504094 Mon Sep 17 00:00:00 2001
From: yumingxing <1184315279@qq.com>
Date: Thu, 24 Dec 2020 09:08:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=B1=A5=E5=8E=86=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8+=E5=85=A8=E5=B7=A5=E5=BA=8F=E6=8A=A5=E5=BA=9F?=
 =?UTF-8?q?=E7=8E=87=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/mes/model/report/ProcessScrapRate.java    |  4 +++-
 .../pojo/mes/model/report/ScrapOfPlatoModel.java   | 26 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java
index c9afc65..9589f43 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java
@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+
 /**
  * 全工序报废率-查询结果-model
  * @author yumingxing
@@ -26,7 +28,7 @@ public class ProcessScrapRate {
     private String workCellCode;
 
     @ApiParam("报废率")
-    private String scrapRate;
+    private BigDecimal scrapRate;
 
 
     public ProcessScrapRate(String processCode, String prodCfgTypeCode, String workCellCode) {
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java
new file mode 100644
index 0000000..de4cdfe
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java
@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * 报废占比柏拉图Model
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/23 15:09
+ **/
+@Data
+public class ScrapOfPlatoModel {
+
+    @ApiParam("缺陷数")
+    private String numberOfDefects;
+    @ApiParam("缺陷类型")
+    private String defectType;
+    @ApiParam("缺陷类型名称")
+    private String defectTypeName;
+    @ApiParam("项目")
+    private String prodCfgTypeCode;
+    @ApiParam("零件号")
+    private String partNo;
+
+}