From a7a3e876c467a401ecec1a084acb8edc0927d10b Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 17 六月 2025 13:36:04 +0800
Subject: [PATCH] 1.修改检索nc文件bug 2.新增刀具列表查询接口 3.程序加工确认表确认流程
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
index c5302eb..c876f4e 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessStreamServiceImpl.java
@@ -176,8 +176,8 @@
boolean b = super.updateById(stream);
//鍚屾淇敼缁撴瀯鏍�
ProductMix productMix = productMixService.getById(Long.parseLong(id));
- productMix.setName(stream.getProcessName());
- productMix.setCode(stream.getProcessCode());
+ productMix.setTreeName(stream.getProcessName());
+ productMix.setTreeCode(stream.getProcessCode());
productMixService.updateById(productMix);
if(!b)
ExceptionCast.cast(CommonCode.FAIL);
@@ -540,10 +540,10 @@
List<DeviceType> deviceTypeList = deviceTypeService.getDeviceTypeByAttribution(processIds,
DocAttributionTypeEnum.PROCESS.getCode(),treeInfoRequest.getDeviceManagementName(),treeInfoRequest.getDeviceManagementCode());
if (deviceTypeList != null && !deviceTypeList.isEmpty()) {
- List<String> deviceManagementIds=deviceTypeList.stream().map(DeviceType::getId).collect(Collectors.toList());
+ List<String> deviceTypeIds=deviceTypeList.stream().map(DeviceType::getId).collect(Collectors.toList());
DocInfoQueryRequest docQuery = new DocInfoQueryRequest();
BeanUtil.copyProperties(treeInfoRequest,docQuery);
- docQuery.setAttributionIds(String.join(",",deviceManagementIds));
+ docQuery.setAttributionIds(String.join(",",deviceTypeIds));
docQuery.setDocClassCode("NC");
docQuery.setAttributionType(DocAttributionTypeEnum.PROCESS.getCode());
docInfos=docInfoService.findListByDocQuery(docQuery);
@@ -554,6 +554,10 @@
treeInfoRequest.setProcessIds(id);
List<DocInfo> docInfoList = workStepService.getByWorkStepNCFile(treeInfoRequest);
docInfos.addAll(docInfoList);
+ }else {
+ treeInfoRequest.setProcessIds(processIds);
+ List<DocInfo> docInfoList = workStepService.getByWorkStepNCFile(treeInfoRequest);
+ docInfos.addAll(docInfoList);
}
return docInfos;
}
--
Gitblit v1.9.3