From fd1efdba56dbf07943b82c971694579af034fc5a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 03 十一月 2026 20:10:12 +0800
Subject: [PATCH] feat: 新增废料管理并完善合同导出

---
 yudao-module-crm/src/test/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractDocumentRendererTest.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/yudao-module-crm/src/test/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractDocumentRendererTest.java b/yudao-module-crm/src/test/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractDocumentRendererTest.java
index d83553d..e5e5018 100644
--- a/yudao-module-crm/src/test/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractDocumentRendererTest.java
+++ b/yudao-module-crm/src/test/java/cn/iocoder/yudao/module/crm/service/contract/CrmContractDocumentRendererTest.java
@@ -36,7 +36,8 @@
         String xml = new String(parts.get("word/document.xml"), StandardCharsets.UTF_8);
         assertTrue(xml.contains("HT20261015001")); assertTrue(xml.contains("2026骞�10鏈�15鏃�"));
         assertTrue(xml.contains("10000.00")); assertTrue(xml.contains("澹逛竾鍏冩暣"));
-        assertTrue(xml.contains("鍐诲共鍐櫕澶忚崏锛�2500绾т竴绛夛級")); assertTrue(xml.contains("璇氫俊鍚堣"));
+        assertTrue(xml.contains("鍐诲共鍐櫕澶忚崏锛�2500绾т竴绛夛級")); assertTrue(xml.contains("浜や粯涓庨獙鏀�"));
+        assertFalse(xml.contains("鍖椾含鍚屼粊鍫�")); assertFalse(xml.contains("28504001040001454"));
         assertFalse(xml.contains("${"));
         try(var template = new ClassPathResource("templates/contract/sale-contract.docx").getInputStream()) {
             var original = unzip(template.readAllBytes()); assertEquals(original.keySet(),parts.keySet());
@@ -50,11 +51,11 @@
         contract.setProducts(Collections.nCopies(25,contract.getProducts().getFirst()));
         contract.setTotalPrice(new BigDecimal("249000"));
         String xml = new String(unzip(CrmContractDocumentRenderer.render(contract)).get("word/document.xml"),StandardCharsets.UTF_8);
-        assertTrue(xml.contains("瀹㈡埛&lt;&amp;&gt;鍏徃")); assertTrue(xml.contains("鏁村崟浼樻儬 1000.00 鍏�"));
+        assertTrue(xml.contains("瀹㈡埛&lt;&amp;&gt;鍏徃")); assertTrue(xml.contains("涓庡悎鍚岄噾棰濈殑宸 1000.00 鍏�"));
         assertEquals(25,xml.split("鍐诲共鍐櫕澶忚崏锛�2500绾т竴绛夛級",-1).length-1);
         assertEquals(25,xml.split("<w:cantSplit",-1).length-1);
         assertTrue(xml.contains("249000.00")); assertFalse(xml.contains("${"));
-        assertFalse(xml.contains("涔欐柟锛堥渶鏂癸級锛氫腑鍥界瀛﹂櫌瑗垮寳楂樺師鐢熺墿鐮旂┒鎵�"));
+        assertTrue(xml.contains("涔欐柟锛堥渶鏂癸級锛氬鎴�&lt;&amp;&gt;鍏徃"));
         String output = System.getProperty("contract.document.sample");
         if (output != null) Files.write(Path.of(output).resolveSibling("generated-contract-many.docx"), CrmContractDocumentRenderer.render(contract));
     }

--
Gitblit v1.9.3