|
@@ -580,10 +580,10 @@
|
|
|
corp.f_name AS fCorpIds,
|
|
|
u.nick_name AS planUserId,
|
|
|
driver.nick_name AS driverUserIds,
|
|
|
- t.un_load_date AS tUnLoadDate,
|
|
|
- t.un_load_addr AS unLoadAddr,
|
|
|
- t.un_load_attn AS unLoadAttn,
|
|
|
- t.un_load_attn_tel AS unLoadAttnTel,
|
|
|
+ date_format( t.un_load_date, '%Y-%m-%d' ) AS tUnLoadDate,
|
|
|
+ t.un_load_addr AS tUnLoadAddr,
|
|
|
+ t.un_load_attn AS tUnLoadAttn,
|
|
|
+ t.un_load_attn_tel AS tUnLoadAttnTel,
|
|
|
t.qty_plan AS qtyPlan,
|
|
|
t.weight_plan AS weightPlan,
|
|
|
t.bill_type AS billType,
|
|
@@ -591,12 +591,12 @@
|
|
|
t.trans_prop AS transProp,
|
|
|
t.md_load_addr AS tMdLoadAddr,
|
|
|
t.md_load_attn AS tMdLoadAttn,
|
|
|
- t.md_load_date AS tMdLoadDate,
|
|
|
+ t.md_load_attn_tel AS tMdLoadAttnTel,
|
|
|
+ date_format( t.md_load_date, '%Y-%m-%d' ) AS tMdLoadDate,
|
|
|
t.load_addr AS tLoadAddr,
|
|
|
- t.load_date AS tLoadDate,
|
|
|
- t.load_attn AS loadAttn,
|
|
|
- t.load_attntel AS loadAttntel,
|
|
|
- c.carreg_no AS carregNo,
|
|
|
+ date_format( t.load_date, '%Y-%m-%d' ) AS tLoadDate,
|
|
|
+ t.load_attn AS tLoadAttn,
|
|
|
+ t.load_attntel AS tLoadAttntel,
|
|
|
c.mblno,
|
|
|
c.driverbonus,
|
|
|
g.f_name AS goodsId,
|
|
@@ -610,8 +610,6 @@
|
|
|
c.oil_amt AS oilAmt,
|
|
|
c.cost_oth AS costOth,
|
|
|
c.cntr_id AS cntrId,
|
|
|
- c.driver_tel AS driverTel,
|
|
|
- c.driver_name AS driverName,
|
|
|
c.carreg_no AS carregNo,
|
|
|
c.carcor_pid AS carcorPid,
|
|
|
c.driver_tel AS driverTel,
|
|
@@ -619,23 +617,23 @@
|
|
|
c.cost_remarks AS costRemarks,
|
|
|
c.odometer_from AS odometerFrom,
|
|
|
c.odometer_end AS odometerEnd,
|
|
|
- c.accept_date AS acceptDate,
|
|
|
+ date_format( c.accept_date, '%Y-%m-%d' ) AS acceptDate,
|
|
|
c.accept_remarks AS acceptRemarks,
|
|
|
- IFNULL(c.costom_amt_01, 0) AS costomAmt01,
|
|
|
- IFNULL(c.costom_amt_02, 0) AS costomAmt02,
|
|
|
- IFNULL(c.costom_amt_03, 0) AS costomAmt03,
|
|
|
- IFNULL(c.costom_amt_04, 0) AS costomAmt04,
|
|
|
- IFNULL(c.costom_amt_05, 0) AS costomAmt05,
|
|
|
- IFNULL(c.costom_amt_06, 0) AS costomAmt06,
|
|
|
+ IFNULL( c.costom_amt_01, 0 ) AS costomAmt01,
|
|
|
+ IFNULL( c.costom_amt_02, 0 ) AS costomAmt02,
|
|
|
+ IFNULL( c.costom_amt_03, 0 ) AS costomAmt03,
|
|
|
+ IFNULL( c.costom_amt_04, 0 ) AS costomAmt04,
|
|
|
+ IFNULL( c.costom_amt_05, 0 ) AS costomAmt05,
|
|
|
+ IFNULL( c.costom_amt_06, 0 ) AS costomAmt06,
|
|
|
c.costom_str_01 AS costomStr01,
|
|
|
c.costom_str_02 AS costomStr02,
|
|
|
- c.load_date AS loadDate,
|
|
|
+ IFNULL( c.load_date, t.load_date ) AS loadDate,
|
|
|
c.load_remarks AS loadRemarks,
|
|
|
- c.md_load_date AS mdLoadDate,
|
|
|
+ date_format( c.md_load_date, '%Y-%m-%d' ) AS mdLoadDate,
|
|
|
c.md_load_remarks AS mdLoadRemarks,
|
|
|
- c.un_load_date AS unLoadDate,
|
|
|
+ date_format( c.un_load_date, '%Y-%m-%d' ) AS unLoadDate,
|
|
|
c.un_load_remarks AS unLoadRemarks,
|
|
|
- c.waybill_date AS waybillDate,
|
|
|
+ date_format( c.waybill_date, '%Y-%m-%d' ) AS waybillDate,
|
|
|
c.waybill_remarks AS waybillRemarks
|
|
|
FROM
|
|
|
F_TMSORDERBILLSCARS c
|
|
@@ -652,7 +650,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="selectMonthlyOrder" parameterType="ftmsorderbillscars" resultType="Map">
|
|
|
- SELECT count( p_id ) countOrders, IFNULL(SUM( miles ),0) miles, IFNULL(SUM( freight_amt_dr ), 0) freightAmtDr
|
|
|
+ SELECT count( p_id ) countOrders, IFNULL(SUM( miles ),0) miles, IFNULL( SUM( driverbonus ), 0 ) freightAmtDr
|
|
|
FROM F_TMSORDERBILLSCARS
|
|
|
<where>
|
|
|
driver_tel = #{driverTel}
|