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

md

Browse Source
This commit is contained in:
linfso 2025-04-01 07:39:12 +08:00
parent af07178e6c
commit 0654dcdab6
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,7 +98,7 @@ public class EmisWaybillAttachmentController extends EmisBaseController
List<EmisWaybillAttachment> list=null;
if(!StringUtils.isEmpty(billCode)){
EmisWaybillAttachment emisWaybillAttachment = new EmisWaybillAttachment();
emisWaybillAttachment.setBillCode(billCode);
emisWaybillAttachment.setBillCode(WaybillHelper.formatQueryValue(billCode));
String[] billCodeSortList = emisWaybillAttachment.getBillCode().split(",");
if(billCodeSortList.length>1){
emisWaybillAttachment.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));

10
emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
View File

@ -283,13 +283,15 @@
<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 FIND_IN_SET(`main_bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') ) -->
<if test="billCode != null and billCode != '' and params.billCodeSortList == null">
and `bill_code`=#{billCode}
</if>
<if test="params.billCodeSortList != null and params.billCodeSortList.size > 1 ">
and bill_code in
<foreach collection="params.billCodeSortList" item="item" open="(" separator="," close=")">
<foreach collection="params.billCodeSortList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</if>
<if test="scanType != null and scanType != ''"> and scan_type=#{scanType}</if>
<if test="preOrNextStation != null and preOrNextStation != ''"> and pre_or_next_station like concat('%', #{preOrNextStation}, '%')</if>

20
emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
View File

@ -28,16 +28,20 @@
del_flag='0'
<if test="id != null "> and id = #{id}</if>
<if test="waybillId != null "> and waybill_id = #{waybillId}</if>
<if test="billCode != null and billCode != ''">
and bill_code in
<foreach collection="params.billCodeSortList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
<!--
and `bill_code` ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )
-->
<!--
and `bill_code` ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )
-->
<if test="billCode != null and billCode != '' and params.billCodeSortList == null">
and `bill_code`=#{billCode}
</if>
<if test="params.billCodeSortList != null and params.billCodeSortList.size > 1 ">
and bill_code in
<foreach collection="params.billCodeSortList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="attachType != null and attachType != ''"> and FIND_IN_SET(attach_type,#{attachType})</if>
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
<if test="fileUrl != null and fileUrl != ''"> and file_url like concat('%', #{fileUrl}, '%')</if>