From f2f8241dd52ef12ec109f6f4f0f13042055338ac Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 14 二月 2025 14:55:56 +0800
Subject: [PATCH] 修改指派设备 修改设备结构树权限 优化查询 优化排序
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductInfoServiceImpl.java | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductInfoServiceImpl.java
index d7a58a7..c7867fa 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductInfoServiceImpl.java
@@ -76,6 +76,8 @@
private IProcessionDepartmentService processionDepartmentService;
@Autowired
private IMdcProductionService mdcProductionService;
+ @Autowired
+ private IDocRelativeService iDocRelativeService;
@Override
@Transactional(rollbackFor = {Exception.class})
@@ -236,6 +238,11 @@
if(processStreams != null && !processStreams.isEmpty())
ExceptionCast.cast(ProductInfoCode.PRODUCT_PROCESS_EXIST);
boolean b = productPermissionService.deleteByProductId(id);
+ //楠岃瘉鏄惁瀛樺湪鏂囨。
+ List<DocRelative> docRelativeList=iDocRelativeService.list(new QueryWrapper<DocRelative>().eq("attribution_type","1").eq("attribution_id",id));
+ if (!docRelativeList.isEmpty()){
+ ExceptionCast.cast(ProductInfoCode.PRODUCT_DOC_EXIST);
+ }
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
b = productDepartmentService.deleteByProductId(id);
@@ -247,18 +254,6 @@
b = permissionStreamService.deleteDepartPermsByProductId(id);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
- b = docInfoService.deleteByProductId(id);
- if(!b)
- ExceptionCast.cast(CommonCode.FAIL);
- //娣诲姞鏃ュ織
- NcLogInfo ncLogInfo = new NcLogInfo();
- //妯″潡
- ncLogInfo.setModuleInfo("浜у搧缁撴瀯鏍�");
- //绫诲瀷
- ncLogInfo.setOperateType(4);
- //鏃ュ織鍐呭
- ncLogInfo.setLogContent("浜у搧鍚嶇О锛�"+productInfo.getProductName());
- iNcLogInfoService.saveLogNcInfos(ncLogInfo);
return super.removeById(id);
}
@@ -1926,4 +1921,27 @@
return ProductTreeWrapper.loadTree(productInfoList, componentExtList, partsInfos,processStreams,workSteps);
}
+
+ @Override
+ public boolean deleteProductTree(String id, Integer type){
+ switch (type) {
+ //浜у搧
+ case 1:
+ return deleteProductInfo(id);
+ //閮ㄩ棬
+ case 2:
+ return componentInfoService.deleteComponentInfo(id);
+ //闆朵欢
+ case 3:
+ return partsInfoService.deletePartsInfo(id);
+ //宸ュ簭
+ case 5:
+ return processStreamService.deleteProcessStream(id);
+ //宸ユ
+ case 6:
+ return workStepService.deleteWorkStep(id);
+ default:
+ }
+ return false;
+ }
}
--
Gitblit v1.9.3