From bee76782de38473d8b871a5a2d31c1d56e63e834 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 14 Dec 2024 17:48:46 +0800
Subject: [PATCH] md

---
 .../erp/oms/web/Oms2cWaybillController.java      |  2 ++
 .../main/resources/mapper/EmisWaybillMapper.xml  | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
index 4da5e4e..08b4f62 100644
--- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
+++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
@@ -214,6 +214,8 @@ public class Oms2cWaybillController extends BaseController
                 emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
             }
         }
+
+        emisWaybill.getParams().put("isSapp","1");
         // 用户只能获取自己的单子
         emisWaybill.setCustomerCode(getLoginUser().getUser().getCustomerCode());
         List<EmisWaybill> list = emisWaybillService.selectUserOrderList(emisWaybill);
diff --git a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 1b975cc..7aff69c 100644
--- a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -369,8 +369,22 @@
             a.del_flag='0'
             <if test="id != null "> and a.id = #{id}</if>
             <if test="orderSn != null  and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if>
-            <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
 
+            <if test="params.isApp !=null params.isApp == 1">
+                <if test="billCode != null  and billCode != ''">
+                 and (
+                        bill_code like concat('%', #{billCode}, '%')
+                        or send_name like concat('%', #{billCode}, '%')
+                        or receive_name like concat('%', #{billCode}, '%')
+                        or receive_mobile like concat('%', #{billCode}, '%')
+                        or send_mobile like concat('%', #{billCode}, '%')
+                    )
+                </if>
+            </if>
+
+            <if test="params.isApp != 1">
+                <if test="billCode != null  and billCode != ''"> and ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
+            </if>
             <if test="custOrderId != null  and custOrderId != ''"> and cust_order_id=#{custOrderId}</if>
             <if test="billCodeSub != null  and billCodeSub != ''"> and bill_code_sub like concat('%', #{billCodeSub}, '%')</if>
             <if test="orderStatus != null  and orderStatus != ''"> and order_status=#{orderStatus}</if>