diff --git a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdReportServiceImpl.java b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdReportServiceImpl.java index c008f8b9..ae46a863 100644 --- a/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdReportServiceImpl.java +++ b/ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/service/impl/ProdReportServiceImpl.java @@ -89,7 +89,7 @@ public class ProdReportServiceImpl implements IProdReportService { String tableName; if (StringUtils.isNull(processId)) { // 默认返回半制品表 - tableName = DatabaseConstants.TABLE_NAME_PROD_PLAN_INFO_PREFIX + "_2"; + tableName = DatabaseConstants.TABLE_NAME_PROD_PRODUCT_PLAN_DETAIL_PREFIX + "_2"; }else if (processId == 17L) { tableName = DatabaseConstants.TABLE_NAME_PROD_PRODUCT_PLAN_DETAIL_PREFIX + "_3"; } else if (processId == 18L) { @@ -184,7 +184,7 @@ public class ProdReportServiceImpl implements IProdReportService { @Override public TableDataInfo teamWorkReportList(Map hashMap, PageQuery pageQuery) { - Long processId = Long.parseLong(String.valueOf(hashMap.get("processId"))); + Long processId = parseProcessId(String.valueOf(hashMap.get("processId"))); String detailTable = getPlanDetailTableNameByProcessId(processId); String planTable = getPlanInfoTableNameByProcessId(processId); Page page = prodReportMapper.teamWorkReportList(hashMap, pageQuery.build(), detailTable, planTable); @@ -193,7 +193,7 @@ public class ProdReportServiceImpl implements IProdReportService { @Override public List teamWorkReportList(Map hashMap) { - Long processId = Long.parseLong(String.valueOf(hashMap.get("processId"))); + Long processId = parseProcessId(String.valueOf(hashMap.get("processId"))); String detailTable = getPlanDetailTableNameByProcessId(processId); String planTable = getPlanInfoTableNameByProcessId(processId); return prodReportMapper.teamWorkReportList(hashMap, detailTable, planTable);