Merge remote-tracking branch 'origin/main'

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">

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!""}