From 2b61236512bb245aeb8e847ac0a46fa1353f4584 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 30 Aug 2024 18:47:07 +0800
Subject: [PATCH] md

---
 .../erp/oms/web/Oms2cWaybillController.java      |  1 -
 .../mapper/EmisCustomerAddressMapper.xml         |  2 +-
 .../main/resources/mapper/EmisWaybillMapper.xml  | 16 +++++++++++++---
 3 files changed, 14 insertions(+), 5 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 3811cea..95f6515 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
@@ -213,7 +213,6 @@ public class Oms2cWaybillController extends BaseController
             }
         }
         // 用户只能获取自己的单子
-//        emisWaybill.setUserId(getLoginUser().getUser().getId());
         emisWaybill.setCustomerCode(getLoginUser().getUser().getCustomerCode());
         List<EmisWaybill> list = emisWaybillService.selectUserOrderList(emisWaybill);
         return getDataTable(list);
diff --git a/emis-oms-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
index 9cf557e..18138b6 100644
--- a/emis-oms-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
+++ b/emis-oms-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
@@ -209,7 +209,7 @@
     </update>
 
     <update id="cancelCustomerDefaultFlag" parameterType="String">
-        update emis_customer_address set bl_site_default_flag = '0' where customer_code = #{customerCode}
+        update emis_customer_address set bl_default_flag = '0' where customer_code = #{customerCode}
     </update>
 
 
diff --git a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 3a62c9c..418e880 100644
--- a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -458,11 +458,8 @@
             <if test="createSite != null  and createSite != ''"> and a.create_site=#{createSite}</if>
             <if test="updateSite != null  and updateSite != ''"> and a.update_site=#{updateSite}</if>
 
-
             <if test="userId != null "> and a.user_id = #{userId}</if>
 
-             and customer_code=#{customerCode}
-
 
             <if test="params.waybillStatType != null and params.waybillStatType == 1">
                 and a.waybill_status='0' and a.order_status='0'
@@ -489,6 +486,19 @@
                 and a.bl_sign!='1'
             </if>
 
+            <!-- 寄件 -->
+            <if test="params.omsOrderTab == null or (params.omsOrderTab != null and params.omsOrderTab == 1) ">
+                and a.customer_code=#{customerCode}
+            </if>
+
+            <if test="params.omsOrderTab != null and params.omsOrderTab == 2 ">
+                and exists (select 1 from emis_customer_user ecu where a.del_flag='0' and a.receive_mobile=ecu.phone  and ecu.customer_code=#{customerCode} )
+                and a.bill_code not in (
+                    select bill_code from emis_waybill_problem_info ewpi where  ewpi.del_flag='0' and  FIND_IN_SET( ewpi.`problem_type`, 173,170,151)
+                )
+            </if>
+
+
             <if test="params.beginDate != null and params.beginDate != ''">
                 and a.send_date <![CDATA[ >= ]]>  #{params.beginDate}
             </if>