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/flow/service/ProgramConfirmTableService.java | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 deletions(-)
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