From 1e2b04fabbbc4b1ae37d7951068d7ab235f5b5f9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 17 九月 2025 15:29:38 +0800
Subject: [PATCH] 现场编制功能适配
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 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 48d78fd..5ec9172 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
@@ -180,17 +180,7 @@
}
}
- /**
- * 鏌ヨ鑺傜偣鐨勫巻鍙插垪琛紙鑺傜偣鐨勪笂绾ц妭鐐光�濈▼搴忓寘鍚嶁�滃洜涓哄瓨鍦ㄥ涓増鏈紝鎵�浠ュ巻鍙茶褰曚篃闇�瑕佹牴鎹笉鍚岀増鏈▼搴忓寘鍚嶈繘琛屾煡璇級
- * @param id
- * @return
- */
- @Transactional(readOnly = true)
- public List<NcNodeVO> historyByNodeId(Long id) {
- NcNode node = this.getById(id);
- NcNode parentNode = this.getById(node.getParentId());
- return this.baseMapper.historyByParentIdAndName(node.getName(),parentNode);
- }
+
/**
* 鑾峰彇鈥滅▼搴忓寘鍚嶁�濊瘯鍒囩殑鏈�鏂扮増鏈�
@@ -456,9 +446,10 @@
* 鏍规嵁涓婄骇鑺傜偣id锛岀Щ鍔ㄤ笅闈㈢殑鍔犲伐鏈哄簥鑺傜偣
* @param parentId 涓婄骇鑺傜偣id
*/
- public void deleteMachineNodeByParentId(Long parentId) {
- baseMapper.deleteMachineNodeByParentId(parentId);
- }
+ /*
+ public void deleteMachineGroupNodeByParentId(Long parentId) {
+ baseMapper.deleteMachineGroupNodeByParentId(parentId);
+ }*/
/**
* 鍒犻櫎鎵�鍋堕潪鏈�鏂扮増鏈殑鏁版嵁锛坔odeHIs閲岄潰宸茬粡淇濆瓨杩囷級
@@ -466,4 +457,20 @@
public void deleteOldEditionNodeData() {
baseMapper.deleteOldEditionNodeData();
}
+
+ /**
+ * //鏇存柊宸插浐鍖栫殑锛屽悓鍚嶃�佷笉鍚屾満搴婄粍鐨勭▼搴忎负閿佸畾鐘舵��
+ * @param packageNode
+ */
+ public void lockSameNameOtherMachineGroupProgramPackage(NcNode packageNode) {
+ lambdaUpdate().eq(NcNode::getDrawingNo,packageNode.getDrawingNo())
+ .eq(NcNode::getProcessNo,packageNode.getProcessNo())
+ .eq(NcNode::getName,packageNode.getName())
+ .ne(NcNode::getMachineGroupCode,packageNode.getMachineGroupCode())
+ .eq(NcNode::getIsCured,1)
+ .eq(NcNode::getIsLastEdition,1)
+ .set(NcNode::getIsLocked,NcNode.LOCKED)
+ .set(NcNode::getRemark,"鍥炰紶鍥哄寲鍚屽悕绋嬪簭閿佸畾")
+ .update();
+ }
}
--
Gitblit v1.9.3