|
@@ -725,7 +725,8 @@
|
|
END AS fSrcdcName,
|
|
END AS fSrcdcName,
|
|
ifnull( w.f_amount, 0 ) - ifnull( w.f_stlamount, 0 ) AS fAmtdr,
|
|
ifnull( w.f_amount, 0 ) - ifnull( w.f_stlamount, 0 ) AS fAmtdr,
|
|
ifnull( w.f_amount, 0 ) - ifnull( w.f_stlamount, 0 ) AS fAmt,
|
|
ifnull( w.f_amount, 0 ) - ifnull( w.f_stlamount, 0 ) AS fAmt,
|
|
- w.f_business_type AS fBusinessType
|
|
|
|
|
|
+ w.f_business_type AS fBusinessType,
|
|
|
|
+ w.remark AS fRemarks
|
|
FROM
|
|
FROM
|
|
t_warehousebillsfees w
|
|
t_warehousebillsfees w
|
|
LEFT JOIN t_warehousebills t ON t.f_id = w.f_pid
|
|
LEFT JOIN t_warehousebills t ON t.f_id = w.f_pid
|
|
@@ -1253,7 +1254,8 @@
|
|
dict.dict_label AS fFeeunitid,
|
|
dict.dict_label AS fFeeunitid,
|
|
w.f_qty AS fQty,
|
|
w.f_qty AS fQty,
|
|
w.f_unitprice AS fUnitprice,
|
|
w.f_unitprice AS fUnitprice,
|
|
- w.f_business_type AS fBusinessType
|
|
|
|
|
|
+ w.f_business_type AS fBusinessType,
|
|
|
|
+ w.remark AS fRemarks
|
|
FROM
|
|
FROM
|
|
t_warehousebillsfees w
|
|
t_warehousebillsfees w
|
|
LEFT JOIN t_warehousebills t ON t.f_id = w.f_pid
|
|
LEFT JOIN t_warehousebills t ON t.f_id = w.f_pid
|
|
@@ -2580,7 +2582,8 @@
|
|
dict.dict_label AS fFeeunitid,
|
|
dict.dict_label AS fFeeunitid,
|
|
w.f_qty AS fQty,
|
|
w.f_qty AS fQty,
|
|
w.f_unitprice AS fUnitprice,
|
|
w.f_unitprice AS fUnitprice,
|
|
- w.f_business_type AS fBusinessType
|
|
|
|
|
|
+ w.f_business_type AS fBusinessType,
|
|
|
|
+ w.remark AS fRemarks
|
|
FROM
|
|
FROM
|
|
t_warehousebillsfees w
|
|
t_warehousebillsfees w
|
|
LEFT JOIN t_warehousebills t ON t.f_id = w.f_pid
|
|
LEFT JOIN t_warehousebills t ON t.f_id = w.f_pid
|
|
@@ -2758,4 +2761,4 @@
|
|
w.f_id
|
|
w.f_id
|
|
</select>
|
|
</select>
|
|
|
|
|
|
-</mapper>
|
|
|
|
|
|
+</mapper>
|