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

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

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/183
This commit is contained in:
heyu 2025-09-10 11:51:27 +08:00
commit a501cd4f84
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSpecialCalcWeight.java
View File

@ -69,4 +69,8 @@ public class EmisSpecialCalcWeight extends BaseEntity
private String countryName; private String countryName;
// ------- 过期状态查询字段
/* 过期状态 0-全部 1-已过期 2-未过期 */
private Integer expireStatus;
} }

9
emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
View File

@ -151,12 +151,9 @@
<if test="params.billCode != null and params.billCode != ''"> <if test="params.billCode != null and params.billCode != ''">
and EXISTS( and EXISTS(
select 1 from emis_settle_bill x2,emis_settle_invoice_bill_rel x3,emis_settle_sub_bill x4 select 1 from emis_settle_invoice_rel rel
where x2.del_flag = '0' and x3.del_flag = '0' and x4.del_flag='0' where rel.del_flag = '0' and rel.bill_no=#{params.billCode}
and a.apply_seq_no=x3.apply_seq_no and rel.apply_seq_no = a.apply_seq_no
and x2.settle_bill_no=x3.settle_bill_no
and x4.settle_bill_no=x2.settle_bill_no
and FIND_IN_SET(x4.`bill_code`,#{params.billCode})
) )

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

@ -53,6 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null "> and update_time = #{updateTime}</if> <if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and create_site = #{createSite}</if> <if test="createSite != null and createSite != ''"> and create_site = #{createSite}</if>
<if test="updateSite != null and updateSite != ''"> and update_site = #{updateSite}</if> <if test="updateSite != null and updateSite != ''"> and update_site = #{updateSite}</if>
<if test="expireStatus != null and expireStatus == 1"> and end_date <![CDATA[<]]> now()</if>
<if test="expireStatus != null and expireStatus == 2"> and end_date <![CDATA[>=]]> now()</if>
</where> </where>
order by create_time desc order by create_time desc
</select> </select>

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

@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and last_waybill_status != '50' and last_waybill_status != '50'
and last_trace_date <![CDATA[ > ]]> DATE_SUB(CURDATE(), INTERVAL 30 DAY) and last_trace_date <![CDATA[ > ]]> DATE_SUB(CURDATE(), INTERVAL 30 DAY)
and update_time <![CDATA[ < ]]> SUBDATE(now(),interval 2 hour) and update_time <![CDATA[ < ]]> SUBDATE(now(),interval 2 hour)
or last_trace_date is null or (last_trace_date is null and del_flag='0')
</if> </if>
</where> </where>