diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsCraftController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsCraftController.java index 3f54c4853..34d40da38 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsCraftController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsCraftController.java @@ -142,8 +142,8 @@ public class DsCraftController extends BladeController { @GetMapping("/getVersion") @ApiOperationSupport(order = 1) @Operation(summary = "获取版本号", description = "传入零件ID") - public R> getVersion(Long partId) { - return R.data(dsCraftService.getVersion(partId)); + public R> getVersion(String partCode) { + return R.data(dsCraftService.getVersion(partCode)); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftService.java index b04c7e10c..f40910bc8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/IDsCraftService.java @@ -83,7 +83,7 @@ public interface IDsCraftService extends BaseService { * @return */ - List getVersion(Long partId); + List getVersion(String partCode); /** * 根据零件ID查询工艺列表 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java index fdf1d60c1..a188bfb32 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsCraftServiceImpl.java @@ -127,17 +127,17 @@ public class DsCraftServiceImpl extends BaseServiceImpl getVersion(Long partId) { + public List getVersion(String partCode) { //根据零件ID查询零件编码 - DsPartEntity part = partService.getById(partId); - if(null == part){ - throw new ServiceException("零件ID不存在 "+partId); + List dsPartEntityList = partService.selectDsPartByPatCode(partCode); + if(CollectionUtils.isEmpty(dsPartEntityList)){ + throw new ServiceException("零件号:"+partCode+"不存在 "); } //根据编码 查询版本号 - List partVersionList = partVersionService.selectByPartCode(part.getPartCode()); + List partVersionList = partVersionService.selectByPartCode(partCode); if(CollectionUtils.isEmpty(partVersionList)){ - throw new IllegalArgumentException(partId+" 没有版本号信息"); + throw new IllegalArgumentException(partCode+" 没有版本号信息"); } return partVersionList; }