aike/emis-oms2c-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-08-30 18:47:07 +08:00
parent a472cc66ae
commit 2b61236512
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
View File

@ -213,7 +213,6 @@ public class Oms2cWaybillController extends BaseController
} }
} }
// 用户只能获取自己的单子 // 用户只能获取自己的单子
// emisWaybill.setUserId(getLoginUser().getUser().getId());
emisWaybill.setCustomerCode(getLoginUser().getUser().getCustomerCode()); emisWaybill.setCustomerCode(getLoginUser().getUser().getCustomerCode());
List<EmisWaybill> list = emisWaybillService.selectUserOrderList(emisWaybill); List<EmisWaybill> list = emisWaybillService.selectUserOrderList(emisWaybill);
return getDataTable(list); return getDataTable(list);

2
emis-oms-biz/src/main/resources/mapper/EmisCustomerAddressMapper.xml
View File

@ -209,7 +209,7 @@
</update> </update>
<update id="cancelCustomerDefaultFlag" parameterType="String"> <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> </update>

16
emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -458,11 +458,8 @@
<if test="createSite != null and createSite != ''"> and a.create_site=#{createSite}</if> <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="updateSite != null and updateSite != ''"> and a.update_site=#{updateSite}</if>
<if test="userId != null "> and a.user_id = #{userId}</if> <if test="userId != null "> and a.user_id = #{userId}</if>
and customer_code=#{customerCode}
<if test="params.waybillStatType != null and params.waybillStatType == 1"> <if test="params.waybillStatType != null and params.waybillStatType == 1">
and a.waybill_status='0' and a.order_status='0' and a.waybill_status='0' and a.order_status='0'
@ -489,6 +486,19 @@
and a.bl_sign!='1' and a.bl_sign!='1'
</if> </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 != ''"> <if test="params.beginDate != null and params.beginDate != ''">
and a.send_date <![CDATA[ >= ]]> #{params.beginDate} and a.send_date <![CDATA[ >= ]]> #{params.beginDate}
</if> </if>