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/NcNodeService.java | 98 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 71 insertions(+), 27 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 d65e692..4351b6d 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,30 +180,20 @@
}
}
- /**
- * 鏌ヨ鑺傜偣鐨勫巻鍙插垪琛紙鑺傜偣鐨勪笂绾ц妭鐐光�濈▼搴忓寘鍚嶁�滃洜涓哄瓨鍦ㄥ涓増鏈紝鎵�浠ュ巻鍙茶褰曚篃闇�瑕佹牴鎹笉鍚岀増鏈▼搴忓寘鍚嶈繘琛屾煡璇級
- * @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);
- }
+
/**
* 鑾峰彇鈥滅▼搴忓寘鍚嶁�濊瘯鍒囩殑鏈�鏂扮増鏈�
* @param name 鑺傜偣鍚嶇О
* @return 鏈�鏂扮増鏈▼搴忔姤鍚嶈妭鐐�
*/
- public NcNode getLastEditionTryingProgramPackage(String name,String processEdition){
+ public NcNode getLastEditionTryingProgramPackage(String name){
//.or(NcNode::getIsCured,0)
List<NcNode> pkgList = lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE)
.eq(NcNode::getName, name).and(i->{
i.eq(NcNode::getIsCured, 0).or().isNull(NcNode::getIsCured);
}).likeRight(NcNode::getParentIds,"0,1,")
- .eq(NcNode::getIsLastEdition,1).eq(NcNode::getProcessEdition,processEdition).orderByDesc(NcNode::getCreateTime).list();
+ .eq(NcNode::getIsLastEdition,1).orderByDesc(NcNode::getCreateTime).list();//.eq(NcNode::getProcessEdition,processEdition)
if(pkgList.isEmpty()){
return null;
@@ -229,14 +219,40 @@
}
/**
- * 鑾峰彇node鐨勫巻鍙插垪琛�(鍚屼竴涓埗鑺傜偣涓嬶紝鍚屽悕鐨勬墍鏈夎妭鐐癸級
+ * 鑾峰彇璇曞垏鑺傜偣node鐨勫巻鍙插垪琛�(闆剁粍浠跺彿锛屽伐搴忓彿锛屽伐搴忕増鏈紝鏈哄簥缁勶級
* @param pkgNode node
* @return 鍘嗗彶鍒楄〃锛屾姤閿欒妭鐐规湰韬�
*/
- public List<NcNode> getNodeHistory(NcNode pkgNode) {
+ public List<NcNode> getTryNodeHistory(NcNode pkgNode) {
+ return this.lambdaQuery().eq(NcNode::getDrawingNo,pkgNode.getDrawingNo())
+ .eq(NcNode::getProcessNo,pkgNode.getProcessNo())
+ .eq(NcNode::getProcessEdition,pkgNode.getProcessEdition())
+ .eq(NcNode::getMachineGroupCode,pkgNode.getMachineGroupCode())
+ .likeLeft(NcNode::getParentIds,"0,1,")
+ .list();//.ne(NcNode::getId,pkgNode.getId())
+ /*
return this.lambdaQuery().eq(NcNode::getParentId,pkgNode.getParentId())
.eq(NcNode::getName,pkgNode.getName()).list();//.ne(NcNode::getId,pkgNode.getId())
+
+ */
}
+
+ /**
+ * 璁＄畻鍘嗗彶搴忓彿锛屾牴鎹浂缁勪欢鍙凤紝宸ュ簭鍙凤紝宸ュ簭鐗堟锛屾満搴婄粍鏌ヨ锛屾煡璇㈤亾鍒欎娇鐢ㄨ鍘嗗彶缂栧彿锛屾煡璇笉鍒颁娇鐢ㄦ柊鐢熸垚鐨�
+ */
+ public long calculateHistorySerial(NcNode pkgNode) {
+ NcNode node = this.lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE).eq(NcNode::getDrawingNo,pkgNode.getDrawingNo())
+ .eq(NcNode::getProcessNo,pkgNode.getProcessNo()).eq(NcNode::getProcessEdition,pkgNode.getProcessEdition())
+ .eq(NcNode::getMachineGroupCode,pkgNode.getMachineGroupCode()).last("limit 1").one();
+
+ if(node != null && node.getHisSerial()!=null){
+ return node.getHisSerial();
+ }else{
+ //浠ュ線娌℃湁锛岀敓鎴愪竴涓柊鐨�
+ return System.currentTimeMillis();//浣跨敤褰撳墠姣鏁�
+ }
+ }
+
/**
* 鐢熸垚绋嬪簭鍖呭悕/绋嬪簭鍚嶇О
@@ -253,10 +269,10 @@
* @param programPkgName
* @return
*/
- public NcNode getLastEditionCuredProgramPackage(String programPkgName,String processEdition) {
+ public NcNode getLastEditionCuredProgramPackage(String programPkgName) {
List<NcNode> nodes = lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE)
.eq(NcNode::getName, programPkgName).likeRight(NcNode::getParentIds,"0,2,").eq(NcNode::getIsCured,1)
- .eq(NcNode::getProcessEdition, processEdition)
+ //.eq(NcNode::getProcessEdition, processEdition)
.eq(NcNode::getIsLastEdition,1).list();
if(nodes.isEmpty()){
@@ -292,18 +308,20 @@
/**
* 鑾峰彇鏈�鏂扮殑鍥哄寲绋嬪簭锛屼笉鐢ㄥ伐搴忕増娆″尮閰�
- * @param programPkgName
+ * @param drawingNo
+ * @param processNo
* @param machineCode
* @return
*/
- public NcNode getLastCuredProgramPackageWithoutProcessEdition(String programPkgName,String machineCode) {
+ public NcNode getLastCuredProgramWithoutProcessEdition(String drawingNo, String processNo, String machineCode) {
Machine machine = machineService.getByCode(machineCode);
- List<Machine> sameGroupMachines = machineService.lambdaQuery().eq(Machine::getMachineGroupCode,machine.getMachineGroupCode()).list();
- List<String> machineCodesInGroup = sameGroupMachines.stream().map(Machine::getCode).toList();
+ //List<Machine> sameGroupMachines = machineService.lambdaQuery().eq(Machine::getMachineGroupCode,machine.getMachineGroupCode()).list();
+ //List<String> machineCodesInGroup = sameGroupMachines.stream().map(Machine::getCode).toList();
List<NcNode> nodes = lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE)
- .eq(NcNode::getName, programPkgName)
+ .eq(NcNode::getDrawingNo, drawingNo).eq(NcNode::getProcessNo, processNo)
.likeRight(NcNode::getParentIds,"0,2,").eq(NcNode::getIsCured,1)
- .in(!machineCodesInGroup.isEmpty(),NcNode::getMachineCode,machineCodesInGroup)
+ .eq(NcNode::getMachineGroupCode,machine.getMachineGroupCode())
+ //.in(!machineCodesInGroup.isEmpty(),NcNode::getMachineCode,machineCodesInGroup)
.eq(NcNode::getIsLastEdition,1).orderByDesc(NcNode::getCreateTime).list();
if(nodes.isEmpty()){
@@ -318,10 +336,10 @@
* @param programPkgName 绋嬪簭鍖呭悕
* @return 鍋忕鐨勭▼搴忚妭鐐�
*/
- public NcNode getLastEditionDeviationProgramPackage(String programPkgName,String processEdition) {
+ public NcNode getLastEditionDeviationProgramPackage(String programPkgName) {//,String processEdition
List<NcNode> nodes = lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE)
.eq(NcNode::getName, programPkgName)
- .eq(NcNode::getProcessEdition, processEdition)
+ //.eq(NcNode::getProcessEdition, processEdition)
.likeRight(NcNode::getParentIds,"0,3,")
.eq(NcNode::getIsLastEdition,1).list();
@@ -399,6 +417,7 @@
* @param programPkgNode 鍋忕鍗曠殑绋嬪簭鍖呭悕鑺傜偣
* @return 搴忓彿
*/
+ /*
public long getDeviationSerialForNode(NcNode programPkgNode) {
return lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE)
.eq(NcNode::getName,programPkgNode.getName())
@@ -411,12 +430,37 @@
.le(NcNode::getCreateTime,programPkgNode.getCreateTime()) //鏃堕棿灏忎簬绛変簬褰撳墠鑺傜偣
.count();
}
+ */
/**
* 鏍规嵁涓婄骇鑺傜偣id锛岀Щ鍔ㄤ笅闈㈢殑鍔犲伐鏈哄簥鑺傜偣
* @param parentId 涓婄骇鑺傜偣id
*/
- public void deleteMachineNodeByParentId(Long parentId) {
- baseMapper.deleteMachineNodeByParentId(parentId);
+ /*
+ public void deleteMachineGroupNodeByParentId(Long parentId) {
+ baseMapper.deleteMachineGroupNodeByParentId(parentId);
+ }*/
+
+ /**
+ * 鍒犻櫎鎵�鍋堕潪鏈�鏂扮増鏈殑鏁版嵁锛坔odeHIs閲岄潰宸茬粡淇濆瓨杩囷級
+ */
+ 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