From 349b6ff5bf4443cabfec1e27e4a5f5cc03f2963d Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Mon, 30 Mar 2026 17:12:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AD=90=E4=BB=B6=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/LauncherConstant.java | 2 +- .../controller/DsPartController.java | 3 +- .../dashboard/mapper/DsProcessMapper.java | 2 + .../desk/dashboard/mapper/ProcessMapper.xml | 9 ++ .../dashboard/service/IDsPartService.java | 2 +- .../dashboard/service/IDsProcessService.java | 7 ++ .../service/impl/DsPartServiceImpl.java | 103 ++++++++++++++---- .../service/impl/DsProcessServiceImpl.java | 5 + 8 files changed, 108 insertions(+), 25 deletions(-) diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 23d5edf0..4dec1f26 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -15,7 +15,7 @@ public interface LauncherConstant { // String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; // 生产环境 String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; - // 测试环境 +// 测试环境 // String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java index b923f9f1..5fe08c50 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsPartController.java @@ -267,9 +267,10 @@ public class DsPartController extends BladeController { */ @GetMapping("/test") public R test(@RequestParam String partCode, + @RequestParam String roamNo, @RequestParam String partVersion) { - return R.data(dsPartService.getPartSubList(partCode,partVersion)); + return R.data(dsPartService.getClassCakeWork(partCode,roamNo,partVersion)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java index 0d359039..f978c354 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsProcessMapper.java @@ -75,4 +75,6 @@ public interface DsProcessMapper extends BaseMapper { List selectDsProcessByIds(@Param("processIds")List processIds); List selectOldMesProcessByOldMesCraftId(@Param("oldMesCraftId") Long oldMesCraftId); + + List selectDsProcessByCraftIdList(@Param("craftIds") List craftIds); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml index 82d6ebd3..0d1134d1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/ProcessMapper.xml @@ -52,5 +52,14 @@ resultType="org.springblade.desk.dashboard.pojo.entity.DsProcessEntity"> select * from P_RB_SYNC_PROCESS where CRAFT_ID = #{oldMesCraftId} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java index 47ed052d..18de1a05 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsPartService.java @@ -286,5 +286,5 @@ public interface IDsPartService extends BaseService { * @param partVersion * @return */ - List getClassCake(String partCode,String roamNo,String partVersion); + List getClassCakeWork(String partCode,String roamNo,String partVersion); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java index 4f727183..dcea70e1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsProcessService.java @@ -97,4 +97,11 @@ public interface IDsProcessService extends BaseService { * @return */ List selectOldMesProcessByOldMesCraftId(Long oldMesCraftId); + + /** + * 根据工艺ID集合查询 + * @param craftIds + * @return + */ + List selectDsProcessByCraftIdList(List craftIds); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java index 7835442d..b9e0035d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsPartServiceImpl.java @@ -100,6 +100,9 @@ public class DsPartServiceImpl extends BaseServiceImpl selectDsPartPage(IPage page, DsPartVO dsPart) { @@ -432,29 +435,31 @@ public class DsPartServiceImpl extends BaseServiceImpl partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId()); - List idList = partRelationEntityList.stream() - .map(DsPartRelationEntity::getChildPartId) - .collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(partRelationEntityList)){ + List idList = partRelationEntityList.stream() + .map(DsPartRelationEntity::getChildPartId) + .collect(Collectors.toList()); - List dsPartEntityList = dsPartMapper.selectDsPartByIds(idList); + List dsPartEntityList = dsPartMapper.selectDsPartByIds(idList); - List dsPartVOList = dsPartEntityList.stream() - .map(entity -> { - DsPartVO vo = new DsPartVO(); - BeanUtils.copyProperties(entity, vo); + List dsPartVOList = dsPartEntityList.stream() + .map(entity -> { + DsPartVO vo = new DsPartVO(); + BeanUtils.copyProperties(entity, vo); - if (vo.getUpdateUser() != null) { - String userName = userClient.userInfo(Func.toLong(vo.getUpdateUser())) - .getData() - .getUser() - .getName(); - vo.setUpdateUserStr(userName); - } - return vo; - }) - .collect(Collectors.toList()); + if (vo.getUpdateUser() != null) { + String userName = userClient.userInfo(Func.toLong(vo.getUpdateUser())) + .getData() + .getUser() + .getName(); + vo.setUpdateUserStr(userName); + } + return vo; + }) + .collect(Collectors.toList()); - dsPartSynthesisVO.setDsPartVOList(dsPartVOList); + dsPartSynthesisVO.setDsPartVOList(dsPartVOList); + } } dsPartSynthesisVO.setDsPartEntity(partEntity); @@ -718,12 +723,12 @@ public class DsPartServiceImpl extends BaseServiceImpl getPartSubList(String partCode, String partVersion) { //校验零件号 if(StringUtils.isEmpty(partCode)){ - throw new ServiceException("零件号不能为空"); + return null; } //查询零件是否存在 List dsPartEntityList = this.selectDsPartByPatCode(partCode); if(CollectionUtils.isEmpty(dsPartEntityList)){ - throw new ServiceException("零件不存在"); + return null; } //查询零件 @@ -742,7 +747,61 @@ public class DsPartServiceImpl extends BaseServiceImpl getClassCake(String partCode, String roamNo, String partVersion) { + public List getClassCakeWork(String partCode, String roamNo, String partVersion) { + + //校验零件号 + if(StringUtils.isEmpty(partCode)){ + return null; + } + + //查询零件是否存在 + List dsPartEntityList = this.selectDsPartByPatCode(partCode); + if(CollectionUtils.isEmpty(dsPartEntityList)){ + return null; + } + + //查询零件 + DsPartEntity partEntity = this.selectDsPartByPatCodeAndVersion(partCode, partVersion); + + //不是玻璃饼 + if(null == partEntity.getSinTerType()){ + return null; + } + + //校验是否是玻璃饼 + if (DsPartSub.SIN_TER_TYPE_BLB.intValue() == partEntity.getSinTerType()) { + List dsCraftEntityList = null; + if(!StringUtils.isEmpty(roamNo)){ + dsCraftEntityList = craftService.selectDsCraftByPartIdAndRoamNo(partEntity.getId(), roamNo); + }else { + dsCraftEntityList = craftService.listByPartId(partEntity.getId()); + } + + if(CollectionUtils.isEmpty(dsCraftEntityList)){ + return null; + } + List craftIds = dsCraftEntityList.stream() + .map(DsCraftEntity::getId) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + + //查询工序 + List processList = processService.selectDsProcessByCraftIdList(craftIds); + if(CollectionUtils.isEmpty(processList)){ + return null; + } + + List processIds = processList.stream() + .map(DsProcessEntity::getId) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + + //查询工装 + List processMoldToolEntityList = processMoldToolService.selectDsProcessMoldToolByProcessIds(processIds); + + return processMoldToolEntityList; + } + return null; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java index 37ca2a90..6e21aa07 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsProcessServiceImpl.java @@ -165,4 +165,9 @@ public class DsProcessServiceImpl extends BaseServiceImpl selectDsProcessByCraftIdList(List craftIds) { + return processMapper.selectDsProcessByCraftIdList(craftIds); + } + }