From ee0bd63aa66aef2ca2a4f09c9e1a8c9aecf6e14d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Wed, 28 Jun 2023 10:00:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E6=96=87=E4=BB=B6=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/purchaseorder/PurchaseorderMapper.xml | 2 ++
 .../linkage-scm/src/main/resources/templates/export/test.ftl    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml
index 776071a9..fa655cde 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml
@@ -152,6 +152,7 @@
                     b.unit,
                     a.document_no
             ) aaa ${ew.customSqlSegment}
+            order by aaa.itemName
     </select>
 
     <select id="getOrderInfo" resultMap="resultOrderInfoMap">
@@ -207,6 +208,7 @@
                     b.unit,
                     a.document_no
             ) aaa ${ew.customSqlSegment}
+            order by aaa.itemName
     </select>
 
     <resultMap id="getTitleInfoMap" type="map">
diff --git a/SC-boot/linkage-scm/src/main/resources/templates/export/test.ftl b/SC-boot/linkage-scm/src/main/resources/templates/export/test.ftl
index 6c2e7295..eb4d23cb 100644
--- a/SC-boot/linkage-scm/src/main/resources/templates/export/test.ftl
+++ b/SC-boot/linkage-scm/src/main/resources/templates/export/test.ftl
@@ -87,7 +87,7 @@
                         <td colspan="5" style="text-align: center">${reportData.itemName!""}</td>
                         <td colspan="2" style="text-align: center">${reportData.settlement!""}</td>
                         <td colspan="2" style="text-align: center">${reportData.unit!""}</td>
-                        <td colspan="3" style="text-align: center">${reportData.price?string["0.####"]!""}</td>
+                        <td colspan="3" style="text-align: center">${reportData.price?string["0.######"]!""}</td>
                         <td colspan="3" style="text-align: center">
 
                             ${reportData.amount!""}