From c1dad33208820891d1c155d29e6c429a7767d2c8 Mon Sep 17 00:00:00 2001 From: "zangch@mesnac.com" Date: Sat, 11 Oct 2025 13:14:07 +0800 Subject: [PATCH] =?UTF-8?q?change(mes):=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改默认半制品表名前缀常量引用 - 替换手动解析为专用方法parseProcessId - 统一处理processId解析逻辑避免重复代码 --- .../org/dromara/mes/service/impl/ProdReportServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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);