From e6373e6ed09563d0cdacb62db0096f81dfc03cad Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 14 May 2024 09:44:10 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillController.java   | 49 +++++++++++++++++--
 1 file changed, 45 insertions(+), 4 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 feade0255..13ff19ff4 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
@@ -510,10 +510,6 @@ public class EmisWaybillController extends BaseController
                 // 忽略错误
             }
 
-//            String[] billCodeArr = billCode.split(",");
-//            for(String billCodeItemStr:billCodeArr) {
-//
-//            }
 
             return null;
         }catch (Exception ex){
@@ -524,6 +520,51 @@ public class EmisWaybillController extends BaseController
     }
 
 
+    @RequestMapping("/getPrintDataByPrinter")
+    public AjaxResult getPrintDataByPrinter(HttpServletRequest request, HttpServletResponse response,String billCode, String billCodeRange, String lang, String printType)
+    {
+
+        if(StringUtils.isEmpty(billCode)){
+            return AjaxResult.error("参数错误");
+        }
+
+        if(!StringUtils.isEmpty(billCode)){
+            try {
+                JSONArray jArr = new JSONArray();
+                String[] billCodeArr = billCode.split(",");
+
+                for(String billCodeItem:billCodeArr) {
+                    Map<String, Object> order = emisBaseService.getWaybillPrintOrder(billCode, billCodeRange, lang, printType);
+                    JSONObject printItem = new JSONObject();
+                    printItem.put("billCode",billCodeItem);
+
+                    if(order!=null) {
+                        printItem.put("billDetail",Base64.getEncoder().encodeToString(JSONObject.toJSONString(order).getBytes(Charset.forName("UTF-8"))));
+                        printItem.put("isEncrpt",false);
+                        printItem.put("printCount",1);
+                        printItem.put("printDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date()));
+                        printItem.put("result","success");
+                        printItem.put("message","success");
+                    }else{
+                        printItem.put("result","fail");
+                        printItem.put("message","未获取到数据");
+                    }
+                    jArr.add(printItem);
+                }
+
+                return AjaxResult.success("获取成功",jArr);
+            }catch (Exception ex){
+                ex.printStackTrace();
+                return AjaxResult.error("获取失败");
+            }
+        }
+
+        return AjaxResult.error("获取失败");
+
+    }
+
+
+
 
 
     private void responseJson(HttpServletResponse response,String text){