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 | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 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 173ad44..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
@@ -6,6 +6,7 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.base.BizServiceImpl;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.service.MachineService;
@@ -36,7 +37,8 @@
* @param time
*/
public void mergeNodeToHisGeTime(Date time) {
- List<NcNode> nodes = ncNodeService.lambdaQuery().ge(NcNode::getUpdateTime,time)
+ 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();
for(NcNode node : nodes){
@@ -53,20 +55,42 @@
}
/**
- * 鏌ヨ鍋忕鍗曠殑搴忓彿
- * @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())
+ if(nodeHis != null && nodeHis.getVersionNumber()!=null){
+ return nodeHis.getVersionNumber()+1;
+ }else{
+ //浠ュ線娌℃湁锛岀敓鎴愪竴涓柊鐨�
+ return 1;
+ }
+ }
- .isNotNull(NcNodeHis::getDeviation)
- .le(NcNodeHis::getCreateTime,programPkgNode.getCreateTime()) //鏃堕棿灏忎簬绛変簬褰撳墠鑺傜偣
- .count();
+ /**
+ * 鏌ヨ鑺傜偣鐨勫巻鍙插垪琛紙鑺傜偣鐨勪笂绾ц妭鐐光�濈▼搴忓寘鍚嶁�滃洜涓哄瓨鍦ㄥ涓増鏈紝鎵�浠ュ巻鍙茶褰曚篃闇�瑕佹牴鎹笉鍚岀増鏈▼搴忓寘鍚嶈繘琛屾煡璇級
+ * @param id
+ * @return
+ */
+ @Transactional(readOnly = true)
+ public List<NcNodeVO> historyByNodeId(Long id) {
+ NcNodeHis node = this.getById(id);
+ /*
+ List<NcNodeHis> nodes = lambdaQuery().eq(NcNodeHis::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE)
+ .eq(NcNodeHis::getHisSerial, node.getHisSerial()).orderByDesc(NcNodeHis::getCreateTime).list();
+ List<NcNodeVO> voList = new ArrayList<>();
+ nodes.forEach(ncNode -> {
+ NcNodeVO vo = new NcNodeVO();
+ BeanUtils.copyProperties(ncNode, vo);
+ vo.setCreateUserName();
+ voList.add(vo);
+ });*/
+ return this.baseMapper.packageHistoryBySerial(node.getHisSerial());
+ //return voList;
}
}
--
Gitblit v1.9.3