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

Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/183

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

@@ -1,10 +1,10 @@
-/** 
+/**
  * @Project: emis
  * @Title: EmisSpecialCalcWeight.java
  * @author linfso
  * @date 2024-01-10 06:50:43
  * @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0  
+ * @version v1.0
  * @Description: <p> 特殊取重 实体类 </p>
  */
 
@@ -69,4 +69,8 @@ public class EmisSpecialCalcWeight extends BaseEntity
 
     private String countryName;
 
+    // ------- 过期状态查询字段
+    /* 过期状态 0-全部 1-已过期 2-未过期 */
+    private Integer expireStatus;
+
 }

emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml

@@ -151,12 +151,9 @@
             <if test="params.billCode != null and params.billCode != ''">
 
                 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})
                 )
 
 

emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml

@@ -53,6 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null "> and update_time = #{updateTime}</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="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>
         order by create_time desc
     </select>

emis-biz/src/main/resources/mapper/EmisTmsTransferTraceMapper.xml

@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectEmisTmsTransferTraceList" parameterType="EmisTmsTransferTrace" resultMap="EmisTmsTransferTraceResult">
         <include refid="selectEmisTmsTransferTraceVo"/>
-        <where>  
+        <where>
              del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="billCode != null  and billCode != ''"> and bill_code =#{billCode}</if>
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and last_waybill_status != '50'
                 and last_trace_date <![CDATA[ > ]]>  DATE_SUB(CURDATE(), INTERVAL 30 DAY)
                 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>
 
         </where>
@@ -73,9 +73,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
 
-  
+
     <select id="selectEmisTmsTransferTraceById" parameterType="Long" resultMap="EmisTmsTransferTraceResult">
-        select id, bill_code, last_trace_date, last_waybill_status, trace_info, ch_id, transfer_bill_code, transfer_express, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
+        select id, bill_code, last_trace_date, last_waybill_status, trace_info, ch_id, transfer_bill_code, transfer_express, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_tms_transfer_trace a
         where a.id = #{id}
     </select>
@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          and a.bill_code = #{billCode} order by create_time desc  limit 1
     </select>
 
-        
+
     <insert id="insertEmisTmsTransferTrace" parameterType="EmisTmsTransferTrace" useGeneratedKeys="true" keyProperty="id">
         insert into emis_tms_transfer_trace
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -169,4 +169,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>