From 88f640713525e88dac333ea3bf7e23e22891ab0f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 23 八月 2025 09:37:14 +0800
Subject: [PATCH] 解决偏离单再次回传验证问题
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 7 +++++--
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java | 8 ++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java
index 79562d7..560a2ee 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcNode.java
@@ -225,4 +225,12 @@
public void unlock() {
this.isLocked = UNLOCK;
}
+
+ /**
+ * 鏄惁宸查攣瀹�
+ * @return 鏄惁
+ */
+ public boolean hasLocked() {
+ return this.isLocked != null && this.isLocked == LOCKED;
+ }
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
index 9d7da5f..9b05349 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
@@ -248,7 +248,6 @@
PackageAndProcessEdition pkgAndEdition = parseProgramPackageFromFolderName(folderName);
String programPackageName = pkgAndEdition.getProgramPackageName();
- //111
Optional<NcNode> optPackageNode = allAcceptPackages.stream().filter(node -> StringUtils.equals(node.getName(),programPackageName)).findFirst();
@@ -261,8 +260,12 @@
throw new ServiceException(programPackageName + "宸茬粡鍥哄寲锛岃鍕块噸澶嶅叆搴撱��");
}
+ //鍋忕绋嬪簭鍒ゆ柇鏄惁閲嶅鍥炰紶
+ if(packageNode.isDeviationProgram() && packageNode.hasLocked()) {
+ throw new ServiceException(programPackageName + "宸查攣瀹氱殑绋嬪簭涓嶅彲浠ュ啀娆″洖浼犮��");
+ }
+
//妫�鏌ユ槸鍚﹀湪瀹℃壒杩囩▼涓�
- //鏍规嵁鑺傜偣淇℃伅鏌ヨ娴佺▼
boolean active = flowCommonService.isProcessInstanceActive(packageNode.getProcessInstanceId());
if(active){
throw new ServiceException(programPackageName+"姝ｅ湪瀹℃壒涓紝璇峰嬁绛夊緟瀹℃壒瀹屾垚銆�");
--
Gitblit v1.9.3