From 955a5c8d8bf2a3b4bab021eb503d34a08a7a5baa Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 24 Dec 2024 12:49:49 +0800 Subject: [PATCH] =?UTF-8?q?44377=20=E6=A3=80=E9=AA=8C=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=80=BB=E6=8A=A5=E8=A1=A8=E7=9B=AE=E5=89=8D?= =?UTF-8?q?=E6=98=AF=E5=8A=A8=E6=80=81=E8=A1=A8=E5=8D=95=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BE=88=E6=85=A2=EF=BC=8C=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/MesInspectionProductDataReportController.java | 3 ++- .../daoimpl/report/MesInspectionProductDataReportDao.java | 8 +++----- .../model/report/MesInspectionProductDataAmountReportModel.java | 1 - 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java index e8fb13e..93bb276 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/report/MesInspectionProductDataReportController.java @@ -29,7 +29,8 @@ public class MesInspectionProductDataReportController extends BaseController { @ApiOperation(value = "检验产品数据总报表") public ResultBean queryInspectionProductDataAmountReport(MesInspectionProductDataAmountReportModel model, Pager pager) { try { - model.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); + model.setOrganizeCode("CR01"); +// model.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); return ResultBean.success("查询成功").setListPager(inspectionProductDataReportService.queryInspectionProductDataAmountReport(model, pager)) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesInspectionProductDataReportDao.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesInspectionProductDataReportDao.java index 045ebd2..3a422b8 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesInspectionProductDataReportDao.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/MesInspectionProductDataReportDao.java @@ -70,17 +70,15 @@ public class MesInspectionProductDataReportDao implements IMesInspectionProductD hql.append("mpid.defectLocation,"); hql.append("mpid.frontBack,"); hql.append("mpid.defectTypeName,"); - hql.append("mv.lgort,"); - hql.append("mv.umlgo,"); - hql.append("mv.zrsum,"); + hql.append("mm.lgort,"); + hql.append("mm.umlgo,"); + hql.append("mm.zrsum,"); hql.append("mrt.status AS taskStatus,"); - hql.append("mrt.modifyUser,"); hql.append("mrt.reworkOrder,"); hql.append("mrt.modifyUser,"); hql.append("mp.partTypeCode,"); hql.append("mwc.workCenterName"); hql.append(")"); - packHqlForQuery(hql, model); hql.append(" order by mpi.createDatetime asc "); diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesInspectionProductDataAmountReportModel.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesInspectionProductDataAmountReportModel.java index 0e6142f..819a3fc 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesInspectionProductDataAmountReportModel.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesInspectionProductDataAmountReportModel.java @@ -144,7 +144,6 @@ public class MesInspectionProductDataAmountReportModel implements Serializable { this.umlgo = umlgo; this.zrsum = zrsum; this.taskStatus = taskStatus; - this.modifyUser = modifyUser; this.reworkOrder = reworkOrder; this.modifyUser = modifyUser; this.partTypeCode = partTypeCode;