From e935889261ef38c8eaef31e54cbfc466d63d2ef4 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期四, 17 七月 2025 09:42:28 +0800
Subject: [PATCH] fanuc获取程序名、获取报警描述
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/DispatchFileServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/DispatchFileServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/DispatchFileServiceImpl.java
index a771833..6709cea 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/DispatchFileServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/DispatchFileServiceImpl.java
@@ -412,19 +412,22 @@
checkParam(dispatchFile);
//鑾峰彇鏂囦欢淇℃伅
DocInfo docInfo = docInfoService.getById(dispatchFile.getDocId());
+ if (docInfo.getDocDispatchStatus()==5){
+ return Result.error("瀹氬瀷宸查�氳繃,涓嶈兘閲嶅鎿嶄綔");
+ }
PermissionStreamNew permissionStreams = getPermissionStreams(dispatchFile);
if (permissionStreams==null){
return Result.error("鐢ㄦ埛娌℃湁鏉冮檺");
}
super.save(dispatchFile);
flowCommonService.initActBusiness(docInfo.getDocName()+"."+docInfo.getDocSuffix()+"鏂囦欢杩涜瀹氬瀷",
- dispatchFile.getId(), "IDispatchFileService", "process_rf27duhy", null);
+ dispatchFile.getId(), "IDispatchFileService", "ncFileSettingProcessApproval", null);
Map<String, Object> variables = new HashMap<>();
variables.put("dataId", dispatchFile.getId());
variables.put("organization", "瀵煎叆鏂囨。榛樿鍚姩娴佺▼");
variables.put("comment", "瀵煎叆鏂囨。榛樿鍚姩娴佺▼");
variables.put("proofreading",true);
- Result result= flowDefinitionService.startProcessInstanceByKey("process_rf27duhy", variables);
+ Result result= flowDefinitionService.startProcessInstanceByKey("ncFileSettingProcessApproval", variables);
if (!result.isSuccess())
super.removeById(dispatchFile.getId());
return result;
--
Gitblit v1.9.3