From 86c8efdb19a2f4be79a947650ef62ed79382011b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 30 八月 2025 20:55:31 +0800
Subject: [PATCH] 重构机床回传文件；撤回后禁用撤回按钮
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java
index 044e090..31dc18d 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java
@@ -1,6 +1,7 @@
package org.springblade.mdm.flow.service;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.base.BizServiceImpl;
@@ -29,9 +30,12 @@
private ParamService paramService;
@Transactional(rollbackFor = Exception.class)
- public TaskDispatch saveTask(TaskAssignVO startVO) {
+ public TaskDispatch saveTask(TaskAssignVO startVO,boolean isDup) {
TaskDispatch taskDispatch = new TaskDispatch();
BeanUtils.copyProperties(startVO, taskDispatch);
+ if(isDup){
+ taskDispatch.setStatus(TaskDispatch.STATUS_DUP);
+ }
this.save(taskDispatch);
return taskDispatch;
@@ -58,14 +62,15 @@
return false;
}
- int taskDupDays = Func.toInt(paramService.taskDuplateCheckDays());
+ int taskDupDays = Func.toInt(paramService.taskDuplicateCheckDays());
LocalDateTime checkStartDate = LocalDateTime.now().minusDays(taskDupDays);
- long cnt = lambdaQuery().eq(TaskDispatch::getDrawingNo,startVO.getDrawingNo())
+ LambdaQueryChainWrapper<TaskDispatch> q = lambdaQuery().eq(TaskDispatch::getDrawingNo,startVO.getDrawingNo())
.eq(TaskDispatch::getProcessNo,startVO.getProcessNo())
- .eq(TaskDispatch::getProcessEdition,startVO.getProcessEdition())
+ //.eq(TaskDispatch::getProcessEdition,startVO.getProcessEdition())
.eq(TaskDispatch::getMachineCode,startVO.getMachineCode())
- .gt(TaskDispatch::getCreateTime,checkStartDate)
- .count();
+ .gt(TaskDispatch::getCreateTime,checkStartDate);
+
+ long cnt = q.count();
return cnt > 0;
}
--
Gitblit v1.9.3