From 053a438acf9ec33e182b25211ce8108f0367feac Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 06 八月 2025 09:35:58 +0800
Subject: [PATCH] 固化流程，建立node；
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveTableService.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveTableService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveTableService.java
index 530f8b9..767cdc7 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveTableService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ApproveTableService.java
@@ -14,8 +14,10 @@
import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.mapper.ApproveRecordMapper;
import org.springblade.mdm.flow.vo.ApproveRecordVO;
+import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.entity.ProcessProgRef;
+import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramService;
import org.springblade.mdm.program.service.ProcessProgRefService;
import org.springframework.beans.BeanUtils;
@@ -36,10 +38,9 @@
@Service
@AllArgsConstructor
public class ApproveTableService{
- private final ProcessProgRefService processProgRefService;
private final FlowCommonService flowCommonService;
private final ApproveRecordService approveRecordService;
- private final NcProgramService ncProgramService;
+ private final NcNodeService ncNodeService;
private final MachineService machineService;
private static final String UNCHECK_BOX = "鈽�";
private static final String CHECKED_BOX = "鈽�";
@@ -69,6 +70,9 @@
List<ApproveRecord> records = approveRecordService.lambdaQuery().eq(ApproveRecord::getProcessInstanceId, processInstanceId).orderByAsc(ApproveRecord::getCreateTime).list();
for(int i=0;i<records.size();i++){
ApproveRecord record = records.get(i);
+ if(record.getNcNodeId() ==null){
+ continue;
+ }
printStep(document,bfChinese,record);
if(i<records.size()-1){
document.newPage();
@@ -79,13 +83,13 @@
}
void printStep(Document document,BaseFont bfChinese,ApproveRecord record) throws DocumentException, IOException {
- NcProgram ncProgram;
+ NcNode programPackageNode;
Machine machine;
- if(record.getNcProgramId() !=null ) {
- ncProgram = ncProgramService.getById(record.getNcProgramId());
- machine = machineService.getByCode(ncProgram.getMachineCode());
+ if(record.getNcNodeId() !=null ) {
+ programPackageNode = ncNodeService.getById(record.getNcNodeId());
+ machine = machineService.getByCode(programPackageNode.getMachineCode());
}else{
- ncProgram = new NcProgram();
+ programPackageNode = new NcNode();
machine = new Machine();
}
@@ -120,10 +124,10 @@
//PdfPCell cell12 = new PdfPCell();
//cell12.setColspan(2);
//cell12.addElement(new Phrase(ncProgram.getDrawingNo()));
- table.addCell(getCell(ncProgram.getDrawingNo(),ft));//闆剁粍浠跺彿
+ table.addCell(getCell(programPackageNode.getDrawingNo(),ft));//闆剁粍浠跺彿
- table.addCell(getCell(ncProgram.getProcessNo(),ft));//宸ュ簭鍙�
- table.addCell(getCell(ncProgram.getCraftEdition(),ft));//宸ヨ壓鐗堟
+ table.addCell(getCell(programPackageNode.getProcessNo(),ft));//宸ュ簭鍙�
+ table.addCell(getCell(programPackageNode.getCraftEdition(),ft));//宸ヨ壓鐗堟
table.addCell(getCell(machine.getName(),ft));//鏈哄簥鍨嬪彿
table.addCell("");//璐熻矗浜猴紝宸ユ璐熻矗浜烘淳鍑烘椂闂�
@@ -205,7 +209,8 @@
PdfPCell cell2 = new PdfPCell();
cell2.setColspan(2);
- cell2.addElement(new Phrase(ncProgram.getCode(),ft));//鏁版帶绋嬪簭缂栧彿
+
+ cell2.addElement(new Phrase(programPackageNode.getProgramNo(),ft));//鏁版帶绋嬪簭缂栧彿
table.addCell(cell2);
String pDateStr = " ";
--
Gitblit v1.9.3