From e920333163b4f94c4aa88d361cb6eb2553cbdcd1 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Mon, 30 Mar 2026 15:16:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erpdata/feign/IErpMesRbWoClient.java | 2 +- .../controller/DsPartController.java | 4 +-- .../dashboard/service/IDsPartService.java | 18 +++++++++++++ .../service/impl/DsPartServiceImpl.java | 27 +++++++++++++++++++ 4 files changed, 47 insertions(+), 4 deletions(-) diff --git a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java index c55f6036..aec14320 100644 --- a/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java +++ b/blade-service-api/blade-erpdata-api/src/main/java/org/springblade/erpdata/feign/IErpMesRbWoClient.java @@ -22,7 +22,7 @@ import java.util.List; ) public interface IErpMesRbWoClient { - String API_PREFIX = "/feign/client/mesrbwo"; + String API_PREFIX = "/feign/erpdata/mesrbwo"; String GET_LIST = API_PREFIX + "/getList"; String GET_WO = API_PREFIX + "/getWoOne"; String SYN_MES_WO = API_PREFIX + "/synMesRbWo"; 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 5c78154d..b923f9f1 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,11 +267,9 @@ public class DsPartController extends BladeController { */ @GetMapping("/test") public R test(@RequestParam String partCode, - @RequestParam String roamNo, - @RequestParam String rank, @RequestParam String partVersion) { - return R.data(dsPartService.selectPartCraft(partCode,roamNo,rank,partVersion)); + return R.data(dsPartService.getPartSubList(partCode,partVersion)); } 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 5ab07758..47ed052d 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 @@ -269,4 +269,22 @@ public interface IDsPartService extends BaseService { * @return */ DsPartVersionEntity getNewPartVersion(String partCode); + + /** + * 获取子件 + * @param partCode + * @param partVersion + * @return + */ + List getPartSubList(String partCode,String partVersion); + + + /** + * 玻璃饼：查询工序下的工装 + * @param partCode + * @param roamNo + * @param partVersion + * @return + */ + List getClassCake(String partCode,String roamNo,String partVersion); } 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 68b97982..80886187 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 @@ -714,6 +714,33 @@ public class DsPartServiceImpl extends BaseServiceImpl getPartSubList(String partCode, String partVersion) { + //校验零件号 + if(StringUtils.isEmpty(partCode)){ + throw new ServiceException("零件号不能为空"); + } + //查询零件是否存在 + List dsPartEntityList = this.selectDsPartByPatCode(partCode); + if(CollectionUtils.isEmpty(dsPartEntityList)){ + throw new ServiceException("零件不存在"); + } + + //查询零件 + DsPartEntity partEntity = this.selectDsPartByPatCodeAndVersion(partCode, partVersion); + + List partRelationEntityList = partRelationService.selectDsPartRelationByPartId(partEntity.getId()); + + List validChildPartIds = partRelationEntityList.stream() + .map(DsPartRelationEntity::getChildPartId) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + + List dsPartEntityList1 = this.selectDsPartByIds(validChildPartIds); + + return dsPartEntityList1; + } + /** * 创建维护任务 */ From 4856902ddf10dfa993170d8b2c118555f03ab946 Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Mon, 30 Mar 2026 15:17:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/dashboard/service/impl/DsPartServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) 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 80886187..7835442d 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 @@ -741,6 +741,11 @@ public class DsPartServiceImpl extends BaseServiceImpl getClassCake(String partCode, String roamNo, String partVersion) { + return null; + } + /** * 创建维护任务 */