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

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("不良处理类型Name")
+    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;
+
+}

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

@@ -0,0 +1,78 @@
+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 17:16
+ **/
+@Data
+@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("料箱状态Name")
+    private String useStatusName;
+
+    @ApiParam("物料码")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("工序信息")
+    private String processCode;
+
+    @ApiParam("执行动作")
+    private Integer opType;
+
+    @ApiParam("执行动作Name")
+    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;
+    }
+}

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

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

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/report/ProcessScrapRateQueryModel.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.util.List;
+
+/**
+ * 全工序报废率-查询条件-model
+ * @author yumingxing
+ * @version 1.0
+ * @date 2020/12/21 10:10
+ **/
+@Data
+@ApiModel("全工序报废率-查询条件")
+public class ProcessScrapRateQueryModel {
+
+    @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;
+
+}

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

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

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

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