From 7ffe1bdffa472d4cea54cf6f70373917c5818ed9 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 1 Sep 2024 21:49:20 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillController.java   | 29 ++++---------------
 1 file changed, 5 insertions(+), 24 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 950d29c08..9ba03f93d 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
@@ -299,15 +299,14 @@ public class EmisWaybillController extends EmisBaseController
     /**
      * 导出进仓单模板
      * @param response
-     * @return
+     * @param orderSn
      */
     @Log(title = "导出进仓单", businessType = BusinessType.EXPORT)
-    @PostMapping("/exportWarehouseInTpl")
-    public void exportWarehouseInTpl(HttpServletResponse response,WaybillOrder waybillOrder)  {
+    @RequestMapping("/exportWarehouseInTpl")
+    public void exportWarehouseInTpl(HttpServletResponse response,String orderSn)  {
 
         try{
-            emisWaybillService.genWarehouseInTplFile(response,waybillOrder.getOrderSn());
-//            return AjaxResult.success("下载成功");
+            emisWaybillService.genWarehouseInTplFile(response,orderSn);
         }
         catch(EmisBizError ex){
             ex.printStackTrace();
@@ -631,8 +630,7 @@ public class EmisWaybillController extends EmisBaseController
             "sendSiteName","destinationName",
             "dispatchUnderlingSiteName",
             "pickupMethod",
-            "intoWarehouseBillCode",
-
+            "intoWarehouseBillCode"
     },value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @GetMapping("/listSimple")
     public TableDataInfo listSimple(EmisWaybill emisWaybill)
@@ -666,23 +664,6 @@ public class EmisWaybillController extends EmisBaseController
             // 设置通用权限查询参数
             list = emisWaybillService.selectEmisWaybillList(emisWaybill);
         }
-
-
-//        if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
-//            String[] billCodeSortList = emisWaybill.getBillCode().split(",");
-//            if(billCodeSortList.length>1){
-//                emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
-//            }
-//        }
-//
-//        if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
-//            String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
-//            if(orderSnSortList.length>1){
-//                emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
-//            }
-//        }
-
-//        List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
         return getDataTable(list);
     }