From 13ca332c4bb34333acd691273969823cd2e86039 Mon Sep 17 00:00:00 2001
From: yumingxing <1184315279@qq.com>
Date: Tue, 22 Dec 2020 18:11:12 +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

---
 .../i3plus/pojo/mes/model/report/ProcessModel.java | 25 ++++++++++++++++
 .../pojo/mes/model/report/ProcessScrapRate.java    | 35 ++++++++++++++++++++++
 .../model/report/ProcessScrapRateQueryModel.java   |  3 +-
 .../pojo/mes/model/report/ProductSnModel.java      |  2 +-
 .../pojo/mes/model/report/UserQueryModel.java      | 22 ++++++++++++++
 5 files changed, 84 insertions(+), 3 deletions(-)
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java
 create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java

diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java
new file mode 100644
index 0000000..d24fad0
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessModel.java
@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 工序代码+工序名称 实体类
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/22 16:56
+ **/
+@Data
+public class ProcessModel implements Serializable {
+
+
+    private static final long serialVersionUID = -6653836427174801385L;
+
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @ApiParam("工序名称")
+    private String processName;
+}
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
new file mode 100644
index 0000000..e405321
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRate.java
@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 全工序报废率-查询条件-model
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/21 10:10
+ **/
+@Data
+@NoArgsConstructor
+public class ProcessScrapRate {
+
+    @ApiParam("工序")
+    private String processCode;
+
+    @ApiParam("项目号")
+    private String prodCfgTypeCode;
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("报废率")
+    private String scrapRate;
+
+
+    public ProcessScrapRate(String processCode, String prodCfgTypeCode, String workCellCode) {
+        this.processCode = processCode;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.workCellCode = workCellCode;
+    }
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java
index 00746fd..4a21371 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.java
@@ -1,6 +1,5 @@
 package cn.estsh.i3plus.pojo.mes.model.report;
 
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -37,6 +36,6 @@ public class ProcessScrapRateQueryModel {
     private String userLoginName;
 
     @ApiParam("姓名")
-    private String userNameRdd;
+    private String userName;
 
 }
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 2a6ed2b..b722e09 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
@@ -48,7 +48,7 @@ public class ProductSnModel implements Serializable {
     private String processCode;
 
     @ApiParam("条码类型")
-    private String snType;
+    private Integer snType;
 
     @ApiParam("条码类型Name")
     private String snTypeName;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java
new file mode 100644
index 0000000..be54cc9
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/UserQueryModel.java
@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/22 10:51
+ **/
+@Data
+public class UserQueryModel implements Serializable {
+
+    @ApiParam("账号")
+   private String userLoginName;
+    @ApiParam("姓名")
+   private String userName;
+
+
+}