Merge branch 'dev' of xiangming.liao/i3plus-pojo into dev

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java

@@ -246,4 +246,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;
+    }
 }

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

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

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

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() {
+    }
+}

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