From d1e262ef40b0877e90387b59da571377e4ff2784 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 9 May 2024 18:10:10 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillController.java   | 38 +++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

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 d3cd7c082..730fa2758 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
@@ -13,6 +13,7 @@ package com.xdadan.erp.web.emis;
 
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
+import java.io.PrintWriter;
 import java.nio.charset.Charset;
 import java.util.*;
 import javax.servlet.http.HttpServletRequest;
@@ -339,7 +340,7 @@ public class EmisWaybillController extends BaseController
 
 
     @RequestMapping("/realGetWaybillPdf")
-    public AjaxResult realGetWaybillPdf(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang, String printType,String isNeedPdf)
+    public void realGetWaybillPdf(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang, String printType,String isNeedPdf)
     {
         if(!StringUtils.isEmpty(billCode)){
             try {
@@ -357,22 +358,21 @@ public class EmisWaybillController extends BaseController
                         tplPrint.genPDF(order, os);
 
                     }else{
-                        return AjaxResult.success("未获取到数据");
+                        responseJson(response,JSONObject.toJSONString(AjaxResult.error("未获取到数据")));
                     }
                 }
-
-                return AjaxResult.success("获取成功",jArr);
             }catch (Exception ex){
                 ex.printStackTrace();
-                return AjaxResult.error("获取失败");
+                responseJson(response,JSONObject.toJSONString(AjaxResult.error("获取异常")));
+
             }
         }
+        responseJson(response,JSONObject.toJSONString(AjaxResult.error("获取失败")));
 
-        return AjaxResult.error("获取失败");
     }
 
     @RequestMapping("/realGetWaybillPng")
-    public AjaxResult realGetWaybillPng(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang, String printType,String isNeedPdf)
+    public void realGetWaybillPng(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang, String printType,String isNeedPdf)
     {
         if(!StringUtils.isEmpty(billCode)){
             try {
@@ -390,21 +390,37 @@ public class EmisWaybillController extends BaseController
                         tplPrint.genPNG(order, os);
 
                     }else{
-                        return AjaxResult.success("未获取到数据");
+                        responseJson(response,JSONObject.toJSONString(AjaxResult.error("未获取到数据")));
                     }
                 }
 
-                return AjaxResult.success("获取成功",jArr);
             }catch (Exception ex){
                 ex.printStackTrace();
-                return AjaxResult.error("获取失败");
+
+                responseJson(response,JSONObject.toJSONString(AjaxResult.error("获取异常")));
             }
         }
 
-        return AjaxResult.error("获取失败");
+        responseJson(response,JSONObject.toJSONString(AjaxResult.error("获取失败")));
     }
 
 
+    private void responseJson(HttpServletResponse response,String text){
+        response.setCharacterEncoding("UTF-8");
+        response.setContentType("application/json; charset=utf-8");
+        PrintWriter out = null;
+        try {
+            out = response.getWriter();
+            out.append(text);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (out != null) {
+                out.close();
+            }
+        }
+    }
+
 
 //    /**
 //     * 导出运单列表列表