From 3ce57820e618b704ce61487b7cdb38fdd6b0f44a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 22 九月 2026 14:06:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_银川_九鸿化工' into dev_银川_九鸿化工
---
yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcProductReportWordBuilderTest.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcProductReportWordBuilderTest.java b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcProductReportWordBuilderTest.java
index 9de4db1..f41d159 100644
--- a/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcProductReportWordBuilderTest.java
+++ b/yudao-module-mes/src/test/java/cn/iocoder/yudao/module/mes/service/qc/indicatorresult/MesQcProductReportWordBuilderTest.java
@@ -54,9 +54,9 @@
assertEquals("10.023銆�10.115", itemTable.getRow(2).getCell(1).getText().trim());
assertEquals("/", itemTable.getRow(3).getCell(1).getText().trim());
- // 鍒ゅ畾缁撹/璐ㄦ涓撶敤绔犵暀绌�
+ // 鍒ゅ畾缁撹甯﹀嚭妫�楠岀粨鏋滐紱璐ㄦ涓撶敤绔犵暀绌哄緟鐩栫珷
assertTrue(itemTable.getRow(2).getCell(0).getText().contains("璇曟牱璐ㄩ噺 m /g"));
- assertEquals("鍒ゅ畾缁撹锛�", tables.get(2).getRow(0).getCell(0).getText().trim());
+ assertEquals("鍒ゅ畾缁撹锛�1鍨�", tables.get(2).getRow(0).getCell(0).getText().trim());
assertEquals("璐ㄦ涓撶敤绔狅細", tables.get(2).getRow(0).getCell(1).getText().trim());
// 澶囨敞榛樿鏂囨
@@ -80,7 +80,8 @@
.setSamplingTime(LocalDateTime.of(2026, 1, 6, 9, 0))
.setInspectDate(LocalDateTime.of(2026, 1, 6, 15, 0))
.setDocCreateTime(LocalDateTime.of(2026, 1, 6, 8, 0))
- .setInspectorName("鏉庡崥").setAuditName("鍛ㄤ簹娲�").setApproveName("鍖呯繝钀�");
+ .setInspectorName("鏉庡崥").setAuditName("鍛ㄤ簹娲�").setApproveName("鍖呯繝钀�")
+ .setCheckResult(1).setCheckResultText("1鍨�");
MesQcQcReportRespVO.ReportItem appearance = new MesQcQcReportRespVO.ReportItem();
appearance.setIndicatorName("澶栬").setItemType(1).setSortOrder(10);
--
Gitblit v1.9.3