From 8c8ff31cdca25f579d3c1f688f46c877bf28aaa1 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 26 五月 2026 16:21:46 +0800
Subject: [PATCH] feat(approve): 重构审批流程配置功能
---
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 151eccb..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.*;
@@ -243,8 +243,19 @@
@Override
public ProductionReportStateDto reportState(Long workOrderId, Long productProcessRouteItemId) {
- ProductionProductMain running = getRunning(workOrderId, productProcessRouteItemId);
ProductionReportStateDto dto = new ProductionReportStateDto();
+ ProductWorkOrder workOrder = productWorkOrderMapper.selectById(workOrderId);
+ if (workOrder != null) {
+ BigDecimal planQty = workOrder.getPlanQuantity() == null ? BigDecimal.ZERO : workOrder.getPlanQuantity();
+ BigDecimal completeQty = workOrder.getCompleteQuantity() == null ? BigDecimal.ZERO : workOrder.getCompleteQuantity();
+ // 鐢熶骇鎶ュ伐鏁伴噺宸插畬鎴�
+ if (planQty.compareTo(BigDecimal.ZERO) > 0 && completeQty.compareTo(planQty) >= 0) {
+ dto.setState(3);
+ return dto;
+ }
+ }
+
+ ProductionProductMain running = getRunning(workOrderId, productProcessRouteItemId);
if (running == null) {
dto.setState(1);
return dto;
@@ -540,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