添加状态跟踪查询条件，优化台账查询条件

ruoyi-fleet/src/main/java/com/ruoyi/orderManagement/finance/service/impl/FTmsaccbillsServiceImpl.java

@@ -354,6 +354,7 @@ public class FTmsaccbillsServiceImpl implements IFTmsaccbillsService {
         FTmsaccbills tFee = new FTmsaccbills();
         tFee.setId(fPid);
         tFee.setfBillstatus(fettle);
+        tFee.setPostDate(new Date());
         fTmsaccbillsMapper.updateFTmsaccbills(tFee);
         fTmsaccbillsitemsMapper.tfeeDoFollowUpdate(fPid, fettle);
         return AjaxResult.success();

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/mapper/FtmsorderbillscarsMapper.java

@@ -226,4 +226,11 @@ public interface FtmsorderbillscarsMapper {
      * @return  结果
      */
     public Map<String, Object> selectTmsorderbillsCarsByBillKind(String billKind);
+
+    /**
+     *  查询台账对应费用信息
+     * @param mBillNo
+     * @return
+     */
+    public VehicleLedgerExcel selectCarsFeeByMBillNo(String mBillNo);
 }

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillscarsServiceImpl.java

@@ -594,7 +594,17 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
      */
     @Override
     public List<VehicleLedgerExcel> queryLedgerList(VehicleLedgerExcel vehicleLedgerExcel) {
-        return ftmsorderbillscarsMapper.queryLedgerList(vehicleLedgerExcel);
+        List<VehicleLedgerExcel> vehicleLedgerExcels = ftmsorderbillscarsMapper.queryLedgerList(vehicleLedgerExcel);
+        if (StringUtils.isNotEmpty(vehicleLedgerExcels)) {
+            for (VehicleLedgerExcel ex : vehicleLedgerExcels) {
+                VehicleLedgerExcel vehicleLedger = ftmsorderbillscarsMapper.selectCarsFeeByMBillNo(ex.getmBillNo());
+                ex.setOtherCr(vehicleLedger.getOtherCr());
+                ex.setOtherDr(vehicleLedger.getOtherDr());
+                ex.setShippingCr(vehicleLedger.getShippingCr());
+                ex.setShippingDr(vehicleLedger.getShippingDr());
+            }
+        }
+        return vehicleLedgerExcels;
     }
 
     /**

ruoyi-fleet/src/main/resources/mapper/finance/FTmsaccbillsMapper.xml

@@ -231,7 +231,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cntr.status = '0'
             <if test="fCorpid != null  and fCorpid != ''">and t.corp_id = #{ fCorpid} </if>
             <if test="fToCorpid != null  and fToCorpid != ''">and w.f_corpid = #{ fToCorpid} </if>
-            <if test="fMblno != null  and fMblno != ''">and w.f_mblno  like concat('%', #{ fMblno}, '%') </if>
+            <if test="fMblno != null  and fMblno != ''">and car.mblno  like concat('%', #{ fMblno}, '%') </if>
             <if test="fStatementNo != null and fStatementNo != ''">and w.f_statement_no  like concat('%', #{ fStatementNo}, '%') </if>
             <if test='fReconciliation != null and fReconciliation != "" and fReconciliation == "1" '>
                 and w.f_accamount_date IS NOT NULL
@@ -402,6 +402,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="postDate != null "> and f.post_date = #{postDate}</if>
             <if test="fBillstatus != null "> and f.f_billstatus = #{fBillstatus}</if>
             <if test="fRemarks != null  and fRemarks != ''"> and f.f_remarks = #{fRemarks}</if>
+            <if test=' timeInterval != null and  timeInterval[0] != null and  timeInterval[0]!= ""'>
+                and f.f_accbilldate &gt;= #{ timeInterval[0]}
+            </if>
+            <if test=' timeInterval != null and  timeInterval[1] != null and  timeInterval[1]!= ""'>
+                and f.f_accbilldate &lt;= #{ timeInterval[1]}
+            </if>
         </where>
     </select>
 

ruoyi-fleet/src/main/resources/mapper/finance/FTmsaccbillsitemsMapper.xml

@@ -67,7 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectItemsMapById" resultType="java.util.Map">
-        SELECT DISTINCT
+        SELECT
+            item.id itemId,
             t.id fSrcpid,
             c.f_name fFeesName,
             car.mblno fMblno,
@@ -98,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN t_fees f ON w.f_feeid = f.f_id
         WHERE
             tm.id = #{id}
+        GROUP BY    item.id
     </select>
 
     <insert id="insertFTmsaccbillsitems" parameterType="FTmsaccbillsitems" useGeneratedKeys="true" keyProperty="id">

ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillscarsMapper.xml

@@ -839,6 +839,7 @@
             WHEN 'MH' THEN
             '从单'
             END billType,
+            c.m_bill_no mBillNo,
             c.mblno inMblno,
             t.load_addr loadAddr,
             t.md_load_addr mdLoadAddr,
@@ -863,6 +864,7 @@
             AND cntr.dict_type = 'data_cntrId'
         <where>
             c.id != ''
+            AND c.order_no IS NOT NULL
             <if test='tCorpId != null'>and c.corp_id = #{tCorpId}</if>
             <if test='stlStatus != null and stlStatus == "T"'>and (c.stl_amt_dr != 0 or c.stl_amt_cr != 0)</if>
             <if test='stlStatus != null and stlStatus == "F"'>and c.stl_amt_dr = 0 and c.stl_amt_cr = 0</if>
@@ -886,7 +888,7 @@
             <if test="mBillNo != null  and mBillNo != ''"> and c.m_bill_no like concat('%', #{mBillNo}, '%')</if>
             <if test="carregNo != null  and carregNo != ''"> and c.carreg_no like concat('%', #{carregNo}, '%')</if>
         </where>
-        GROUP BY t.id
+        GROUP BY c.m_bill_no
     </select>
 
     <select id="selectTmsorderbillsCarsByBillKind" resultType="Map">
@@ -915,6 +917,20 @@
 	        AND c.m_bill_no = #{billKind}
     </select>
 
+    <select id="selectCarsFeeByMBillNo" resultType="com.ruoyi.orderPlan.domain.VehicleLedgerExcel">
+        SELECT
+            sum( CASE WHEN f.f_feeid = 61 AND f.f_dc = 'D' THEN f_amount ELSE 0 END ) shippingDr,
+            sum( CASE WHEN f.f_feeid != 61 AND f.f_dc = 'D' THEN f_amount ELSE 0 END ) otherDr,
+            sum( CASE WHEN f.f_feeid = 61 AND f.f_dc = 'C' THEN f_amount ELSE 0 END ) shippingCr,
+            sum( CASE WHEN f.f_feeid != 61 AND f.f_dc = 'C' THEN f_amount ELSE 0 END ) otherCr
+        FROM
+            F_TMSORDERBILLSCARS c
+            LEFT JOIN F_TMSORDERBILLSFEES f ON f.f_pid = c.id
+            LEFT JOIN t_fees fee ON fee.f_id = f.f_feeid
+        WHERE
+            c.m_bill_no = #{mBillNo}
+    </select>
+
     <insert id="insertftmsorderbillscars" parameterType="ftmsorderbillscars" useGeneratedKeys="true" keyProperty="id">
         insert into F_TMSORDERBILLSCARS
         <trim prefix="(" suffix=")" suffixOverrides=",">