From f2e783ca6e47761e7daadbac193cf80474d35edd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 25 五月 2026 13:19:12 +0800
Subject: [PATCH] feat(approve): 重构审批流程配置功能
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index d6c5a0d..08a24aa 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -15,6 +15,7 @@
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.procurementrecord.utils.StockUtils;
@@ -23,7 +24,6 @@
import com.ruoyi.production.dto.ProductionProductMainSummaryExportDto;
import com.ruoyi.production.dto.ProductionReportDailySummaryDto;
import com.ruoyi.production.dto.ProductionReportStateDto;
-import com.ruoyi.production.enums.ProductProcessEnum;
import com.ruoyi.production.mapper.ProductionProductReportDailyMapper;
import com.ruoyi.production.pojo.ProductionProductReportDaily;
import com.ruoyi.production.mapper.*;
@@ -551,12 +551,8 @@
if (process == null || process.getType() == null) {
return "鍏朵粬";
}
- for (ProductProcessEnum value : ProductProcessEnum.values()) {
- if (value.getCode().equals(process.getType())) {
- return value.getInfo();
- }
- }
- return "鍏朵粬";
+ String dictLabel = DictUtils.getDictLabel("product_process_type", String.valueOf(process.getType()));
+ return (dictLabel == null || dictLabel.isEmpty()) ? "鍏朵粬" : dictLabel;
}
private void saveDailyDurations(ProductionProductMain main, LocalDateTime start, LocalDateTime end) {
--
Gitblit v1.9.3