Merge remote-tracking branch 'remotes/origin/dev' into test

4 years ago · e62bdb1f60
parent 46bbe0492d 03aefdfd9b
commit e62bdb1f60
18 changed files with 830 additions and 0 deletions
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java
@ -250,4 +250,32 @@ public class MesPackage extends BaseBean implements Serializable {
        this.custCode = custCode;
        this.shiftGroup = shiftGroup;
    }
+
+    public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty,Double packSpecQty, String unit,String lotNo, String fixLotNo,String packSpec,Integer isSealed, Integer printStatus,Integer packLevel,String workOrderNo, String workCenterCode, String workCellCode,String memo, String custCode, String inLocationTime, String ctNo,String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo) {
+        this.packageNo = packageNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.packSpecQty=packSpecQty;
+        this.unit = unit;
+        this.lotNo=lotNo;
+        this.fixLotNo = fixLotNo;
+        this.packSpec=packSpec;
+        this.isSealed=isSealed;
+        this.printStatus = printStatus;
+        this.packLevel=packLevel;
+        this.workOrderNo=workOrderNo;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.memo=memo;
+        this.custCode = custCode;
+        this.inLocationTime = inLocationTime;
+        this.ctNo = ctNo;
+        this.sampleType=sampleType;
+        this.packageLabelTemplate = packageLabelTemplate;
+        this.qrCode = qrCode;
+        this.locationCode = locationCode;
+        this.erpWorkCenterCode = erpWorkCenterCode;
+        this.fnLocationNo = fnLocationNo;
+    }
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPackageQueryModel.java
@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesPackage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author: xiangming.liao
+ * @CreateDate: 2020/12/18 16:13 下午
+ * @Description: 包装查询报表返回model
+ **/
+@Api("包装查询报表返回model")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MesPackageQueryModel extends MesPackage {
+    @ApiParam("工序名称")
+    private String processName;
+
+    @ApiParam("产线")
+    private String workCenterName;
+
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
+    public MesPackageQueryModel(String workCenterName, String workCellName) {
+        this.workCenterName = workCenterName;
+        this.workCellName = workCellName;
+    }
+
+    public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, String unit, String lotNo, String fixLotNo, String packSpec, Integer printStatus, Integer isSealed, Integer packLevel, String workOrderNo, String memo, String workCenterCode, String workCellCode, String custCode, String inLocationTime, String ctNo, String sampleType, String packageLabelTemplate, String qrCode, String locationCode, String erpWorkCenterCode, String fnLocationNo,String processName, String workCenterName, String workCellName) {
+        super(packageNo, partNo, partNameRdd, qty, packSpecQty, unit, lotNo, fixLotNo, packSpec, printStatus, isSealed, packLevel, workOrderNo, memo, workCenterCode, workCellCode, custCode, inLocationTime, ctNo, sampleType, packageLabelTemplate, qrCode, locationCode, erpWorkCenterCode, fnLocationNo);
+        this.processName=processName;
+        this.workCenterName = workCenterName;
+        this.workCellName = workCellName;
+    }
+}
--- 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
@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 产品履历报表-缺陷信息
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/18 15:16
+ **/
+@Data
+@ApiModel("产品履历报表-缺陷信息")
+public class DefectRecordModel implements Serializable {
+
+    private static final long serialVersionUID = 4994719388513997046L;
+
+
+    @ApiParam("不良处理类型")
+    private Integer defectActionType;
+
+    @ApiParam("不良处理类型名称")
+    private String defectActionTypeName;
+
+    @ApiParam("缺陷名称")
+    private String defectName;
+
+    @ApiParam("缺陷位置")
+    private String defectLocation;
+
+    @ApiParam("缺陷位置名称")
+    private String defectLocationName;
+
+    @ApiParam(value = "创建用户")
+    public String createUser;
+
+    @ApiParam(value = "创建日期")
+    public String createDatetime;
+
+}
--- 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
@ -0,0 +1,76 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 产品履历报表-料箱信息
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/18 17:16
+ **/
+@Data
+@NoArgsConstructor
+@ApiModel("产品履历报表-料箱信息")
+public class PackageTravelModel implements Serializable {
+
+    private static final long serialVersionUID = -7031472442162953544L;
+
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("料箱编号")
+    private String ctNo;
+
+    @ApiParam("包装号")
+    private String packageNo;
+
+    @ApiParam("料箱类型")
+    private String cnCode;
+
+    @ApiParam("料箱状态")
+    private String useStatus;
+
+    @ApiParam("料箱状态名称")
+    private String useStatusName;
+
+    @ApiParam("物料码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("工序信息")
+    private String processCode;
+
+    @ApiParam("执行动作")
+    private Integer opType;
+
+    @ApiParam("执行动作名称")
+    private String opTypeName;
+
+    @ApiParam("执行时间")
+    private String createDatetime;
+
+    public PackageTravelModel(String serialNumber, String ctNo, String packageNo, String cnCode, String useStatus, String partNo, String partNameRdd, String workCenterCode, String processCode, Integer opType, String createDatetime) {
+        this.serialNumber = serialNumber;
+        this.ctNo = ctNo;
+        this.packageNo = packageNo;
+        this.cnCode = cnCode;
+        this.useStatus = useStatus;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workCenterCode = workCenterCode;
+        this.processCode = processCode;
+        this.opType = opType;
+        this.createDatetime = createDatetime;
+    }
+}
--- 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
@ -0,0 +1,27 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 工序代码+工序名称 实体类
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/22 16:56
+ **/
+@Data
+@ApiModel("工序代码+工序名称")
+public class ProcessModel implements Serializable {
+
+
+    private static final long serialVersionUID = -6653836427174801385L;
+
+    @ApiParam("工序代码")
+    private String processCode;
+
+    @ApiParam("工序名称")
+    private String processName;
+}
--- 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
@ -0,0 +1,39 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * 全工序报废率-查询结果-model
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/21 10:10
+ **/
+@Data
+@NoArgsConstructor
+@ApiModel("全工序报废率-查询结果")
+public class ProcessScrapRate {
+
+    @ApiParam("工序")
+    private String processCode;
+
+    @ApiParam("项目号")
+    private String prodCfgTypeCode;
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("报废率")
+    private BigDecimal scrapRate;
+
+
+    public ProcessScrapRate(String processCode, String prodCfgTypeCode, String workCellCode) {
+        this.processCode = processCode;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.workCellCode = workCellCode;
+    }
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoModel.java
@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @Author: xiangming.liao
+ * @CreateDate: 2020/12/28 14:24 下午
+ * @Description: 一次性通过率占比柏拉图报表model
+ **/
+@Api("一次性通过率占比柏拉图报表model")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProduceDispPassPlatoModel {
+
+    @ApiParam("项目号")
+    private List<String> prodCfgTypeCodeList;
+
+    @ApiParam("零件号")
+    private List<String> partNoList;
+
+    @ApiParam("单项占比")
+    private BigDecimal singleRatio;
+
+    @ApiParam("累计占比")
+    private BigDecimal cumulativeRatio;
+
+    @ApiParam("缺陷数量")
+    private BigDecimal defectQty;
+
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java
@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Author: xiangming.liao
+ * @CreateDate: 2020/12/28 14:18 下午
+ * @Description: 一次性通过率占比柏拉图报表查询参数model
+ **/
+@Api("一次性通过率占比柏拉图报表查询参数model")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProduceDispPassPlatoQueryModel {
+    /**
+     * 必选
+     */
+
+    @ApiParam("工序")
+    private String processCode;
+
+    @ApiParam("统计方式")
+    private Integer statisticalPlacer;
+    /**
+     * 可选
+     */
+    @ApiParam("项目号")
+    private List<String> prodCfgTypeCodeList;
+
+    @ApiParam("零件号")
+    private List<String> partNoList;
+
+    @ApiParam("开始时间")
+    private String modifyStartDate;
+
+    @ApiParam("结束时间")
+    private String modifyEndDate;
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateModel.java
@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author: xiangming.liao
+ * @CreateDate: 2020/12/22 14:38 下午
+ * @Description: 每个月/天的冻结数、报废数、生产总数、占比回model
+ **/
+@Api("每个月/天的冻结数、报废数、生产总数、占比返回model")
+@Data
+public class ProduceDispPassRateModel {
+    @ApiParam("统计时间")
+    private String statisticalTime;
+
+    @ApiParam("质量状态/类型")
+    private Integer qcStatus;
+
+    @ApiParam("统计选项")
+    private String statisticalOption;
+
+    @ApiParam("冻结数")
+    private BigDecimal freezeQty;
+
+    @ApiParam("报废数")
+    private BigDecimal scrapQty;
+
+    @ApiParam("生产总数")
+    private BigDecimal produceSumQty;
+
+    @ApiParam("占比率")
+    private BigDecimal ratio;
+
+    public ProduceDispPassRateModel(String statisticalTime, Integer qcStatus, String statisticalOption, BigDecimal freezeQty, BigDecimal scrapQty, BigDecimal produceSumQty, BigDecimal ratio) {
+        this.statisticalTime = statisticalTime;
+        this.qcStatus = qcStatus;
+        this.statisticalOption = statisticalOption;
+        this.freezeQty = freezeQty;
+        this.scrapQty = scrapQty;
+        this.produceSumQty = produceSumQty;
+        this.ratio = ratio;
+    }
+
+    public ProduceDispPassRateModel() {
+    }
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProduceDispPassRateQueryModel.java
@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Author: xiangming.liao
+ * @CreateDate: 2020/12/23 13:38 下午
+ * @Description: 一次性通过率查询参数model
+ **/
+@Api("一次性通过率查询参数model")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProduceDispPassRateQueryModel {
+    /**
+     * 必选
+     */
+
+    @ApiParam("工序")
+    private String processCode;
+
+    @ApiParam("统计方式")
+    private Integer statisticalPlacer;
+
+    @ApiParam("质量类型")
+    private String qcStatus;
+
+    /**
+     * 可选
+     */
+    @ApiParam("项目号")
+    private List<String> prodCfgTypeCodeList;
+
+    @ApiParam("零件号")
+    private List<String> partNoList;
+
+    @ApiParam("开始时间")
+    private String modifyStartDate;
+
+    @ApiParam("结束时间")
+    private String modifyEndDate;
+
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductDetailResult.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductDetailResult.java
@ -0,0 +1,65 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/24 18:57
+ **/
+@Data
+@NoArgsConstructor
+@ApiModel("生产统计明细")
+public class ProductDetailResult {
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("零件号")
+    private String partNo;
+
+    @ApiParam("零件描述")
+    private String partNameRdd;
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+
+    @ApiParam("工序")
+    private String processCode;
+
+    @ApiParam("工序名称")
+    private String processName;
+
+    @ApiParam("条码状态")
+    private String qcStatus;
+
+    @ApiParam(value = "创建用户")
+    public String createUser;
+
+    @ApiParam(value = "创建日期")
+    public String createDatetime;
+
+    @ApiParam(value = "修改人")
+    public String modifyUser;
+
+    @ApiParam(value = "修改日期")
+    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) {
+        this.serialNumber = serialNumber;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workCenterCode = workCenterCode;
+        this.processCode = processCode;
+        this.processName = processName;
+        this.qcStatus = qcStatus;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+    }
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductResult.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductResult.java
@ -0,0 +1,56 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * @author yumingxing 生产总数
+ * @version 1.0
+ * @date 2020/12/24 18:57
+ **/
+@Data
+@NoArgsConstructor
+public class ProductResult {
+
+    @ApiParam("工作单元")
+    private String workCellCode;
+    @ApiParam("零件号")
+    private String partNo;
+    @ApiParam("零件描述")
+    private String partNameRdd;
+    @ApiParam("生产线")
+    private String workCenterCode;
+    @ApiParam("工序")
+    private String processCode;
+    @ApiParam("工序名称")
+    private String processName;
+    @ApiParam("生产总数")
+    private long totalProduction;
+    @ApiParam("合格数")
+    private long qualified;
+    @ApiParam("冻结数")
+    private long unqualified;
+    @ApiParam("报废数")
+    private long scrap;
+    @ApiParam("合格率")
+    private BigDecimal qualifiedRate;
+    @ApiParam("冻结率")
+    private BigDecimal unqualifiedRate;
+    @ApiParam("报废率")
+    private BigDecimal scrapRate;
+
+    public ProductResult(String workCellCode,String partNo, String partNameRdd, String workCenterCode, String processCode, String processName, long qualified, long unqualified, long scrap) {
+        this.workCellCode = workCellCode;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workCenterCode = workCenterCode;
+        this.processCode = processCode;
+        this.processName = processName;
+        this.qualified = qualified;
+        this.unqualified = unqualified;
+        this.scrap = scrap;
+    }
+}
--- 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
@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 产品履历报表-产品信息
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/18 15:16
+ **/
+@Data
+@ApiModel("产品履历报表-产品信息")
+public class ProductSnModel implements Serializable {
+
+    private static final long serialVersionUID = 5217363746963291483L;
+
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("条码状态")
+    private Integer snStatus;
+
+    @ApiParam("条码状态Name")
+    private String snStatusName;
+
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
+    @ApiParam("质量状态Name")
+    private String qcStatusName;
+
+    @ApiParam("物料码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @ApiParam("当前工序")
+    private String processCode;
+
+    @ApiParam("条码类型")
+    private Integer snType;
+
+    @ApiParam("条码类型Name")
+    private String snTypeName;
+
+
+    @ApiParam(value = "执行时间")
+    public String modifyDatetime;
+
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductSnTravelModel.java
@ -0,0 +1,64 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 产品履历报表-过程信息
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/18 15:16
+ **/
+@Data
+@ApiModel("产品履历报表-过程信息")
+public class ProductSnTravelModel implements Serializable {
+
+    private static final long serialVersionUID = 6720300188491659067L;
+
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("条码状态")
+    private Integer snStatus;
+
+    @ApiParam("条码状态Name")
+    private String snStatusName;
+
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
+    @ApiParam("质量状态Name")
+    private String qcStatusName;
+
+    @ApiParam("物料码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("流程代码")
+    private String routeCode;
+
+    @ApiParam("当前工序")
+    private String processCode;
+
+    @ApiParam("当前工序")
+    private String nextProcessCode;
+
+    @ApiParam("条码类型")
+    private Integer snType;
+
+    @ApiParam("条码类型Name")
+    private String snTypeName;
+
+    @ApiParam(value = "执行时间")
+    public String modifyDatetime;
+
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProductStatisticsQueryModel.java
@ -0,0 +1,29 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * 生产统计
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/24 16:13
+ **/
+@Data
+public class ProductStatisticsQueryModel {
+
+    @ApiParam("生产线")
+    private String workCenterCode;
+    @ApiParam("工序")
+    private String processCode;
+    @ApiParam("零件号")
+    private String partNo;
+    @ApiParam("开始日期")
+    private String modifyStartDate;
+    @ApiParam("结束日期")
+    private String modifyEndDate;
+    @ApiParam("质量状态")
+    private String qcStatus;
+    @ApiParam("过程条码")
+    private String serialNumber;
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ReportQueryModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ReportQueryModel.java
@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/21 10:10
+ **/
+@Data
+public class ReportQueryModel {
+
+    @ApiParam("工序")
+    private List<String> processCodeList;
+
+    @ApiParam("项目号")
+    private List<String> prodCfgTypeCodeList;
+
+    /**
+     * 零件号取物料号
+     */
+    @ApiParam("零件号")
+    private List<String> partNoList;
+
+    @ApiParam("开始日期")
+    private String modifyStartDate;
+
+    @ApiParam("结束日期")
+    private String modifyEndDate;
+
+    @ApiParam("账号")
+    private String userLoginName;
+
+    @ApiParam("姓名")
+    private String userName;
+
+}
--- 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
@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * 报废占比柏拉图Model
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/23 15:09
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("报废占比柏拉图")
+public class ScrapOfPlatoModel {
+
+    @ApiParam("零件号")
+    private String partNo;
+    @ApiParam("项目")
+    private String prodCfgTypeCode;
+    @ApiParam("缺陷代码")
+    private String defectCode;
+    @ApiParam("缺陷名称")
+    private String defectName;
+    @ApiParam("缺陷数")
+    private long numberOfDefects;
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @ApiParam("报废率")
+    private BigDecimal scrapRate;
+    @ApiParam("报废占比")
+    private BigDecimal scrapRatio;
+    @ApiParam("柏拉图报废占比")
+    private BigDecimal scrapRatioPlato;
+
+
+    public ScrapOfPlatoModel(String partNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects,String workCellCode) {
+        this.partNo = partNo;
+        this.prodCfgTypeCode = prodCfgTypeCode;
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+        this.numberOfDefects = numberOfDefects;
+        this.workCellCode = workCellCode;
+    }
+}
--- 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
@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.mes.model.report;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户查询-账号+姓名
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/22 10:51
+ **/
+@Data
+@ApiModel("用户查询-账号+姓名")
+public class UserQueryModel implements Serializable {
+
+    @ApiParam("账号")
+   private String userLoginName;
+    @ApiParam("姓名")
+   private String userName;
+
+
+}