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/statreport/service/ConfirmTablePrintService.java | 4 ++--
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java | 2 +-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java | 6 +++---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java | 10 +++++-----
blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java
index 96a68e1..90b6e90 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java
@@ -48,12 +48,12 @@
packageNode = ncNodeService.getById(props.getCuredNodeId());
if(FlowContants.N.equals(props.getCureProgramUseable())) {
- //绋嬪簭涓嶅彲鐢�
- //鍘熸潵鐨勫浐鍖栬妭鐐归攣瀹�
+ //绋嬪簭涓嶅彲鐢紝鍘熸潵鐨勫浐鍖栬妭鐐归攣瀹�
packageNode.lock();
ncNodeService.updateById(packageNode);
Integer newVersion = packageNode.genNewVersionNumber();
+ //TODO 鐗堟湰鍙锋牴鎹浂缁勪欢鍙�+宸ュ簭鍙凤紝宸ュ簭鐗堟锛屾満搴婄粍 鐩存帴鏌ヨ鏁伴噺锛�+1鑾峰彇
packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props,newVersion);
}else{
//鍙敤锛屽崌鐗堬紙淇敼鍏跺伐搴忕増娆★級锛屽師鏉ョ殑鑺傜偣娓呴櫎
@@ -65,7 +65,7 @@
}
addApproveTable(packageNode,props);
- //updateApproveRecordNodeId(instId, packageNode.getId());
+
log.info("鏅�氭祦绋嬪凡瀹屾垚in DispatchFinishListener");
}
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 7c0273a..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,7 +121,7 @@
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)));
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java
index 79478a4..443eef8 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/execute/TryFlowCompleteService.java
@@ -44,16 +44,16 @@
@Override
public void completeTask(String taskId, String processInstanceId, String comment, Map<String, Object> variables) {
Task task = currentTask(taskId);
+
+ // 闈炵┖鍒ゆ柇
+ if (Func.isEmpty(variables)) {
+ variables = Kv.create();
+ }
String operateResult = this.getApproveResult(variables);
FlowProgramProperties props = flowCommonService.getProgramProperties(processInstanceId);
if(!variables.containsKey("assignee")) {
throw new ServiceException("璇锋寚瀹氭祦绋嬩笅涓�姝ュ鐞嗕汉");
- }
-
- // 闈炵┖鍒ゆ柇
- if (Func.isEmpty(variables)) {
- variables = Kv.create();
}
if(task.getTaskDefinitionKey().equals("programmingTask") ) {//缂栧埗鑺傜偣
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java
index 89b21f8..108309e 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ApproveTableService.java
@@ -105,7 +105,7 @@
dataMap.put("bz", WordReplaceUtil.CHECKED);
}
- dataMap.put("programNo",dispatch.getProgramNo());
+ dataMap.put("programNo",props.getProgramNo());
dataMap.put("fzy",WordReplaceUtil.CHECKED); //浠跨湡 鏄�
dataMap.put("fzn",WordReplaceUtil.UNCHECKED);//浠跨湡 鍚�
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java
index 2f2e08c..0ef111b 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/statreport/service/ConfirmTablePrintService.java
@@ -91,7 +91,7 @@
//闃叉鑰佹暟鎹姤閿�
dispatch = new TaskDispatch();
}
- dataMap.put("bh",node.getProgramNo());//缂栧彿锛屽氨鏄暟鎺х▼搴忕紪鍙�
+ dataMap.put("bh",props.getProgramNo());//缂栧彿锛屽氨鏄暟鎺х▼搴忕紪鍙�
dataMap.put("drawingNo", props.getDrawingNo());
dataMap.put("processNo", props.getProcessNo());
@@ -125,7 +125,7 @@
}else{
dataMap.put("czz", "");
}
- dataMap.put("programNo",dispatch.getProgramNo());
+ dataMap.put("programNo",props.getProgramNo());
if(StringUtils.isNotBlank(dispatch.getInspector())) {
dataMap.put("jyy",dispatch.getInspector()+"/"+formatTimeForTable(dispatch.getCheckTime()));//瀹為檯妫�楠屽憳鍜屾楠屾椂闂�
--
Gitblit v1.9.3