产品履历报表+全工序报废率报表

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;
+}

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;
+    }
+}

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;
 
 }

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;

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;
+
+
+}