From 57322742a9fc1eb3661be915995662d77d36c086 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 31 May 2024 06:05:37 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillController.java       | 14 ++++++++++++++
 .../main/resources/mapper/EmisWaybillMapper.xml   | 15 +++++++++++++++
 2 files changed, 29 insertions(+)

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 a86a3edf3..b39a35c23 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
@@ -296,6 +296,20 @@ public class EmisWaybillController extends BaseController
             emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName());
         }
 
+        if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
+            String[] billCodeSortList = emisWaybill.getBillCode().split(",");
+            if(billCodeSortList.length>1){
+                emisWaybill.getParams().put("billCodeSortList",billCodeSortList);
+            }
+        }
+
+        if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
+            String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
+            if(orderSnSortList.length>1){
+                emisWaybill.getParams().put("orderSnSortList",orderSnSortList);
+            }
+        }
+
         List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
         return getDataTable(list);
     }
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index f4f3b0ee4..faee9622b 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -553,6 +553,21 @@
             </if>
 
         </where>
+
+        <if test="params.orderSnSortList != null and orderSnSortList.size >0  ">
+            ORDER BY FIELD
+            <foreach collection="orderSnSortList" item="name" open="(order_sn," separator="," close=")">
+                #{name}
+            </foreach>
+            ,
+        </if>
+        <if test="params.billCodeSortList != null and billCodeSortList.size >0  ">
+            ORDER BY FIELD
+            <foreach collection="billCodeSortList" item="name" open="(bill_code," separator="," close=")">
+                #{name}
+            </foreach>
+            ,
+        </if>
         order by create_time desc
     </select>