From 88a25f233bcaf11791a6ebc47711d8db58a987e9 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 10 Jul 2025 16:01:18 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillController.java      | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index 875525978..02e743ea5 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -21,6 +21,7 @@ import javax.validation.Valid;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
 import com.xdadan.erp.common.config.PayConfig;
 import com.xdadan.erp.common.core.domain.entity.SysUser;
@@ -36,6 +37,7 @@ import com.xdadan.erp.emis.service.*;
 import com.xdadan.erp.emis.service.print.IXddTplPrint;
 import com.xdadan.erp.emis.service.print.cpcl.CvtTplToCpcl;
 import com.xdadan.erp.emis.service.print.tanex.TanexTplPrintImpl;
+import com.xdadan.erp.emis.utils.GZipUtils;
 import com.xdadan.erp.emis.utils.PrintUtils;
 import com.xdadan.erp.emis.utils.WaybillHelper;
 import com.xdadan.erp.system.domain.SysFileInfo;
@@ -549,7 +551,19 @@ public class EmisWaybillController extends EmisBaseController
             // 设置通用权限查询参数
             list = emisWaybillService.selectEmisWaybillList(emisWaybill);
         }
-        return getDataTable(list);
+
+        if(emisWaybill.getParams().containsKey("blExport")){
+            List<String> exportList=  new ArrayList<>();
+            JSON.DEFFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
+            String encStr = GZipUtils.zipToBase64Str(JSON.toJSONString(list, SerializerFeature.WriteMapNullValue ,SerializerFeature.WriteDateUseDateFormat));
+            if(encStr!=null) {
+                exportList.add(encStr);
+            }
+            return getDataTable(exportList);
+        }else {
+            return getDataTable(list);
+        }
+
     }