From c749565b9c3d2d4c41093f31115e771aad793506 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Fri, 26 Jun 2026 18:30:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8F=AA=E6=9C=89=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=B2=A1=E6=9C=89id=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DsTaskingServiceImpl.java | 38 +++++++++++++++++++ .../quality/mapper/InspectionItemMapper.java | 2 + .../quality/mapper/InspectionItemMapper.xml | 6 +++ .../desk/quality/mapper/StandardMapper.java | 2 + .../desk/quality/mapper/StandardMapper.xml | 6 +++ .../service/IInspectionItemService.java | 7 ++++ .../quality/service/IStandardService.java | 2 + .../impl/InspectionItemServiceImpl.java | 5 +++ .../service/impl/StandardServiceImpl.java | 5 +++ 9 files changed, 73 insertions(+) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java index 29436df52..040abec50 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; @@ -64,8 +65,12 @@ import org.springblade.desk.produce.service.IPdaSaveService; import org.springblade.desk.produce.service.IWorkOrderService; import org.springblade.desk.produce.service.IWorkPlanService; import org.springblade.desk.quality.pojo.dto.PpmReportDetailDTO; +import org.springblade.desk.quality.pojo.entity.InspectionItem; +import org.springblade.desk.quality.pojo.entity.Standard; import org.springblade.desk.quality.pojo.request.ReviewSheetErpSearch; +import org.springblade.desk.quality.service.IInspectionItemService; import org.springblade.desk.quality.service.IReviewSheetService; +import org.springblade.desk.quality.service.IStandardService; import org.springblade.erpdata.feign.IErpDataReworkTaskClient; import org.springblade.scheduling.pojo.entity.PartRelationEntity; import org.springblade.scheduling.pojo.entity.WorkOrderEntity; @@ -198,6 +203,12 @@ public class DsTaskingServiceImpl extends BaseServiceImpl selectAssignList(IPage page, DsTaskingVO dsTasking) { List dsTaskingVOS = baseMapper.selectDsTaskingPage(page, dsTasking); @@ -1065,6 +1076,7 @@ public class DsTaskingServiceImpl extends BaseServiceImpl processEntities = processService.selectDsProcessByCraftId(craftVO.getId()); + // 每次循环创建新的craftTree对象 CraftTreeVO craftTree1 = new CraftTreeVO(); craftVO.setReworkOrder(dsTaskingEntity.getReworkOrder()); @@ -1149,6 +1161,20 @@ public class DsTaskingServiceImpl extends BaseServiceImpl convertToReworkProcessList(List processEntities, DsTaskingEntity dsTaskingEntity) { + for (DsProcessEntity processEntity : processEntities) { + if (processEntity == null) { + continue; + } + + Optional.ofNullable(processEntity.getPpsId()) + .map(processSetService::getById) + .ifPresent(processSet -> processEntity.setProcessName(processSet.getName())); + + Optional.ofNullable(processEntity.getCaId()) + .map(craftAbilityService::getById) + .ifPresent(craftAbility -> processEntity.setCraftName(craftAbility.getCaName())); + } + List originalOrderProcess = pdaSaveService.getOriginalOrderProcess(dsTaskingEntity.getPartCode(), dsTaskingEntity.getBatchNo()); // 转换为Map便于快速查找 Map workPlanMap = new HashMap<>(); @@ -2337,6 +2363,18 @@ public class DsTaskingServiceImpl extends BaseServiceImpl { item.setId(null); item.setProcessId(dsProcessEntity.getId()); + + // 根据项目名称查询项目编码 + if (StringUtils.isEmpty(item.getProjectCode()) && !StringUtils.isEmpty(item.getProjectName())) { + Optional.ofNullable(inspectionItemService.selectByName(item.getProjectName())) + .ifPresent(inspectionItem -> item.setProjectCode(inspectionItem.getId().toString())); + } + + // 根据项目标准名称查询项目标准 + if (StringUtils.isEmpty(item.getProjectStandard()) && !StringUtils.isEmpty(item.getProjectStandardName())) { + Optional.ofNullable(standardService.selectByName(item.getProjectStandardName())) + .ifPresent(standard -> item.setProjectStandard(standard.getId().toString())); + } }); if(!CollectionUtils.isEmpty(processProjectList)){ boolean processProjectSaveBatch = processProjectService.saveBatch(processProjectList); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionItemMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionItemMapper.java index c8f3925fa..77ecabf98 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionItemMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionItemMapper.java @@ -37,4 +37,6 @@ public interface InspectionItemMapper extends BaseMapper { * @return List */ List exportInspectionItem(@Param("ew") Wrapper queryWrapper); + + InspectionItem selectByName(@Param("projectName") String projectName); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionItemMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionItemMapper.xml index 7b7183b25..babb9a722 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionItemMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionItemMapper.xml @@ -36,4 +36,10 @@ SELECT * FROM QA_INSPECTION_ITEM ${ew.customSqlSegment} + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/StandardMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/StandardMapper.java index 10efa4b74..ea6c010ae 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/StandardMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/StandardMapper.java @@ -37,4 +37,6 @@ public interface StandardMapper extends BaseMapper { * @return List */ List exportStandard(@Param("ew") Wrapper queryWrapper); + + Standard selectByName(@Param("projectStandardName") String projectStandardName); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/StandardMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/StandardMapper.xml index 0cbe788a9..7887f5fce 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/StandardMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/StandardMapper.xml @@ -35,4 +35,10 @@ SELECT * FROM QA_STANDARD ${ew.customSqlSegment} + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionItemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionItemService.java index 6ca4d75fc..1111bcf5f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionItemService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionItemService.java @@ -42,4 +42,11 @@ public interface IInspectionItemService extends BaseService { * @param vo */ void setVOValue(InspectionItemVO vo); + + /** + * 根据名称查询 + * @param projectName + * @return + */ + InspectionItem selectByName(String projectName); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IStandardService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IStandardService.java index c643c947e..070fed95a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IStandardService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IStandardService.java @@ -37,4 +37,6 @@ public interface IStandardService extends BaseService { List exportStandard(Wrapper queryWrapper); void setVOValue(StandardVO vo); + + Standard selectByName(String projectStandardName); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionItemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionItemServiceImpl.java index 432eff447..4d04b733c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionItemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionItemServiceImpl.java @@ -48,4 +48,9 @@ public class InspectionItemServiceImpl extends BaseServiceImpl