From ab9d82ffbc131d3df26ca04e52ba31ac6fb96a98 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 15 Jan 2025 17:37:26 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/oms/web/Oms2cWaybillController.java   | 2 ++
 .../src/main/resources/mapper/EmisWaybillMapper.xml      | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

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 9d48f4f..0fa103c 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
@@ -195,6 +195,8 @@ public class Oms2cWaybillController extends BaseController
         // bug:1361 EMIS - 运单号的寄件手机号与小程序的手机号一致全部给小程序对应的手机号
         // 获取当前登录人的手机号,如果电话一致就把订单归属给他
         emisWaybill.getParams().put("queryPhone",getLoginUser().getUser().getPhone());
+        emisWaybill.getParams().put("myCustomerType",getLoginUser().getUser().getCustomerType());
+        emisWaybill.getParams().put("myCustNo",getLoginUser().getUser().getMonthlyPayCode());
 
         List<EmisWaybill> list = emisWaybillService.selectUserOrderList(emisWaybill);
         return getDataTable(list);
diff --git a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index ca2b4a0..e8b6578 100644
--- a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -418,7 +418,7 @@
             <if test="sendPostcode != null  and sendPostcode != ''"> and send_postcode like concat('%', #{sendPostcode}, '%')</if>
             <if test="paymentType != null  and paymentType != ''"> and payment_type=#{paymentType}</if>
             <if test="calcFeeType != null  and calcFeeType != ''"> and calc_fee_type=#{calcFeeType}</if>
-            <if test="custNo != null  and custNo != ''"> and cust_no like concat('%', #{custNo}, '%')</if>
+            <if test="custNo != null  and custNo != ''"> and cust_no=#{custNo}</if>
             <if test="custName != null  and custName != ''"> and cust_name like concat('%', #{custName}, '%')</if>
             <if test="transLineType != null  and transLineType != ''"> and trans_line_type=#{transLineType}</if>
             <if test="productType != null  and productType != ''"> and product_type=#{productType}</if>
@@ -540,13 +540,18 @@
 
 
 
-            <!-- 寄件 -->
+            <!-- 寄件 客户自己开单,发件号码是自己的,月结账号是自己的都要显示出来 -->
             <if test="params.omsOrderTab == null or (params.omsOrderTab != null and params.omsOrderTab != 2) ">
                 and (
                     a.customer_code=#{customerCode}
+                    <if test="params.myCustomerType==2 and params.myCustNo != null and params.myCustNo != '' ">
+                        or a.cust_no=#{params.myCustNo}
+                    </if>
+
                     <if test="params.queryPhone != null and params.queryPhone != '' ">
                         or a.send_mobile=#{params.queryPhone}
                     </if>
+
                 )
             </if>