From 56f5157ae8dba22eb30fb6c7cb132f80b7161932 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 07 九月 2025 00:53:08 +0800
Subject: [PATCH] 派工界面增加选择主管工艺
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 7 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..481ea03 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,8 @@
package org.springblade.mdm.flow.service;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.base.BizServiceImpl;
@@ -9,12 +11,15 @@
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.mapper.TaskDispatchMapper;
import org.springblade.mdm.flow.vo.TaskAssignVO;
+import org.springblade.mdm.program.entity.DrawingNos;
+import org.springblade.mdm.program.mapper.DrawingNosMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
+import java.util.List;
/**
* 浠诲姟娲惧伐鏁版嵁 澶勭悊鏈嶅姟
@@ -27,14 +32,36 @@
public class TaskDispatchService extends BizServiceImpl<TaskDispatchMapper, TaskDispatch> {
@Autowired
private ParamService paramService;
-
+ @Autowired
+ private DrawingNosMapper drawingNosMapper;
@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);
+ addDrawingNos(taskDispatch.getDrawingNo());
return taskDispatch;
+ }
+
+ /**
+ * 鍔爑浜轰笅鎷夋暟鎹�
+ * @param drawingNo
+ */
+ void addDrawingNos(String drawingNo){
+ DrawingNos data = drawingNosMapper.selectById(drawingNo);
+ if(data == null){
+ data = new DrawingNos();
+ data.setDrawingNo(drawingNo);
+ try {
+ drawingNosMapper.insert(data);
+ }catch (Exception e){
+ log.error("鍔犲叆闆剁粍浠跺彿涓嬫媺鏁版嵁閿欒");
+ }
+ }
}
/*
public void updateSuccess(long id, String instId) {
@@ -58,16 +85,32 @@
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;
}
+ @Transactional(readOnly = true)
+ public List<String> drawingNoSeletDropList(String drawingNo){
+ return drawingNosMapper.selectDropDownList(drawingNo);
+ }
+ @Transactional
+ public void resetDrawingNos() {
+ drawingNosMapper.delete(Wrappers.emptyWrapper());//
+ List<String> dnoList = baseMapper.distinctAllDrawingNo();
+ for(String dno : dnoList){
+ DrawingNos drawingNos = new DrawingNos();
+ drawingNos.setDrawingNo(dno);
+ drawingNosMapper.insert(drawingNos);
+ }
+
+ }
}
--
Gitblit v1.9.3