Browse Source

凯和修改

lazhaoqian 3 years ago
parent
commit
2a10085ac1

+ 1 - 1
ruoyi-warehouse/src/main/resources/mapper/finance/TFeeDoMapper.xml

@@ -278,7 +278,7 @@ CASE
 	th.f_destportid AS fDestportid,
 	tre.f_name AS fLoadPortName,
 	ts.f_name AS fDestPortName,
-	tw.f_mblno AS srcBillNo,
+	th.f_mblno AS srcBillNo,
 	c.f_name AS fName,
 	tn.f_name AS cntrName,
 	ti.f_cntrcount AS fCntrCount,

+ 1 - 1
ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -2336,7 +2336,7 @@
             <if test='map.tWareHouseFees.fReconciliation != null and map.tWareHouseFees.fReconciliation != "" and map.tWareHouseFees.fReconciliation == "0" '>
                 and w.f_accamount_date IS NULL
             </if>
-            <if test="map.tWareHouseFees.fMblno != null  and map.tWareHouseFees.fMblno != ''">and w.f_mblno like
+            <if test="map.tWareHouseFees.fMblno != null  and map.tWareHouseFees.fMblno != ''">and t.f_mblno like
                 concat('%', #{map.tWareHouseFees.fMblno}, '%')
             </if>
             <if test='map.tWareHouseFees.fDc != null and map.tWareHouseFees.fDc != ""'>