From 812aa8b242b320fd8087ede8cb689c5ee167bf08 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 08 九月 2025 11:17:32 +0800
Subject: [PATCH] 增加mes派工报表
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java | 35 ++++++++---------------------------
1 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java
index 55ce39d..ad0c4e5 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/ProcessProgRefService.java
@@ -25,38 +25,16 @@
*/
package org.springblade.mdm.program.service;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
import org.springblade.core.mp.base.BizServiceImpl;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.oss.OssTemplate;
-import org.springblade.core.oss.model.BladeFile;
-import org.springblade.mdm.basesetting.machine.MachineService;
-import org.springblade.mdm.basesetting.machine.entity.Machine;
-import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgram;
+import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.program.entity.ProcessProgRef;
-import org.springblade.mdm.program.entity.ProgramSeq;
-import org.springblade.mdm.program.mapper.NcProgramMapper;
import org.springblade.mdm.program.mapper.ProcessProgRefMapper;
-import org.springblade.mdm.program.mapper.ProgramSeqMapper;
-import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
-import org.springblade.mdm.program.vo.NcProgramUploadVO;
import org.springblade.mdm.program.vo.NcProgramVO;
-import org.springblade.mdm.utils.FileContentUtil;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
@@ -69,7 +47,7 @@
@Service
@AllArgsConstructor
public class ProcessProgRefService extends BizServiceImpl<ProcessProgRefMapper, ProcessProgRef> {
-
+ private final FlowCommonService flowCommonService;
/**
* 鏌ヨ鐜版湁鍥哄寲鐨勭▼搴忥紝鏆傚畾鏉′欢锛氶浂缁勪欢鍙风浉鍚岋紝涓旀槸鍚屼竴鏈哄簥缁�
* @param processInstanceId 娴佺▼瀹炰緥id
@@ -82,13 +60,14 @@
return;
}
+ String processDefinationKey = flowCommonService.getDefinitionKey(processInstanceId);
this.lambdaUpdate().eq(ProcessProgRef::getProcessInstanceId, processInstanceId).remove();
List<ProcessProgRef> entities = new ArrayList<>();
for (Long programId : programIds) {
ProcessProgRef entity = new ProcessProgRef();
entity.setProcessInstanceId(processInstanceId);
entity.setNcProgramId(programId);
-
+ entity.setProcessDefinitionKey(processDefinationKey);
entities.add(entity);
}
this.saveBatch(entities);
@@ -107,11 +86,13 @@
*鑾峰彇鏈�鍚庝竴璋冧换鍔″垎娲剧殑鏁版嵁锛屾牴鎹▼搴廼d
* @param ncProgramId 鏁版帶绋嬪簭id
*/
+ /*
public ProcessProgRef lastDispatchDataByNcProgramId(Long ncProgramId) {
LambdaQueryWrapper<ProcessProgRef> query = Wrappers.lambdaQuery();
- query.eq(ProcessProgRef::getNcProgramId, ncProgramId).orderByDesc(ProcessProgRef::getCreateTime).last("LIMIT 10");;
+
+ query.eq(ProcessProgRef::getNcProgramId, ncProgramId).eq(ProcessProgRef::getProcessDefinitionKey, StartDispatcher.PROCESS_KEY).orderByDesc(ProcessProgRef::getCreateTime).last("LIMIT 1");;
List<ProcessProgRef> list = this.list(query);
return list.isEmpty() ? null : list.get(0);
- }
+ }*/
}
--
Gitblit v1.9.3