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-12-14 17:48:46 +08:00
parent 5eb8517413
commit bee76782de
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,6 +214,8 @@ public class Oms2cWaybillController extends BaseController
emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList)); emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
} }
} }
emisWaybill.getParams().put("isSapp","1");
// 用户只能获取自己的单子 // 用户只能获取自己的单子
emisWaybill.setCustomerCode(getLoginUser().getUser().getCustomerCode()); emisWaybill.setCustomerCode(getLoginUser().getUser().getCustomerCode());
List<EmisWaybill> list = emisWaybillService.selectUserOrderList(emisWaybill); List<EmisWaybill> list = emisWaybillService.selectUserOrderList(emisWaybill);

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

@ -369,8 +369,22 @@
a.del_flag='0' a.del_flag='0'
<if test="id != null "> and a.id = #{id}</if> <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="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="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="billCodeSub != null and billCodeSub != ''"> and bill_code_sub like concat('%', #{billCodeSub}, '%')</if>
<if test="orderStatus != null and orderStatus != ''"> and order_status=#{orderStatus}</if> <if test="orderStatus != null and orderStatus != ''"> and order_status=#{orderStatus}</if>