From 400c02b7b310bd23d5b139ef10a9fd1dfd06746f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 12 Aug 2024 00:27:41 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillController.java   | 38 ++++++++++++++-----
 1 file changed, 28 insertions(+), 10 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 491ebc8da..ac6808483 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
@@ -498,23 +498,41 @@ public class EmisWaybillController extends EmisBaseController
 
         setPrivParams(emisWaybill);
 
+        List<EmisWaybill> list = null;
+        // 如果单号不为空，则去除其他参数
         if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
-            emisWaybill.setBillCode(WaybillHelper.formatQueryValue(emisWaybill.getBillCode()));
+
+            EmisWaybill queryEmisWaybill =new EmisWaybill();
+            queryEmisWaybill.setBillCode(WaybillHelper.formatQueryValue(emisWaybill.getBillCode()));
             String[] billCodeSortList = emisWaybill.getBillCode().split(",");
             if(billCodeSortList.length>1){
-                emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
+                queryEmisWaybill.setParams(null);
+                queryEmisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
             }
+            list = emisWaybillService.selectPrintWaybillList(queryEmisWaybill);
+        }else{
+            // 设置通用权限查询参数
+            list = emisWaybillService.selectPrintWaybillList(emisWaybill);
         }
 
-        if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
-            emisWaybill.setOrderSn(WaybillHelper.formatQueryValue(emisWaybill.getOrderSn()));
-            String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
-            if(orderSnSortList.length>1){
-                emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
-            }
-        }
 
-        List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
+//        if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
+//            emisWaybill.setBillCode(WaybillHelper.formatQueryValue(emisWaybill.getBillCode()));
+//            String[] billCodeSortList = emisWaybill.getBillCode().split(",");
+//            if(billCodeSortList.length>1){
+//                emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
+//            }
+//        }
+
+//        if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
+//            emisWaybill.setOrderSn(WaybillHelper.formatQueryValue(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);
     }