diff --git a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesShippingInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesShippingInformationServiceImpl.java index db096946..b974bf0a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesShippingInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/sales/service/impl/SalesShippingInformationServiceImpl.java @@ -489,7 +489,7 @@ public class SalesShippingInformationServiceImpl implements ISalesShippingInform * */ @Override public void exportShippingInfinity(String shippingInformationCode, HttpServletResponse response) { - String fileName = "销售出货单1.xlsx"; + String fileName = "销售出货单vantritek.xlsx"; try { String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName); @@ -568,7 +568,7 @@ public class SalesShippingInformationServiceImpl implements ISalesShippingInform * */ @Override public void exportShippingVantritek(String shippingInformationCode, HttpServletResponse response) { - String fileName = "销售出货单2.xlsx"; + String fileName = "销售出货单infinity.xlsx"; try { String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java index 5a43caec..50e7ee22 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesShippingInformServiceImpl.java @@ -805,7 +805,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor @Override public void exportShippingOrderOne(String outOrderCode, HttpServletResponse response) { - String fileName = "销售出货单1.xlsx"; + String fileName = "销售出货单vantritek.xlsx"; String shippingOrderCode = redisCache.generateBillNo("shd"); try { @@ -907,7 +907,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor @Override public void exportShippingOrderTwo(String outOrderCode, HttpServletResponse response) { - String fileName = "销售出货单2.xlsx"; + String fileName = "销售出货单infinity.xlsx"; String shippingOrderCode = redisCache.generateBillNo("shd"); try { diff --git a/ruoyi-admin/src/main/resources/static/attachments/销售出货单1.xlsx b/ruoyi-admin/src/main/resources/static/attachments/销售出货单1.xlsx deleted file mode 100644 index 263bf01c..00000000 Binary files a/ruoyi-admin/src/main/resources/static/attachments/销售出货单1.xlsx and /dev/null differ diff --git a/ruoyi-admin/src/main/resources/static/attachments/销售出货单2.xlsx b/ruoyi-admin/src/main/resources/static/attachments/销售出货单infinity.xlsx similarity index 81% rename from ruoyi-admin/src/main/resources/static/attachments/销售出货单2.xlsx rename to ruoyi-admin/src/main/resources/static/attachments/销售出货单infinity.xlsx index 4b9c888c..ddf5d0a8 100644 Binary files a/ruoyi-admin/src/main/resources/static/attachments/销售出货单2.xlsx and b/ruoyi-admin/src/main/resources/static/attachments/销售出货单infinity.xlsx differ diff --git a/ruoyi-admin/src/main/resources/static/attachments/销售出货单vantritek.xlsx b/ruoyi-admin/src/main/resources/static/attachments/销售出货单vantritek.xlsx new file mode 100644 index 00000000..3deed279 Binary files /dev/null and b/ruoyi-admin/src/main/resources/static/attachments/销售出货单vantritek.xlsx differ diff --git a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html index 42dd9158..d17b39b1 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html @@ -56,10 +56,10 @@