From 3ffe33aaa24386337e3638558eca731c62f25521 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 13:30:06 +0800
Subject: [PATCH] 修改表格打印的数控程序编号

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
index 0689209..7bea079 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java
@@ -121,9 +121,12 @@
 		programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
 		programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));
 
-		programProperties.setProgramNo(Func.toStr(vars.get(FlowContants.PROGRAM_NO)));
+		programProperties.setProgramNo(programProperties.getDrawingNo()+"-"+programProperties.getProcessNo()+"-"+programProperties.getProcessEdition());
 
 		programProperties.setActProgrammerId(Func.toLong(vars.get(FlowVariableContants.ACT_PROGRAMMER)));
+		programProperties.setActCheckerId(Func.toLong(vars.get(FlowVariableContants.ACT_CHECKER)));
+		programProperties.setActSeniorId(Func.toLong(vars.get(FlowVariableContants.ACT_SENIOR)));
+		programProperties.setProgrammerName(Func.toStr(vars.get("programmerName")));
 	}
 	/**
 	 * 娴佺▼鏄惁鍦ㄨ繘琛�

--
Gitblit v1.9.3