From 42ff73de57c46b8df7d57bccbcc148ff9db8c3b9 Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Mon, 5 Jan 2026 10:52:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=81=E5=88=B6=E5=8F=96=E5=89=8D=E4=B8=89?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CoDelExcelServiceImpl.java    | 18 +++++++++---------
 src/main/resources/mapper/ecss/CoDelMapper.xml |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java
index 052d6585..5357380e 100644
--- a/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/ecss/service/impl/CoDelExcelServiceImpl.java
@@ -1884,7 +1884,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                 workbook.write(response.getOutputStream());
             }
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            response.setHeader("Content-Disposition", "attachment; filename=\"报关要素.xlsx\"");
+            response.setHeader("Content-Disposition", "attachment; filename=\"danzheng.xlsx\"");
             response.flushBuffer();
         } catch (Exception e) {
             log.error("导出报关要素异常{}", e.getMessage());
@@ -1904,7 +1904,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                 workbook.write(response.getOutputStream());
             }
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            response.setHeader("Content-Disposition", "attachment; filename=\"报关单.xlsx\"");
+            response.setHeader("Content-Disposition", "attachment; filename=\"danzheng.xlsx\"");
             response.flushBuffer();
         } catch (Exception e) {
             log.error("导出报关单异常{}", e.getMessage());
@@ -1943,7 +1943,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                 workbook.write(response.getOutputStream());
             }
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            response.setHeader("Content-Disposition", "attachment; filename=\"发票.xlsx\"");
+            response.setHeader("Content-Disposition", "attachment; filename=\"danzheng.xlsx\"");
             response.flushBuffer();
         } catch (Exception e) {
             log.error("报关导出发票异常：{}", e.getMessage());
@@ -1974,7 +1974,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                 workbook.write(response.getOutputStream());
             }
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            response.setHeader("Content-Disposition", "attachment; filename=\"箱单.xlsx\"");
+            response.setHeader("Content-Disposition", "attachment; filename=\"danzheng.xlsx\"");
             response.flushBuffer();
         } catch (Exception e) {
             log.error("报关导出箱单异常：{}", e.getMessage());
@@ -2038,7 +2038,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                 workbook.write(response.getOutputStream());
             }
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            response.setHeader("Content-Disposition", "attachment; filename=\"装箱数据导入模版.xlsx\"");
+            response.setHeader("Content-Disposition", "attachment; filename=\"danzheng.xlsx\"");
             response.flushBuffer();
         } catch (Exception e) {
             log.error("导出装箱数据模版异常：{}", e.getMessage());
@@ -2059,7 +2059,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                 workbook.write(response.getOutputStream());
             }
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            response.setHeader("Content-Disposition", "attachment; filename=\"出口货物委托书.xlsx\"");
+            response.setHeader("Content-Disposition", "attachment; filename=\"danzheng.xlsx\"");
             response.flushBuffer();
         } catch (Exception e) {
             log.error("报关导出出口货物委托书异常：{}", e.getMessage());
@@ -2080,7 +2080,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
                 workbook.write(response.getOutputStream());
             }
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            response.setHeader("Content-Disposition", "attachment; filename=\"合同.xlsx\"");
+            response.setHeader("Content-Disposition", "attachment; filename=\"danzheng.xlsx\"");
             response.flushBuffer();
         } catch (Exception e) {
             log.error("报关导出合同异常：{}", e.getMessage());
@@ -2148,7 +2148,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
             }
 
             response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            response.setHeader("Content-Disposition", "attachment; filename=\"单证信息.xlsx\"");
+            response.setHeader("Content-Disposition", "attachment; filename=\"danzheng.xlsx\"");
             workbook.write(response.getOutputStream());
             response.flushBuffer();
         } catch (IOException e) {
@@ -2220,7 +2220,7 @@ public class CoDelExcelServiceImpl implements CoDelExcelService {
             byte[] pdfBytes = convertExcelToPdf(excelWorkbook);
 
             response.setContentType("application/pdf");
-            response.setHeader("Content-Disposition", "attachment; filename=\"单证信息.pdf\"");
+            response.setHeader("Content-Disposition", "attachment; filename=\"danzheng.pdf\"");
             response.getOutputStream().write(pdfBytes);
             response.flushBuffer();
 
diff --git a/src/main/resources/mapper/ecss/CoDelMapper.xml b/src/main/resources/mapper/ecss/CoDelMapper.xml
index 8748f06b..13a5a16b 100644
--- a/src/main/resources/mapper/ecss/CoDelMapper.xml
+++ b/src/main/resources/mapper/ecss/CoDelMapper.xml
@@ -881,7 +881,7 @@ left join ecss_CoDelNotifyHeader noHeader on a.site=noHeader.site and a.delNo=no
     </select>
 
     <select id="exportEcssCoDelNotifyDetail"  resultType="java.util.Map">
-        select a.customerPO,a.part_no,a.part_description,a.currency,
+        select a.customerPO,a.part_no,a.part_description,LEFT(a.currency, 3) as currency,
                CONVERT(DECIMAL(20, 0), a.qty) as qty,CONVERT(DECIMAL(20, 6), a.tp) as unitPrice,b.hsCode,
                a.upc,a.so,a.ttl_amount,a.pn,h.hsCodeDesc,h.hsCodeDescEn,a.salesOrder
         from ecss_CoDelNotifydetail a