From 3baca21e0e6563f8379359ef2ba78c224eb4bc80 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 23 九月 2025 22:45:51 +0800
Subject: [PATCH] 修复审批表，确认表内容
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeHisService.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeHisService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeHisService.java
index 0556077..3b5118c 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeHisService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeHisService.java
@@ -37,7 +37,7 @@
* @param time
*/
public void mergeNodeToHisGeTime(Date time) {
- Date okTime = DateUtil.minusSeconds(time,10);
+ Date okTime = DateUtil.minusSeconds(time,10);//閬垮厤mysql鏁版嵁搴撴椂闂翠笉绮剧‘瀵艰嚧涓嶈兘鍚屾
List<NcNode> nodes = ncNodeService.lambdaQuery().ge(NcNode::getUpdateTime,okTime)
.in(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE,NcNode.TYPE_PROGRAM_FILE).list();
@@ -55,21 +55,21 @@
}
/**
- * 鏌ヨ鍋忕鍗曠殑搴忓彿
- * @param programPkgNode 鍋忕鍗曠殑绋嬪簭鍖呭悕鑺傜偣
- * @return 搴忓彿
+ * 璁＄畻鐗堟湰鍙�
+ * @param pkgNode 鑺傜偣
+ * @return 鐗堟湰鍙�
*/
- public long getDeviationSerialForNode(NcNodeHis programPkgNode) {
- return lambdaQuery().eq(NcNodeHis::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE)
- .eq(NcNodeHis::getName,programPkgNode.getName())
+ public int calculateVersionNumber(NcNode pkgNode) {
+ NcNodeHis nodeHis = this.lambdaQuery().eq(NcNodeHis::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE).eq(NcNodeHis::getDrawingNo,pkgNode.getDrawingNo())
+ .eq(NcNodeHis::getProcessNo,pkgNode.getProcessNo()).eq(NcNodeHis::getProcessEdition,pkgNode.getProcessEdition())
+ .eq(NcNodeHis::getMachineGroupCode,pkgNode.getMachineGroupCode()).last("limit 1").one();
- .eq(NcNodeHis::getDrawingNo,programPkgNode.getDrawingNo())
- .eq(NcNodeHis::getProcessNo,programPkgNode.getProcessNo())
- .eq(NcNodeHis::getProcessEdition,programPkgNode.getProcessEdition())
-
- .isNotNull(NcNodeHis::getDeviation)
- .le(NcNodeHis::getCreateTime,programPkgNode.getCreateTime()) //鏃堕棿灏忎簬绛変簬褰撳墠鑺傜偣
- .count();
+ if(nodeHis != null && nodeHis.getVersionNumber()!=null){
+ return nodeHis.getVersionNumber()+1;
+ }else{
+ //浠ュ線娌℃湁锛岀敓鎴愪竴涓柊鐨�
+ return 1;
+ }
}
/**
--
Gitblit v1.9.3