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 57b38359..049b3ee3 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 @@ -803,7 +803,7 @@ public class SalesShippingInformationServiceImpl implements ISalesShippingInform * */ @Override public void exportPackingInfinity(String shippingInformationCode, HttpServletResponse response) { - String fileName = "销售出货箱单1.xlsx"; + String fileName = "销售出货箱单infinity.xlsx"; try { String fileAbsolutePath = FileDownloadUtils.getFileAbsolutePath(fileName); @@ -877,7 +877,7 @@ public class SalesShippingInformationServiceImpl implements ISalesShippingInform * */ @Override public void exportPackingVantritek(String shippingInformationCode, HttpServletResponse response) { - String fileName = "销售出货箱单2.xlsx"; + String fileName = "销售出货箱单vantritek.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 2fa4c2af..1f9a7712 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 @@ -1012,7 +1012,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor @Override public void exportShippingPackingOne(String outOrderCode, HttpServletResponse response) { - String fileName = "销售出货箱单1.xlsx"; + String fileName = "销售出货箱单infinity.xlsx"; try { @@ -1116,7 +1116,7 @@ public class SysSalesShippingInformServiceImpl implements ISysSalesShippingInfor * */ @Override public void exportShippingPackingTwo(String outOrderCode, HttpServletResponse response) { - String fileName = "销售出货箱单2.xlsx"; + String fileName = "销售出货箱单vantritek.xlsx"; try { diff --git a/ruoyi-admin/src/main/resources/static/attachments/销售出货发票2.xlsx b/ruoyi-admin/src/main/resources/static/attachments/销售出货发票2.xlsx deleted file mode 100644 index 2245b11d..00000000 Binary files a/ruoyi-admin/src/main/resources/static/attachments/销售出货发票2.xlsx and /dev/null differ 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 b7ac5a74..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/销售出货发票1.xlsx b/ruoyi-admin/src/main/resources/static/attachments/销售出货箱单infinity.xlsx similarity index 87% rename from ruoyi-admin/src/main/resources/static/attachments/销售出货发票1.xlsx rename to ruoyi-admin/src/main/resources/static/attachments/销售出货箱单infinity.xlsx index 6b881aca..9d862cde 100644 Binary files a/ruoyi-admin/src/main/resources/static/attachments/销售出货发票1.xlsx and b/ruoyi-admin/src/main/resources/static/attachments/销售出货箱单infinity.xlsx differ diff --git a/ruoyi-admin/src/main/resources/static/attachments/销售出货箱单2.xlsx b/ruoyi-admin/src/main/resources/static/attachments/销售出货箱单vantritek.xlsx similarity index 62% rename from ruoyi-admin/src/main/resources/static/attachments/销售出货箱单2.xlsx rename to ruoyi-admin/src/main/resources/static/attachments/销售出货箱单vantritek.xlsx index 978cf658..fe940c79 100644 Binary files a/ruoyi-admin/src/main/resources/static/attachments/销售出货箱单2.xlsx 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 fa4bf331..0eb1b95a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html @@ -63,10 +63,10 @@ - 导出销售出货箱单1 + 导出销售出货箱单infinity - 导出销售出货箱单2 + 导出销售出货箱单vantritek @@ -464,7 +464,7 @@ const row = selectedRows[0]; // 使用 $.modal.confirm 显示确认对话框 - $.modal.confirm("确定导出这条数据的出货单吗?", function() { + $.modal.confirm("确定导出这条数据的出货箱单吗?", function() { // 如果用户点击确定,继续导出 var outOrderCode = row.outOrderCode; window.location.href = prefix + "/exportShippingPackingOne/" + outOrderCode; @@ -487,7 +487,7 @@ const row = selectedRows[0]; // 使用 $.modal.confirm 显示确认对话框 - $.modal.confirm("确定导出这条数据的出货单吗?", function() { + $.modal.confirm("确定导出这条数据的出货箱单吗?", function() { // 如果用户点击确定,继续导出 var outOrderCode = row.outOrderCode; window.location.href = prefix + "/exportShippingPackingTwo/" + outOrderCode; @@ -509,7 +509,7 @@ const row = selectedRows[0]; // 使用 $.modal.confirm 显示确认对话框 - $.modal.confirm("确定导出这条数据的出货发票1吗?", function() { + $.modal.confirm("确定导出这条数据的出货发票吗?", function() { // 如果用户点击确定,继续导出 var outOrderCode = row.outOrderCode; window.location.href = prefix + "/exportShippingInvoiceOne/" + outOrderCode;