From 103f52ade0f77e420dec306ea3b51d0a3c0ac3ee Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期三, 19 三月 2025 13:23:12 +0800 Subject: [PATCH] art: 设备管理-系统业务编码生成,工艺参数维护功能修改 --- lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessSpecVersionServiceImpl.java | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessSpecVersionServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessSpecVersionServiceImpl.java index 370f098..bec7eda 100644 --- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessSpecVersionServiceImpl.java +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessSpecVersionServiceImpl.java @@ -45,6 +45,10 @@ private IProcessSpecVersionDepartmentService processSpecVersionDepartmentService; @Autowired private IProductMixService productMixService; + @Autowired + private IWorkStepService workStepService; + @Autowired + private IProductPermissionService productPermissionService; /** * 鏍规嵁鐢ㄦ埛id鑾峰彇鎺堟潈鐨勫伐鑹鸿绋嬬増鏈〃淇℃伅 * @param userId @@ -144,9 +148,14 @@ ExceptionCast.cast(CommonCode.FAIL); } } + //娣诲姞鐢ㄦ埛鏉冮檺 + b = productPermissionService.add(ProcessSpecVersion.getId(), userId,"4"); + if (!b) { + ExceptionCast.cast(ProductInfoCode.PRODUCT_SAVE_ERROR); + } //娣诲姞缁撴瀯鏍� ProductMix productMix = new ProductMix(Long.parseLong(ProcessSpecVersion.getId()),Long.parseLong(ProcessSpecVersion.getPartsId()) - ,ProcessSpecVersion.getProcessSpecVersionName(),ProcessSpecVersion.getProcessSpecVersionCode(),"4"); + ,ProcessSpecVersion.getProcessSpecVersionName(),ProcessSpecVersion.getProcessSpecVersionCode(),4); productMixService.save(productMix); //娣诲姞鐢ㄦ埛鏉冮檺 PermissionStreamNew stream = new PermissionStreamNew(); @@ -178,6 +187,11 @@ processSpecVersion.setComponentId(null); processSpecVersion.setPartsId(null); boolean b = super.updateById(processSpecVersion); + //鍚屾淇敼缁撴瀯鏍� + ProductMix productMix = productMixService.getById(Long.parseLong(id)); + productMix.setName(processSpecVersion.getProcessSpecVersionName()); + productMix.setCode(processSpecVersion.getProcessSpecVersionCode()); + productMixService.updateById(productMix); if(!b) return false; ProcessSpecVersionPermission permission = processSpecVersionPermissionService.getByPsvIdAndUserId(id, userId); @@ -211,7 +225,7 @@ ExceptionCast.cast(PartsInfoCode.PARTS_NOT_EXIST); List<ProcessStream> processStreams = processStreamService.findBypsvId(id); if(processStreams!= null &&!processStreams.isEmpty()) - ExceptionCast.cast(PartsInfoCode.PARTS_PROCESS_EXIST); + ExceptionCast.cast(PartsInfoCode.PROCESSSPECVERSION_PROCESS_EXIST); boolean b = processSpecVersionPermissionService.deleteByPsvId(processSpecVersion.getId()); if(!b) ExceptionCast.cast(CommonCode.FAIL); @@ -439,6 +453,8 @@ */ @Override public Result<?> getProcessSpecVersionCount(String processSpecId){ + List<ProcessStream> list = processStreamService.findBypsvId(processSpecId); + List<WorkStep> workStepList=workStepService.list(new LambdaQueryWrapper<WorkStep>().eq(WorkStep::getPsvId,processSpecId)); return null; } } -- Gitblit v1.9.3