From a532a0f9edfdfee9577fa36a7ecc5edbe249cd12 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 24 九月 2026 19:06:42 +0800
Subject: [PATCH] feat(生产工单): 工单列表返回产品大类
---
src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
index bd6f2df..922f565 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
@@ -22,6 +22,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.production.bean.dto.ProductionOperationTaskDto;
import com.ruoyi.production.bean.vo.ProductionOperationTaskVo;
+import com.ruoyi.production.enums.MajorCategoryEnum;
import com.ruoyi.production.mapper.ProductionOrderMapper;
import com.ruoyi.production.mapper.ProductionOrderRoutingOperationMapper;
import com.ruoyi.production.mapper.ProductionOperationTaskMapper;
@@ -66,6 +67,7 @@
IPage<ProductionOperationTaskVo> result = baseMapper.pageProductionOperationTask(voPage, dto);
fillOperationTypes(result.getRecords());
fillUserNames(result.getRecords());
+ fillMajorCategories(result.getRecords());
return result;
}
@@ -75,9 +77,26 @@
List<ProductionOperationTaskVo> result = BeanUtil.copyToList(this.list(buildQueryWrapper(dto)), ProductionOperationTaskVo.class);
fillOperationTypes(result);
fillUserNames(result);
+ fillMajorCategories(result);
return result;
}
+ /**
+ * 濉厖浜у搧澶х被銆傚伐鍗曟湰韬笉瀛樺ぇ绫伙紝鎸変骇鍝佸悕绉扮敤缁熶竴鐨� {@link MajorCategoryEnum} 瑙勫垯鎺ㄥ锛�
+ * 涓庢姤宸ュ啓鍏ユ椂鐨勫垽瀹氬彛寰勪繚鎸佷竴鑷达紱闈炰箰鍣紙濡傜孩鏈ㄧ瓑鍘熸枡锛変繚鎸佷负绌恒��
+ */
+ private void fillMajorCategories(List<ProductionOperationTaskVo> records) {
+ if (CollectionUtils.isEmpty(records)) {
+ return;
+ }
+ for (ProductionOperationTaskVo vo : records) {
+ if (vo == null) {
+ continue;
+ }
+ vo.setMajorCategory(MajorCategoryEnum.match(vo.getProductName()));
+ }
+ }
+
@Override
public ProductionOperationTaskVo getProductionOperationTaskInfo(Long id) {
// 鑾峰彇鐢熶骇宸ュ簭浠诲姟璇︽儏
--
Gitblit v1.9.3