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

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

@@ -239,7 +239,17 @@ public class MesPackage extends BaseBean implements Serializable {
         this.createDatetime = createDatetime;
     }
 
-    public MesPackage(String partNo, String partNameRdd,String workCenterCode, String workOrderNo,
+    public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, Integer isSealed, String ctNo) {
+        this.packageNo = packageNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+        this.packSpecQty = packSpecQty;
+        this.isSealed = isSealed;
+        this.ctNo = ctNo;
+    }
+
+    public MesPackage(String partNo, String partNameRdd, String workCenterCode, String workOrderNo,
                       String packageNo, String lotNo, String custCode, String shiftGroup) {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;

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

@@ -20,12 +20,12 @@ public class MesPackageQueryModel extends MesPackage {
     @ApiParam("工序名称")
     private String processName;
 
+    @ApiParam("工位")
+    private String workCellName;
+
     @ApiParam("产线")
     private String workCenterName;
 
-    @ApiParam("工作单元名称")
-    private String workCellName;
-
     @ApiParam("是否封箱Name")
     private String isSealedName;
 
@@ -34,7 +34,14 @@ public class MesPackageQueryModel extends MesPackage {
         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) {
+    public MesPackageQueryModel(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty, Integer isSealed, String ctNo, String processName, String workCellName, String workCenterName) {
+        super(packageNo, partNo, partNameRdd, qty, packSpecQty, isSealed, ctNo);
+        this.processName = processName;
+        this.workCellName = workCellName;
+        this.workCenterName = workCenterName;
+    }
+
+    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;

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

@@ -12,19 +12,19 @@ import java.util.List;
 /**
  * @Author: xiangming.liao
  * @CreateDate: 2020/12/28 14:24 下午
- * @Description: 一次性通过率占比柏拉图报表model
+ * @Description: 缺陷率占比柏拉图报表model
  **/
-@Api("一次性通过率占比柏拉图报表model")
+@Api("缺陷率占比柏拉图报表model")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class ProduceDispPassPlatoModel {
+public class ProduceDefectRatePlatoModel {
 
     @ApiParam("项目号")
     private String prodCfgTypeCode;
 
-    @ApiParam("零件号")
+    @ApiParam("客户零件号")
-    private String partNo;
+    private String customerPartNo;
 
     @ApiParam("缺陷代码")
     private String defectCode;
@@ -41,17 +41,17 @@ public class ProduceDispPassPlatoModel {
     @ApiParam("数量")
     private Long qty;
 
-    public ProduceDispPassPlatoModel(String prodCfgTypeCode, String partNo, String defectCode, String defectName, Long qty) {
+    public ProduceDefectRatePlatoModel(String prodCfgTypeCode, String customerPartNo, String defectCode, String defectName, Long qty) {
         this.prodCfgTypeCode = prodCfgTypeCode;
-        this.partNo = partNo;
+        this.customerPartNo = customerPartNo;
         this.defectCode = defectCode;
         this.defectName = defectName;
         this.qty = qty;
     }
 
-    public ProduceDispPassPlatoModel(String prodCfgTypeCode, String partNo, Long qty) {
+    public ProduceDefectRatePlatoModel(String prodCfgTypeCode, String customerPartNo, Long qty) {
         this.prodCfgTypeCode = prodCfgTypeCode;
-        this.partNo = partNo;
+        this.customerPartNo = customerPartNo;
         this.qty = qty;
     }
 }

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

@@ -12,19 +12,22 @@ import java.util.List;
 /**
  * @Author: xiangming.liao
  * @CreateDate: 2020/12/28 14:18 下午
- * @Description: 一次性通过率占比柏拉图报表查询参数model
+ * @Description: 缺陷率占比柏拉图报表查询参数model
  **/
-@Api("一次性通过率占比柏拉图报表查询参数model")
+@Api("缺陷率占比柏拉图报表查询参数model")
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class ProduceDispPassPlatoQueryModel extends BaseBean {
+public class ProduceDefectRatePlatoQueryModel extends BaseBean {
     /**
      * 必选
      */
 
     @ApiParam("工序")
-    private List<String> processCodeList;
+    private String processCode;
+
+    @ApiParam("柱子展示条数")
+    private Integer displaySize;
 
     //质量状态（20冻结，30报废）
     @ApiParam("质量状态")
@@ -38,7 +41,7 @@ public class ProduceDispPassPlatoQueryModel extends BaseBean {
     @ApiParam("零件号")
     private List<String> partNoList;
 
-    //统计方式（0按月，1按天）
+    //统计方式（0按月，1按天。）
     @ApiParam("统计方式")
     private Integer statisticalMethod;