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 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 @@ ${reportData.itemName!""} ${reportData.settlement!""} ${reportData.unit!""} - ${reportData.price?string["0.####"]!""} + ${reportData.price?string["0.######"]!""} ${reportData.amount!""}