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

demand: TMS系统 - 运输管理 - 货物组批次 - 查询条件“运输号”查询逻辑调整

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-12-01 09:34:28 +08:00
parent 1ec77676ae
commit c840fb3d53
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsSiteBatchController.java
View File

@ -79,6 +79,10 @@ public class EmisTmsSiteBatchController extends EmisBaseController
emisTmsSiteBatch.setBatchNo(WaybillHelper.formatQueryValue(emisTmsSiteBatch.getBatchNo())); emisTmsSiteBatch.setBatchNo(WaybillHelper.formatQueryValue(emisTmsSiteBatch.getBatchNo()));
} }
if(!StringUtils.isEmpty(emisTmsSiteBatch.getCarNo())){
emisTmsSiteBatch.setCarNo(WaybillHelper.formatQueryValue(emisTmsSiteBatch.getCarNo()));
}
if(emisTmsSiteBatch.getParams().get("billCode")!=null){ if(emisTmsSiteBatch.getParams().get("billCode")!=null){
String billCodeStr=emisTmsSiteBatch.getParams().get("billCode").toString(); String billCodeStr=emisTmsSiteBatch.getParams().get("billCode").toString();
billCodeStr=WaybillHelper.formatQueryValue(billCodeStr); billCodeStr=WaybillHelper.formatQueryValue(billCodeStr);

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

@ -174,7 +174,7 @@
<if test="etd != null "> and etd = #{etd}</if> <if test="etd != null "> and etd = #{etd}</if>
<if test="eta != null "> and eta = #{eta}</if> <if test="eta != null "> and eta = #{eta}</if>
<if test="packNum != null "> and pack_num = #{packNum}</if> <if test="packNum != null "> and pack_num = #{packNum}</if>
<if test="carNo != null and carNo != ''"> and car_no like concat('%', #{carNo}, '%')</if> <if test="carNo != null and carNo != ''"> and FIND_IN_SET(`car_no`,#{carNo})</if>
<if test="shipNo != null and shipNo != ''"> and ship_no=#{shipNo}</if> <if test="shipNo != null and shipNo != ''"> and ship_no=#{shipNo}</if>
<if test="clearanceResStatus != null and clearanceResStatus != ''"> and clearance_res_status= #{clearanceResStatus}</if> <if test="clearanceResStatus != null and clearanceResStatus != ''"> and clearance_res_status= #{clearanceResStatus}</if>
<if test="declareResStatus != null and declareResStatus != ''"> and declare_res_status=#{declareResStatus}</if> <if test="declareResStatus != null and declareResStatus != ''"> and declare_res_status=#{declareResStatus}</if>

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

@ -3933,7 +3933,7 @@
<if test="lineCode != null and lineCode != ''"> <if test="lineCode != null and lineCode != ''">
and a.trans_line_type = #{lineCode} and a.trans_line_type = #{lineCode}
</if> </if>
-- and DATE_FORMAT(a.send_date, '%Y-%m-%d') <![CDATA[ >= ]]> '2025-01-01' and DATE_FORMAT(a.send_date, '%Y-%m-%d') <![CDATA[ >= ]]> '2025-01-01'
-- and DATE_FORMAT(a.send_date, '%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 7 DAY), -- and DATE_FORMAT(a.send_date, '%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(DATE_SUB(CURDATE(), INTERVAL 7 DAY),
-- '%Y-%m-%d') -- '%Y-%m-%d')
and ((a.virtual_remark is null or a.virtual_remark = '' or a.virtual_remark = ' ')or a.receive_country != and ((a.virtual_remark is null or a.virtual_remark = '' or a.virtual_remark = ' ')or a.receive_country !=