From ef3cac2ac85e969b1b203daf960e53685ef96628 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Thu, 3 Jul 2025 14:23:50 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=E6=89=AB=E6=8F=8F=E6=BC=8F?= =?UTF-8?q?=E7=BB=84=E6=89=B9=E6=AC=A1=E8=BF=87=E6=BB=A4=E9=9D=A2=E5=8D=95?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=EF=BC=8C=E6=89=AB=E6=8F=8F=E4=B8=80?= =?UTF-8?q?=E5=91=A8=E4=BB=A5=E5=89=8D=E7=9A=84=E3=80=82=E6=BC=8F=E7=BB=84?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E4=BB=8E=E8=A1=A8=E6=A0=BC=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96=20committer:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EmisTmsSiteBatchMissServiceImpl.java | 17 +++++++++++++++- .../mapper/EmisTmsSiteBatchMissMapper.xml | 20 +++++++++++++++---- .../resources/mapper/EmisWaybillMapper.xml | 7 ++++--- 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java index 6a2bc729e..96f1c20b3 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java @@ -10,7 +10,10 @@ import cn.hutool.core.collection.CollectionUtil; import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.mapper.*; import com.xdadan.erp.emis.service.EmisBaseService; +import com.xdadan.erp.emis.utils.WaybillHelper; +import jodd.util.StringUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -67,7 +70,19 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements @Override public List selectEmisTmsSiteBatchMissList(EmisTmsSiteBatchMiss emisTmsSiteBatchMiss) { log.info("Selecting TMS site batch miss list with params: {}", emisTmsSiteBatchMiss); - return emisTmsSiteBatchMissMapper.selectEmisTmsSiteBatchMissList(emisTmsSiteBatchMiss); + List list = null; + // 如果单号不为空，则去除其他参数 + if(!StringUtils.isEmpty(emisTmsSiteBatchMiss.getBillCode())){ + emisTmsSiteBatchMiss.setBillCode(WaybillHelper.formatQueryValue(emisTmsSiteBatchMiss.getBillCode())); + String[] billCodeSortList = emisTmsSiteBatchMiss.getBillCode().split(","); + if(billCodeSortList.length>1){ + emisTmsSiteBatchMiss.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList)); + } + list = emisTmsSiteBatchMissMapper.selectEmisTmsSiteBatchMissList(emisTmsSiteBatchMiss); + }else{ + list = emisTmsSiteBatchMissMapper.selectEmisTmsSiteBatchMissList(emisTmsSiteBatchMiss); + } + return list; } /** diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml index 5d352b1a2..ef6032fa0 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml @@ -164,8 +164,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join emis_country c2 on w.receive_country=c2.code and c2.del_flag=0 b.site_batch_status = '1' - - AND w.bill_code REGEXP REPLACE(#{billCode}, '\n', '|') + + and ( b.`bill_code`=#{billCode} or b.bill_code like concat('%',#{billCode}) ) + + + and b.bill_code in + + #{item} + AND w.trans_line_type = #{lineCode} @@ -225,8 +231,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - AND m.bill_code REGEXP REPLACE(#{billCode}, '\n', '|') + + and ( m.`bill_code`=#{billCode} or m.bill_code like concat('%',#{billCode}) ) + + + and m.bill_code in + + #{item} + AND m.miss_reason like concat('%', #{missReason}, '%') diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index ff3629398..126b8ae47 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -3808,14 +3808,15 @@ select a.id, a.bill_code,a.trans_line_type, a.product_type,a.start_site_code,a.send_site_code from emis_waybill a left join emis_waybill_batch_status b on a.bill_code = b.bill_code - where a.bl_sign = '1' - and a.del_flag = '0' + where a.del_flag = '0' and (b.site_batch_status is null or b.site_batch_status != '1') and a.trans_line_type = #{lineCode} and a.send_date ]]> '2025-01-01 00:00:00' - and (a.virtual_remark is null or virtual_remark = '') + and a.send_date DATE_SUB(CURDATE(), INTERVAL 7 DAY) + and (a.virtual_remark is null or virtual_remark = '' or virtual_remark = ' ') + and (a.problem_type is null or a.problem_type != 151) order by a.create_time desc limit #{offset}, #{pageSize}