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;