From b7af95d487f49490de16f9636147e5a40911e157 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 八月 2025 23:36:48 +0800
Subject: [PATCH] 确认表增加程序编号
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/QinzheFgb.java | 4 ++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramProperties.java | 3 +
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 2 +
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowCommonService.java | 52 ++++++++++++++++++++++++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramConfirmTableService.java | 44 +++++++++++++++++++++
5 files changed, 101 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/QinzheFgb.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/QinzheFgb.java
index c938d04..5ad9807 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/QinzheFgb.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/basesetting/producedivision/entity/QinzheFgb.java
@@ -23,6 +23,10 @@
*/
private String ljh;
/**
+ * 闆朵欢鍚嶇О
+ */
+ private String ljmc;
+ /**
* 涓荤宸ヨ壓(缂栫▼)
*/
private String zggy;
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
index 66b5b35..9a6e195 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
@@ -8,6 +8,7 @@
import org.flowable.engine.TaskService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.producedivision.entity.ProduceDivision;
@@ -71,6 +72,7 @@
String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(programPackage.getMachineCode());
vars.put(FlowContants.WORKSHOP,workshop);
+ vars.put(FlowContants.NODE_ID, Func.toStr(nodeId));
vars.put(FlowContants.PROCESS_NO,programPackage.getProcessNo());
vars.put(FlowContants.PROCESS_NAME,programPackage.getProcessName());
vars.put(FlowContants.PROCESS_EDITION,programPackage.getProcessEdition());
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 1354c20..8304ada 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
@@ -60,7 +60,8 @@
programProperties.setProcessInstanceId(processInstanceId);
Map<String, Object> vars = runtimeService.getVariables(processInstanceId);
-
+ this.copyFlowPropertiesFromMap(programProperties, vars);
+ /*
programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
programProperties.setIsTempFlow(Func.toStr(vars.get(FlowContants.IS_TEMP_FLOW)));
programProperties.setDrawingNo(String.valueOf(vars.get(FlowContants.DRAWING_NO)));
@@ -84,12 +85,16 @@
if(vars.containsKey(FlowContants.CURED_NODE_ID)){
programProperties.setCuredNodeId(Func.toLong(vars.get(FlowContants.CURED_NODE_ID)));
}
+ if(vars.containsKey(FlowContants.NODE_ID)){
+ programProperties.setNodeId(Func.toLong(vars.get(FlowContants.NODE_ID)));
+ }
programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));
programProperties.setTeamLeaderId(Func.toLong(vars.get(FlowContants.TEAM_LEADER)));
programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));
programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));
+ */
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
.processInstanceId(processInstanceId)
.singleResult();
@@ -106,6 +111,46 @@
programProperties.setProcessInstanceId(processInstanceId);
Map<String, Object> vars =historicInstance.getProcessVariables();
+ this.copyFlowPropertiesFromMap(programProperties,vars);
+ /*
+ programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
+ programProperties.setIsTempFlow(Func.toStr(vars.get(FlowContants.IS_TEMP_FLOW)));
+ programProperties.setDrawingNo(String.valueOf(vars.get(FlowContants.DRAWING_NO)));
+ programProperties.setDrawingNoEdition(String.valueOf(vars.get(FlowContants.DRAWING_NO_EDITION)));
+ programProperties.setProductModel(String.valueOf(vars.get(FlowContants.PRODUCT_MODEL)));
+
+ programProperties.setProcessNo(String.valueOf(vars.get(FlowContants.PROCESS_NO)));
+ programProperties.setProcessEdition(String.valueOf(vars.get(FlowContants.PROCESS_EDITION)));//宸ュ簭鐗堟
+ programProperties.setProcessName(String.valueOf(vars.get(FlowContants.PROCESS_NAME)));
+ programProperties.setMachineCode(String.valueOf(vars.get(FlowContants.MACHINE_CODE)));
+
+ programProperties.setMachineMode(String.valueOf(vars.get(FlowContants.MACHINE_MODE)));
+ //鏁版嵁澶勭悊鍚嶇О涓虹増娆′互鍓嶏紝闆朵欢鍙峰姞宸ュ簭鍙凤細YZL4-1100-01-50 闆剁粍浠跺彿锛歒ZL4-1100-01 宸ュ簭鍙� 50
+
+ programProperties.setCraftEdition(String.valueOf(vars.get(FlowContants.CRAFT_EDITION)));
+ programProperties.setHasCuredProgram(String.valueOf(vars.get(FlowContants.HAS_CURED_PROGRAM)));
+ programProperties.setIsProcessEditionSame(String.valueOf(vars.get(FlowContants.IS_PROCESS_EDITION_SAME)));
+ if(vars.containsKey(FlowContants.DEVIATION)) {
+ programProperties.setDeviation(String.valueOf(vars.get(FlowContants.DEVIATION)));
+ }
+ if(vars.containsKey(FlowContants.CURED_NODE_ID)){
+ programProperties.setCuredNodeId(Func.toLong(vars.get(FlowContants.CURED_NODE_ID)));
+ }
+ if(vars.containsKey(FlowContants.NODE_ID)){
+ programProperties.setNodeId(Func.toLong(vars.get(FlowContants.NODE_ID)));
+ }
+ programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));
+
+ programProperties.setTeamLeaderId(Func.toLong(vars.get(FlowContants.TEAM_LEADER)));
+ programProperties.setProgrammerId(Func.toLong(vars.get(FlowContants.PROGRAMMER)));
+ programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
+ programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));
+ */
+ programProperties.setProcessDefinitionKey(historicInstance.getProcessDefinitionKey());
+ return programProperties;
+ }
+
+ void copyFlowPropertiesFromMap(FlowProgramProperties programProperties,Map<String, Object> vars){
programProperties.setTitle(String.valueOf(vars.get(FlowContants.TITLE)));
programProperties.setIsTempFlow(Func.toStr(vars.get(FlowContants.IS_TEMP_FLOW)));
@@ -130,6 +175,9 @@
if(vars.containsKey(FlowContants.CURED_NODE_ID)){
programProperties.setCuredNodeId(Func.toLong(vars.get(FlowContants.CURED_NODE_ID)));
}
+ if(vars.containsKey(FlowContants.NODE_ID)){
+ programProperties.setNodeId(Func.toLong(vars.get(FlowContants.NODE_ID)));
+ }
programProperties.setCureProgramUseable(String.valueOf(vars.get(FlowContants.CURE_PROGRAM_USEABLE)));
programProperties.setTeamLeaderId(Func.toLong(vars.get(FlowContants.TEAM_LEADER)));
@@ -137,8 +185,6 @@
programProperties.setCheckerId(Func.toLong(vars.get(FlowContants.CHECKER)));
programProperties.setSeniorId(Func.toLong(vars.get(FlowContants.SENIOR)));
- programProperties.setProcessDefinitionKey(historicInstance.getProcessDefinitionKey());
- return programProperties;
}
/**
* 娴佺▼鏄惁鍦ㄨ繘琛�
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramProperties.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramProperties.java
index 9d18bea..684c19a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramProperties.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowProgramProperties.java
@@ -48,6 +48,9 @@
@Schema(description = "鍥哄寲绋嬪簭绋嬪簭鑺傜偣id锛堝鏋滄湁锛�")
private Long curedNodeId;
+ @Schema(description = "绋嬪簭绋嬪簭鑺傜偣id,鑳界‘瀹氳妭鐐筰d鐨勬祦绋嬩細鏈夎灞炴��")
+ private Long nodeId;
+
@Schema(description = "娴佺▼瀹炰緥id")
private String processInstanceId;
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramConfirmTableService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramConfirmTableService.java
index 8dbb37f..5c56a0a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramConfirmTableService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramConfirmTableService.java
@@ -12,6 +12,8 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.basesetting.producedivision.entity.QinzheFgb;
+import org.springblade.mdm.basesetting.producedivision.service.QinzheFgbService;
import org.springblade.mdm.commons.contants.DictBizConstants;
import org.springblade.mdm.commons.service.ParamService;
import org.springblade.mdm.flow.constants.FlowContants;
@@ -41,7 +43,7 @@
@Service
public class ProgramConfirmTableService {
@Autowired
- private FlowCommonService flowCommonService;
+ private QinzheFgbService qinzheFgbService;
@Autowired
private IDictBizClient dictBizClient;
@Autowired
@@ -124,6 +126,12 @@
data.put("productModel",props.getProductModel());
data.put("craftEdition",props.getCraftEdition());
+ //闆剁粍浠跺悕绉�
+ data.put("drawingName",getDrawingName(props.getDrawingNo()));
+ data.put("deviation",props.getDeviation());
+ data.put("programNo",queryProgramNo(props.getNodeId()));
+
+
data.put("fuheY","Y");
data.put("keyongY","Y");
Machine machine = this.machineService.getByCode(props.getMachineCode());
@@ -143,6 +151,38 @@
return data;
}
+ /**
+ * 鏌ヨ绋嬪簭缂栧彿
+ * @param nodeId
+ * @return
+ */
+ private String queryProgramNo(Long nodeId) {
+ if(nodeId ==null) {
+ return StringUtils.EMPTY;
+ }
+ NcNode programPkdNode = this.ncNodeService.getById(nodeId);
+ if (programPkdNode != null) {
+ return programPkdNode.getProgramNo();
+ }else{
+ return StringUtils.EMPTY;
+ }
+
+ }
+
+ /**
+ * 鑾峰彇闆剁粍浠跺悕绉�
+ * @param drawingNo 闆朵欢缂栧彿
+ * @return 闆剁粍浠跺悕绉�
+ */
+ String getDrawingName(String drawingNo){
+ QinzheFgb fgb = qinzheFgbService.getByLjh(drawingNo);
+ if(fgb!= null){
+ return fgb.getLjmc();
+ }else{
+ return StringUtils.EMPTY;
+ }
+
+ }
String getNameByUserId(Long userId){
if(userId == null){
@@ -158,4 +198,6 @@
return name;
}
+
+
}
--
Gitblit v1.9.3