|
|
@@ -230,7 +230,6 @@
|
|
|
bill.f_truckno AS fTruckno,
|
|
|
bill.f_driver_name AS fDriverName,
|
|
|
bill.f_driver_tel AS fDriverTel,
|
|
|
- bill.f_fee_status fFeeStatus,
|
|
|
bill.f_driver_id_car AS fDriverIdCar,
|
|
|
dictIn.dict_label AS fBusinessType,
|
|
|
ware.f_name AS fWarehouseid,
|
|
|
@@ -245,6 +244,11 @@
|
|
|
bill.f_product_name AS fProductName,
|
|
|
bill.f_billing_deadline AS fBillingDeadline,
|
|
|
bill.free_container_date AS freeContainerDate,
|
|
|
+ CASE
|
|
|
+ WHEN bill.f_fee_status = '1'THEN '暂存'
|
|
|
+ WHEN bill.f_fee_status = '2'THEN '部分'
|
|
|
+ WHEN bill.f_fee_status = '3'THEN '全部入账'
|
|
|
+ END AS fFeeStatus,
|
|
|
CASE WHEN bill.f_billstatus = '1' THEN '录入'
|
|
|
WHEN bill.f_billstatus = '2' THEN '暂存'
|
|
|
WHEN bill.f_billstatus = '3' THEN '驳回'
|
|
|
@@ -323,6 +327,7 @@
|
|
|
LEFT JOIN sys_dict_data dictIn ON dictIn.dict_value = bill.f_business_type
|
|
|
<where>
|
|
|
bill.f_typeid IS NULL
|
|
|
+ <if test="fFeeStatus != null and fFeeStatus != ''">and bill.f_fee_status = #{fFeeStatus}</if>
|
|
|
<if test="fBillno != null and fBillno != ''">and bill.f_billno like concat('%', #{fBillno}, '%')</if>
|
|
|
<if test="fTruckno != null and fTruckno != ''">and item.f_truckno like concat('%', #{fTruckno}, '%')</if>
|
|
|
<if test="fCustomsdeclartion != null and fCustomsdeclartion != ''">and bill.f_customsdeclartion =
|
|
|
@@ -429,7 +434,6 @@
|
|
|
bill.f_truckno AS fTruckno,
|
|
|
bill.f_driver_name AS fDriverName,
|
|
|
bill.f_driver_tel AS fDriverTel,
|
|
|
- bill.f_fee_status fFeeStatus,
|
|
|
bill.f_driver_id_car AS fDriverIdCar,
|
|
|
ware.f_name AS fWarehouseid,
|
|
|
bill.f_qty AS fQty,
|
|
|
@@ -444,6 +448,11 @@
|
|
|
bill.f_billing_deadline AS fBillingDeadline,
|
|
|
bill.free_container_date AS freeContainerDate,
|
|
|
CASE
|
|
|
+ WHEN bill.f_fee_status = '1'THEN '暂存'
|
|
|
+ WHEN bill.f_fee_status = '2'THEN '部分'
|
|
|
+ WHEN bill.f_fee_status = '3'THEN '全部入账'
|
|
|
+ END AS fFeeStatus,
|
|
|
+ CASE
|
|
|
WHEN bill.f_billtype = 'HQZY' AND bill.f_billstatus = '1' THEN '录入'
|
|
|
WHEN bill.f_billtype = 'HQZY' AND bill.f_billstatus = '2' THEN '暂存'
|
|
|
WHEN bill.f_billtype = 'HQZY' AND bill.f_billstatus = '3' THEN '驳回'
|
|
|
@@ -495,6 +504,7 @@
|
|
|
dict.status = '0'
|
|
|
AND dict.dict_type = 'data_trademodes'
|
|
|
AND bill.f_typeid IS NULL
|
|
|
+ <if test="fFeeStatus != null and fFeeStatus != ''">and bill.f_fee_status = #{fFeeStatus}</if>
|
|
|
<if test="fBillno != null and fBillno != ''">and bill.f_billno like concat('%', #{fBillno}, '%')</if>
|
|
|
<if test="fTruckno != null and fTruckno != ''">and item.f_truckno like concat('%', #{fTruckno}, '%')</if>
|
|
|
<if test="fCustomsdeclartion != null and fCustomsdeclartion != ''">and bill.f_customsdeclartion =
|
|
|
@@ -2752,6 +2762,7 @@
|
|
|
left join sys_dept d on w.f_bsdeptid = d.dept_id
|
|
|
<where>
|
|
|
w.f_billtype = 'JSCCF'
|
|
|
+ <if test="fFeeStatus != null and fFeeStatus != ''">and w.f_fee_status = #{fFeeStatus}</if>
|
|
|
<if test="fBillstatus != null and fBillstatus != ''">and w.f_billstatus = #{fBillstatus}</if>
|
|
|
<if test="fMarks != null and fMarks != ''">and w.f_marks = #{fMarks}</if>
|
|
|
<if test="createBy != null and createBy != ''">and w.create_by = #{createBy}</if>
|
caifc