From 56558ee76f0b3d5226afe6446e70975db698492f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 24 八月 2025 18:12:29 +0800
Subject: [PATCH] 增加工控网导入 历史 查看文件功能
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java | 58 ++++++++++++++++++----------------------------------------
1 files changed, 18 insertions(+), 40 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
index 80a5ce7..62d36d6 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
@@ -96,28 +96,6 @@
return this.getBaseMapper().getLastProgramNode(name);
}
-
- /**
- * 杞﹁鑺傜偣
- * @param queryVO
- * @return
- */
- /*
- public List<Long> searchDrawing(NcNodeQueryVO queryVO) {
- List<NcNode> nodes = lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_DRAWING_NO)
- .eq(NcNode::getIsLastEdition,1)
- .eq(NcNode::getName,queryVO.getDrawingNo())
- .ge(queryVO.getCreateTimeBegin()!=null,NcNode::getCreateTime,queryVO.getCreateTimeBegin())
- .le(queryVO.getCreateTimeEnd()!=null,NcNode::getCreateTime,queryVO.getCreateTimeEnd())
- .and(i->{
-
- i.or().likeRight(queryVO.getProgramStatus().contains("1"),NcNode::getParentIds,"0,1,");
- i.or().likeRight(queryVO.getProgramStatus().contains("2"),NcNode::getParentIds,"0,2,");
- i.or().likeRight(queryVO.getProgramStatus().contains("3"),NcNode::getParentIds,"0,3,");
- }).list();
-
- return nodes.stream().map(NcNode::getId).toList();
- }*/
/**
* 棣栭〉鏍戞煡璇�
* @param queryVO
@@ -201,24 +179,6 @@
addNodeChildren(child, allNodes);
}
}
- }
-
-
- /**
- * 鑾峰彇绋嬪簭鍖呭悕鐨勬暟鎹�
- * @param programName 绋嬪簭鍚嶇О锛堢▼搴忓寘鍚嶏級
- * @return 绋嬪簭鎶ュ寘鍚嶇殑鑺傜偣
- */
- public NcNode getProgramPackageByName(String programName) {
- List<NcNode> pkgs = this.lambdaQuery().eq(NcNode::getName, programName)
- .eq(NcNode::getIsLastEdition,1)
- .eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE).list();
- if(pkgs.isEmpty()){
- return null;
- }else{
- return pkgs.get(0);
- }
-
}
/**
@@ -406,4 +366,22 @@
node.unlock();
this.updateById(node);
}
+
+ /**
+ * 鏌ヨ鍋忕鍗曠殑搴忓彿
+ * @param programPkgNode 鍋忕鍗曠殑绋嬪簭鍖呭悕鑺傜偣
+ * @return 搴忓彿
+ */
+ public long getDeviationSerialForNode(NcNode programPkgNode) {
+ return lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE)
+ .eq(NcNode::getName,programPkgNode.getName())
+
+ .eq(NcNode::getDrawingNo,programPkgNode.getDrawingNo())
+ .eq(NcNode::getProcessNo,programPkgNode.getProcessNo())
+ .eq(NcNode::getProcessEdition,programPkgNode.getProcessEdition())
+
+ .isNotNull(NcNode::getDeviation)
+ .le(NcNode::getCreateTime,programPkgNode.getCreateTime()) //鏃堕棿灏忎簬绛変簬褰撳墠鑺傜偣
+ .count();
+ }
}
--
Gitblit v1.9.3