From d15e1f37f3b0518c1e5a181c5f9c70d34e9dd6a4 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 25 六月 2025 14:14:59 +0800
Subject: [PATCH] 工控网更新
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignEquipmentFileStreamServiceImpl.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignEquipmentFileStreamServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignEquipmentFileStreamServiceImpl.java
index 68972da..96d91ed 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignEquipmentFileStreamServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/impl/AssignEquipmentFileStreamServiceImpl.java
@@ -5,7 +5,9 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.flowable.common.engine.api.FlowableException;
import org.flowable.engine.TaskService;
+import org.flowable.identitylink.api.IdentityLink;
import org.flowable.task.api.Task;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.vo.LoginUser;
@@ -29,6 +31,7 @@
import org.jeecg.modules.dncFlow.mapper.AssignEquipmentFileStreamMapper;
import org.jeecg.modules.dncFlow.service.IAssignEquipmentFileStreamService;
import org.jeecg.modules.dncFlow.vo.AssignEquipmentFileStreamVo;
+import org.jeecg.modules.dncFlow.vo.DispatchFileFlowTaskVo;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
@@ -38,6 +41,7 @@
import org.jeecg.modules.mdc.entity.MdcEquipment;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.system.service.IMdcProductionService;
+import org.jeecg.modules.system.service.ISysUserRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
@@ -127,6 +131,16 @@
if(productDocInfo==null){
return Result.error("鏈彂鐜拌浜у搧缁撴瀯鏍戝搴旀枃妗�");
}
+ if (productDocInfo.getDocDispatchStatus()==5){
+ return Result.error("宸茶瀹氬瀷鐨勬枃妗ｄ笉鑳借繘琛屽崌鐗�");
+ }
+ //鏄惁鍙堣繘琛岀殑鍗囩増
+ AssignEquipmentFileStream productAssignEquipmentFileStream = this.getOne(
+ new QueryWrapper<AssignEquipmentFileStream>().eq("doc_id", productDocInfo.getDocId())
+ .isNull("audit_type"));
+ if(productAssignEquipmentFileStream!=null){
+ return Result.error("璇ユ枃妗ｅ凡缁忚繘琛岃繃鍗囩増");
+ }
//鑾峰彇浜у搧鏂囨。淇℃伅瀵瑰簲鏈�鏂扮▼搴忓姞宸ョ‘璁よ〃
List<GuideCardBatch> batches = iGuideCardBatchService.list(
new QueryWrapper<GuideCardBatch>()
@@ -198,6 +212,13 @@
if(productDocInfo==null){
return Result.error("鏈彂鐜拌浜у搧缁撴瀯鏍戝搴旀枃妗�");
}
+ //鏄惁鍙堣繘琛岀殑鍗囩増
+ AssignEquipmentFileStream productAssignEquipmentFileStream = this.getOne(
+ new QueryWrapper<AssignEquipmentFileStream>().eq("doc_id", productDocInfo.getDocId())
+ .isNull("audit_type"));
+ if(productAssignEquipmentFileStream!=null){
+ return Result.error("璇ユ枃妗ｅ凡缁忚繘琛岃繃鍗囩増");
+ }
//鑾峰彇璁惧
MdcEquipment mdcEquipment =mdcEquipmentService.getById(assignEquipmentFileStream.getEquipmentId());
if (mdcEquipment==null){
@@ -237,6 +258,8 @@
values.put("comment", assignEquipmentFileStreamVo.getComment());
values.put("organization", assignEquipmentFileStreamVo.getComment());
assignEquipmentFileStreamVo.setValues(values);
+ assignEquipmentFileStream.setAuditType(assignEquipmentFileStreamVo.getAuditType());
+ assignEquipmentFileStream.setAuditReason(assignEquipmentFileStream.getAuditReason());
// 瀹屾垚娴佺▼浠诲姟
Result result = flowTaskService.complete(assignEquipmentFileStreamVo);
if (result.isSuccess()) {
--
Gitblit v1.9.3