From 08c9f486c44ebbb3fcf67d3c921d666fd6961aca Mon Sep 17 00:00:00 2001 From: "xiangming.liao@estsh.com" Date: Thu, 7 Jan 2021 11:19:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/report/ProduceDispPassPlatoQueryModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git 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 index e8b1087..631c6cb 100644 --- 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 @@ -24,7 +24,7 @@ public class ProduceDispPassPlatoQueryModel extends BaseBean { */ @ApiParam("工序") - private String processCode; + private List processCodeList; //质量状态（20冻结，30报废） @ApiParam("质量状态") @@ -40,7 +40,7 @@ public class ProduceDispPassPlatoQueryModel extends BaseBean { //统计方式（0按月，1按天） @ApiParam("统计方式") - private Integer statisticalPlacer; + private Integer statisticalMethod; @ApiParam("开始时间") private String modifyStartDate; From 1871c738e30c72506acdb10a4c24f5b7efbd79e2 Mon Sep 17 00:00:00 2001 From: yumingxing <1184315279@qq.com> Date: Thu, 7 Jan 2021 11:30:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8A=A5=E8=A1=A8BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/model/report/ScrapOfPlatoModel.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git 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 index edad180..ecb716e 100644 --- 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 @@ -41,12 +41,11 @@ public class ScrapOfPlatoModel { private BigDecimal scrapRatioPlato; - public ScrapOfPlatoModel(String partNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects,String workCellCode) { + public ScrapOfPlatoModel(String partNo, String prodCfgTypeCode, String defectCode, String defectName, long numberOfDefects) { this.partNo = partNo; this.prodCfgTypeCode = prodCfgTypeCode; this.defectCode = defectCode; this.defectName = defectName; this.numberOfDefects = numberOfDefects; - this.workCellCode = workCellCode; } }