From 61763cc1a182effa7e5535ac72d54a6a56f029eb Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 06 九月 2025 09:52:41 +0800
Subject: [PATCH] word版审批表，确认表
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/ProgramConfirmTableService.java | 4 +++-
1 files changed, 3 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 23113ee..fe8af9f 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
@@ -120,7 +120,7 @@
//闆剁粍浠跺悕绉�
data.put("drawingName",getDrawingName(props.getDrawingNo()));
- data.put("deviation",props.getDeviation());
+ data.put("deviation",props.getDeviation()!=null?props.getDeviation():StringUtils.EMPTY);
@@ -136,6 +136,8 @@
data.put("fuheY","Y");//TODO 鏈� 妫�楠屽憳 鍒欑鍚�
data.put("keyongY","Y");//TODO 鏈� 妫�楠屽憳 鍒欑鍚�
+ data.put("jly","鏉ユ簮MES/2025-1-1");
+ data.put("jln","鏉ユ簮MES/2025-1-1");
ApproveTableInfo approveInfo = approveInfoQueryService.getApproveInfo(props);
data.put("programmerName",approveInfo.getProgrammerName());
data.put("checkerName",approveInfo.getCheckerName());
--
Gitblit v1.9.3