From 0871a25215fb468f121785600f796a14b54d8ebc Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期五, 06 六月 2025 15:47:00 +0800 Subject: [PATCH] 1.刀具添加字段 2.新增dnc传输日志表 3.导入NC文件默认产生nc文件对应数控程序加工确认表 4.拆分两网 修改yml配置 --- lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/ProcessSpecVersionServiceImpl.java | 8 ++++++-- 1 files changed, 6 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 be15740..6ec4525 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 @@ -515,8 +515,12 @@ List<String> id =new ArrayList<>(); id.add(treeInfoRequest.getAttributionId()); treeInfoRequest.setPsvIds(id); - List<DocInfo> processSpecVersions = processStreamService.getByProcessStreamOtherFile(treeInfoRequest); - docInfos.addAll(processSpecVersions); + //宸ュ簭 + List<DocInfo> processStreams = processStreamService.getByProcessStreamOtherFile(treeInfoRequest); + docInfos.addAll(processStreams); + //宸ユ + List<DocInfo> workSteps = workStepService.getByWorkStepOtherFile(treeInfoRequest); + docInfos.addAll(workSteps); } } return docInfos; -- Gitblit v1.9.3