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

Merge pull request 'develop' (#249) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/249
This commit is contained in:
heyu 2025-12-01 15:39:49 +08:00
commit 1e562ba6cf
4 changed files with 8 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()));
}
if(!StringUtils.isEmpty(emisTmsSiteBatch.getCarNo())){
emisTmsSiteBatch.setCarNo(WaybillHelper.formatQueryValue(emisTmsSiteBatch.getCarNo()));
}
if(emisTmsSiteBatch.getParams().get("billCode")!=null){
String billCodeStr=emisTmsSiteBatch.getParams().get("billCode").toString();
billCodeStr=WaybillHelper.formatQueryValue(billCodeStr);

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

@ -83,6 +83,8 @@
<foreach item="status" collection="params.waybillBatchStatusList" open="(" separator="," close=")">
#{status}
</foreach>
and exists (select 1 from emis_tms_site_batch batch where batch.batch_no =
emis_tms_site_batch_dtl.batch_no and batch.del_flag='0')
</if>
<if test="params.privSiteCode != null and params.privSiteCode != '88888'">

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="eta != null "> and eta = #{eta}</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="clearanceResStatus != null and clearanceResStatus != ''"> and clearance_res_status= #{clearanceResStatus}</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 != ''">
and a.trans_line_type = #{lineCode}
</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),
-- '%Y-%m-%d')
and ((a.virtual_remark is null or a.virtual_remark = '' or a.virtual_remark = ' ')or a.receive_country !=