2024年7月8日09:13:15 吉永去掉有效期

ruoyi-warehouse/src/main/resources/mapper/quotation/TSeapriceMapper.xml

@@ -146,7 +146,6 @@
             <if test="fCorpid != null ">and s.f_corpid = #{fCorpid}</if>
             <if test="polId != null ">and s.pol_id = #{polId}</if>
             <if test="podId != null ">and s.pod_id = #{podId}</if>
-            <if test="fValiddate != null ">and s.f_validdate = #{fValiddate}</if>
             <if test="fBillstatus != null ">and s.f_billstatus = #{fBillstatus}</if>
             <if test="remarks != null  and remarks != ''">and remarks = #{remarks}</if>
             <if test="fLineid != null  and fLineid != ''">and f_lineid = #{fLineid}</if>
@@ -172,7 +171,6 @@
           AND pol_id = #{polId}
           AND pod_id = #{podId}
           AND pod_id = #{podId}
-          AND f_validdate &gt;= #{fValiddate}
     </select>
 
     <select id="selectSeapriceItemAmt" parameterType="TSeaprice" resultType="BigDecimal">
@@ -191,6 +189,8 @@
           AND s.f_type = #{fType}
     </select>
 
+
+<!--  AND t.f_validdate &gt;= #{fValiddate}  -->
     <select id="selectSeapriceItem" parameterType="TSeaprice" resultType="Map">
         SELECT distinct f.f_name fFeeid, s.remark remark, IF(s.f_type = '0', s.${fSpecification}, s.f_unitprice) fUnitprice
         FROM t_seaprice t
@@ -198,7 +198,6 @@
                  LEFT JOIN t_fees f ON f.f_id = s.f_feeid
         WHERE t.f_billtype = #{fBilltype}
           AND t.f_corpid = #{fCorpid}
-          AND t.f_validdate &gt;= #{fValiddate}
           AND t.pol_id = #{polId}
           AND t.pod_id = #{podId}
           AND t.f_lineid = #{fLineid}
@@ -220,7 +219,6 @@
                  LEFT JOIN t_fees f ON f.f_id = s.f_feeid
         WHERE t.f_billtype = #{fBilltype}
           AND t.f_corpid = #{fCorpid}
-          AND t.f_validdate &gt;= #{fValiddate}
           AND t.f_billstatus = 0
           AND t.del_flag = '0'
           AND f.f_name = '海运费'
@@ -310,4 +308,4 @@
         </foreach>
     </delete>
 
-</mapper>
+</mapper>