From 24e0bdd24a10449c98013cdb5bcc5e37735f5a91 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 16 六月 2025 09:04:01 +0800
Subject: [PATCH] 对接刀具系统，涉密网封装结构树与文件
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProductInfoServiceImpl.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 0e11f39..6a6c10f 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
@@ -164,8 +164,8 @@
boolean b = super.updateById(productInfo);
//鍚屾淇敼缁撴瀯鏍�
ProductMix productMix = productMixService.getById(Long.parseLong(id));
- productMix.setName(productInfo.getProductName());
- productMix.setCode(productInfo.getProductNo());
+ productMix.setTreeName(productInfo.getProductName());
+ productMix.setTreeCode(productInfo.getProductNo());
productMixService.updateById(productMix);
if (!b)
return false;
@@ -422,6 +422,7 @@
* @param paramId 浜у搧鏍戣妭鐐筰d
* @param relativeFlag 1 鏄� 2 鍚�
* @param userIds 娣诲姞鐢ㄦ埛ids
+ * todo浼樺寲缁撴瀯锛岄噰鐢╩ix琛ㄨ繘琛岀埗瀛愰�掑綊鏌ヨ锛屽垎绫昏繘琛屾潈闄愬垎閰嶏紙鍗曡〃鏌ヨ锛�
* @return
*/
@Override
@@ -457,6 +458,7 @@
* @param paramId 浜у搧鏍戣妭鐐筰d
* @param relativeFlag 1 鏄� 2 鍚�
* @param departmentIds 娣诲姞閮ㄩ棬ids
+ * todo浼樺寲缁撴瀯锛岄噰鐢╩ix琛ㄨ繘琛岀埗瀛愰�掑綊鏌ヨ锛屽垎绫昏繘琛屾潈闄愬垎閰嶏紙鍗曡〃鏌ヨ锛�
* @return
*/
@Override
@@ -492,6 +494,7 @@
* @param paramId 浜у搧鏍戣妭鐐筰d
* @param relativeFlag 1 鏄� 2 鍚�
* @param userIds 绉婚櫎鐢ㄦ埛ids
+ * todo浼樺寲缁撴瀯锛岄噰鐢╩ix琛ㄨ繘琛岀埗瀛愰�掑綊鏌ヨ锛屽垎绫昏繘琛屾潈闄愬垎閰嶏紙鍗曡〃鏌ヨ锛�
* @return
*/
@Override
@@ -526,6 +529,7 @@
* @param paramId 浜у搧鏍戣妭鐐筰d
* @param relativeFlag 1 鏄� 2 鍚�
* @param departmentIds 绉婚櫎閮ㄩ棬ids
+ * todo浼樺寲缁撴瀯锛岄噰鐢╩ix琛ㄨ繘琛岀埗瀛愰�掑綊鏌ヨ锛屽垎绫昏繘琛屾潈闄愬垎閰嶏紙鍗曡〃鏌ヨ锛�
* @return
*/
@Override
@@ -1041,7 +1045,6 @@
if (treeInfoRequest.getAttributionType() == 1 && StrUtil.isNotBlank(treeInfoRequest.getAttributionId())) {
queryWrapper.eq(ProductInfo::getProductId, treeInfoRequest.getAttributionId());
}
- // 绠�鍖栨潯浠跺垽鏂�
queryWrapper.like(StrUtil.isNotBlank(treeInfoRequest.getTreeCode()), ProductInfo::getProductNo, treeInfoRequest.getTreeCode())
.like(StrUtil.isNotBlank(treeInfoRequest.getTreeName()), ProductInfo::getProductName, treeInfoRequest.getTreeName());
List<ProductInfo> productInfoList = super.list(queryWrapper);
@@ -1050,15 +1053,12 @@
productInfoList=new ArrayList<>();
}
if (CollectionUtil.isNotEmpty(productInfoList)) {
- // 浣跨敤ID鍒楄〃鑰岄潪鎷兼帴瀛楃涓�
- List<String> productIds = productInfoList.stream()
- .map(ProductInfo::getProductId)
- .collect(Collectors.toList());
+ String ids=productInfoList.stream().map(ProductInfo::getProductId).collect(Collectors.joining(","));
DocInfoQueryRequest docQuery = new DocInfoQueryRequest();
BeanUtil.copyProperties(treeInfoRequest, docQuery);
- docQuery.setAttributionIds(productIds.toString()); // 鍋囪setAttributionIds鎺ュ彈List<String>
+ docQuery.setAttributionIds(ids);
docQuery.setDocClassCode("OTHER");
- docQuery.setAttributionType(1);
+ docQuery.setAttributionType(DocAttributionTypeEnum.PRODUCT.getCode());
docInfos = docInfoService.findListByDocQuery(docQuery);
}
// 鍒涘缓鏂拌姹傚璞￠伩鍏嶆薄鏌撳師鍙傛暟
@@ -1069,6 +1069,8 @@
docInfos.addAll(componentInfoService.getByComponentInfo(componentRequest));
docInfos.addAll(partsInfoService.getByPartsInfo(componentRequest));
docInfos.addAll(processSpecVersionService.getByProcessSpecVersion(componentRequest));
+ docInfos.addAll(processStreamService.getByProcessStreamOtherFile(componentRequest));
+ docInfos.addAll(workStepService.getByWorkStepOtherFile(componentRequest));
return getByTreeOtherFileInfo(docInfos);
case 2:
return getByTreeOtherFileInfo(componentInfoService.getByComponentInfo(treeInfoRequest));
@@ -1181,31 +1183,37 @@
ProductInfo productInfo=this.getById(docInfo.getAttributionId());
docInfo.setNodeName(productInfo.getProductName());
docInfo.setNodeCode(productInfo.getProductNo());
+ docInfo.setNodeId(productInfo.getProductId());
break;
case 2:
ComponentInfo componentInfo=componentInfoService.getById(docInfo.getAttributionId());
docInfo.setNodeName(componentInfo.getComponentName());
docInfo.setNodeCode(componentInfo.getComponentCode());
+ docInfo.setNodeId(componentInfo.getComponentId());
break;
case 3:
PartsInfo partsInfo=partsInfoService.getById(docInfo.getAttributionId());
docInfo.setNodeCode(partsInfo.getPartsCode());
docInfo.setNodeName(partsInfo.getPartsName());
+ docInfo.setNodeId(partsInfo.getPartsId());
break;
case 4:
ProcessSpecVersion processSpecVersion=processSpecVersionService.getById(docInfo.getAttributionId());
docInfo.setNodeName(processSpecVersion.getProcessSpecVersionName());
docInfo.setNodeCode(processSpecVersion.getProcessSpecVersionCode());
+ docInfo.setNodeId(processSpecVersion.getId());
break;
case 5:
ProcessStream processStream=processStreamService.getById(docInfo.getAttributionId());
docInfo.setNodeName(processStream.getProcessName());
docInfo.setNodeCode(processStream.getProcessCode());
+ docInfo.setNodeId(processStream.getProcessId());
break;
case 6:
WorkStep workStep=workStepService.getById(docInfo.getAttributionId());
docInfo.setNodeName(workStep.getStepName());
docInfo.setNodeCode(workStep.getStepName());
+ docInfo.setNodeId(workStep.getId());
break;
}
});
@@ -1227,11 +1235,13 @@
ProcessStream processStream=processStreamService.getById(deviceType.getAttributionId());
docInfo.setNodeName(processStream.getProcessName());
docInfo.setNodeCode(processStream.getProcessCode());
+ docInfo.setNodeId(processStream.getProcessId());
}else {
//宸ユ涓嬬殑璁惧绫�
WorkStep workStep=workStepService.getById(deviceType.getAttributionId());
docInfo.setNodeName(workStep.getStepName());
docInfo.setNodeCode(workStep.getStepName());
+ docInfo.setNodeId(workStep.getId());
}
});
}
--
Gitblit v1.9.3