From 86947cb8428af1a322bb59961f567296fdfaad93 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 09 八月 2025 10:51:27 +0800
Subject: [PATCH] 机床按机构查询功能开发
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
index 11e0ec2..1c31720 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
@@ -39,7 +39,7 @@
/**
* 鍚姩娲惧伐娴佺▼
- * @param startVO
+ * @param startVO 琛ㄥ崟鏁版嵁
* @return 娴佺▼瀹炰緥id
*/
@Transactional
@@ -67,13 +67,14 @@
String programPkgName = NcNodeService.genProgramName(startVO.getDrawingNo(),startVO.getProcessNo());
- NcNode programPkg = ncNodeService.getLastEditionCuredProgramPackage(programPkgName);
+ NcNode curedProgramPackage = ncNodeService.getLastEditionCuredProgramPackage(programPkgName);
//璁剧疆鏄惁鏈夊浐鍖栫▼搴忔爣璁�
- vars.put(FlowContants.HAS_CURED_PROGRAM,programPkg != null ? FlowContants.Y:FlowContants.N);
+ vars.put(FlowContants.HAS_CURED_PROGRAM,curedProgramPackage != null ? FlowContants.Y:FlowContants.N);
//宸ュ簭鐗堟鏄惁涓�鑷达紝鏄惁鍦ㄦ湁鏁堟湡鍐�
- if(programPkg != null){
- vars.put(FlowContants.IS_PROCESS_EDITION_SAME, StringUtils.equals(programPkg.getProcessEdition(),startVO.getProcessEdition()) ? "Y":"N");
- vars.put(FlowContants.VALIDITY_PERIOD, programPkg.withinValidityPeriod() ? FlowContants.Y:FlowContants.N);
+ if(curedProgramPackage != null){
+ vars.put(FlowContants.CURED_NODE_ID,curedProgramPackage.getId());
+ vars.put(FlowContants.IS_PROCESS_EDITION_SAME, StringUtils.equals(curedProgramPackage.getProcessEdition(),startVO.getProcessEdition()) ? "Y":"N");
+ vars.put(FlowContants.VALIDITY_PERIOD, curedProgramPackage.withinValidityPeriod() ? FlowContants.Y:FlowContants.N);
}else{
vars.put(FlowContants.IS_PROCESS_EDITION_SAME, FlowContants.Y);
vars.put(FlowContants.VALIDITY_PERIOD, FlowContants.Y);
@@ -83,12 +84,8 @@
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.TRY_PROCESS_KEY,businessKey,vars);
- if(programPkg != null) {//瀛樺湪宸插浐鍖栫▼搴忥紝澶嶅埗鍘熸潵鐨勭▼搴忔枃浠躲�傚垱寤鸿妭鐐逛粛鐒跺湪缂栫▼浜哄憳鎻愪氦浠ュ悗
- //programPkg.setIsLastEdition(0);
- //this.ncNodeService.updateById(programPkg);
-
- //cloneNodes(programPkg,inst.getProcessInstanceId());
- copyFlowProgramFiles(programPkg.getProcessInstanceId(),inst.getProcessInstanceId());
+ if(curedProgramPackage != null) {//瀛樺湪宸插浐鍖栫▼搴忥紝澶嶅埗鍘熸潵鐨勭▼搴忔枃浠躲�傚垱寤鸿妭鐐逛粛鐒跺湪缂栫▼浜哄憳鎻愪氦浠ュ悗
+ copyFlowProgramFiles(curedProgramPackage.getProcessInstanceId(),inst.getProcessInstanceId());
}
return inst.getProcessInstanceId();
--
Gitblit v1.9.3