|
@@ -15,6 +15,7 @@
|
|
|
<result property="mblno" column="mblno"/>
|
|
|
<result property="carregNo" column="carreg_no"/>
|
|
|
<result property="driverName" column="driver_name"/>
|
|
|
+ <result property="driverUserId" column="driver_user_id"/>
|
|
|
<result property="driverTel" column="driver_tel"/>
|
|
|
<result property="planDate" column="plan_date"/>
|
|
|
<result property="planRemarks" column="plan_remarks"/>
|
|
@@ -98,7 +99,7 @@
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="selectftmsorderbillscarsVo">
|
|
|
- select id, p_id, org_id, order_no, cntr_id, cntr_no, carcor_pid, mblno, carreg_no, driver_name, driver_tel, plan_date, plan_remarks, accept_date, off_data, off_remarks, accept_remarks, load_date, load_remarks, md_load_date, md_load_remarks, un_load_date, un_load_remarks, waybill_date, waybill_remarks, qty_load, cntr_qty, qty_un_load, cntr_weight, gopods_loss_qty, gopods_lossrate, gopods_lossamt_cr, qty_dr, gopods_lossamt_dr, qty_cr, freight_price_dr, freight_price_cr, freight_amt_dr, freight_amt_cr, feeitem_dr, feeitem_dr_remarks, feeitem_cr, feeitem_cr_remarks, amt_dr, amt_cr, due_date_dr, due_date_cr, odometer_from, odometer_end, miles_empty, miles_load, miles, driverbonus, costtoll, costmaintain, cost_oth, cost_remarks, oil_qtyper, oil_qty1, oil_price1, oil_amt1, oil_qty2, oil_price2, oil_amt2, oil_qty, oil_price, oil_amt, oil_qty_blc, oil_amt_blc, profit, inv_dr_need, inv_dr_status, inv_dr_taxrate, inv_dr_taxamt, inv_dr_date, inv_dr_no, accchk_staus, bill_status, order_status, accchk_date, stl_amt_dr, stl_date_dr, stl_amt_cr, stl_date_cr, del_flag, create_by, create_time, update_by, update_time, remarks from F_TMSORDERBILLSCARS
|
|
|
+ select id, p_id, org_id, order_no, cntr_id, cntr_no, carcor_pid, mblno, carreg_no, driver_user_id, driver_name, driver_tel, plan_date, plan_remarks, accept_date, off_data, off_remarks, accept_remarks, load_date, load_remarks, md_load_date, md_load_remarks, un_load_date, un_load_remarks, waybill_date, waybill_remarks, qty_load, cntr_qty, qty_un_load, cntr_weight, gopods_loss_qty, gopods_lossrate, gopods_lossamt_cr, qty_dr, gopods_lossamt_dr, qty_cr, freight_price_dr, freight_price_cr, freight_amt_dr, freight_amt_cr, feeitem_dr, feeitem_dr_remarks, feeitem_cr, feeitem_cr_remarks, amt_dr, amt_cr, due_date_dr, due_date_cr, odometer_from, odometer_end, miles_empty, miles_load, miles, driverbonus, costtoll, costmaintain, cost_oth, cost_remarks, oil_qtyper, oil_qty1, oil_price1, oil_amt1, oil_qty2, oil_price2, oil_amt2, oil_qty, oil_price, oil_amt, oil_qty_blc, oil_amt_blc, profit, inv_dr_need, inv_dr_status, inv_dr_taxrate, inv_dr_taxamt, inv_dr_date, inv_dr_no, accchk_staus, bill_status, order_status, accchk_date, stl_amt_dr, stl_date_dr, stl_amt_cr, stl_date_cr, del_flag, create_by, create_time, update_by, update_time, remarks from F_TMSORDERBILLSCARS
|
|
|
</sql>
|
|
|
|
|
|
<select id="selectftmsorderbillscarsList" parameterType="ftmsorderbillscars" resultMap="ftmsorderbillscarsResult">
|
|
@@ -112,6 +113,7 @@
|
|
|
<if test="carcorPid != null "> and carcor_pid = #{carcorPid}</if>
|
|
|
<if test="mblno != null and mblno != ''"> and mblno = #{mblno}</if>
|
|
|
<if test="carregNo != null and carregNo != ''"> and carreg_no = #{carregNo}</if>
|
|
|
+ <if test="driverUserId != null"> and driver_user_id = #{driverUserId}</if>
|
|
|
<if test="driverName != null and driverName != ''"> and driver_name like concat('%', #{driverName}, '%')</if>
|
|
|
<if test="driverTel != null and driverTel != ''"> and driver_tel = #{driverTel}</if>
|
|
|
<if test="planDate != null "> and plan_date = #{planDate}</if>
|
|
@@ -202,6 +204,7 @@
|
|
|
<if test="carcorPid != null "> and carcor_pid = #{carcorPid}</if>
|
|
|
<if test="mblno != null and mblno != ''"> and mblno = #{mblno}</if>
|
|
|
<if test="carregNo != null and carregNo != ''"> and carreg_no = #{carregNo}</if>
|
|
|
+ <if test="driverUserId != null"> and driver_user_id = #{driverUserId}</if>
|
|
|
<if test="driverName != null and driverName != ''"> and driver_name like concat('%', #{driverName}, '%')</if>
|
|
|
<if test="driverTel != null and driverTel != ''"> and driver_tel = #{driverTel}</if>
|
|
|
<if test="planDate != null "> and plan_date = #{planDate}</if>
|
|
@@ -292,6 +295,7 @@
|
|
|
<if test="carcorPid != null "> and carcor_pid = #{carcorPid}</if>
|
|
|
<if test="mblno != null and mblno != ''"> and mblno = #{mblno}</if>
|
|
|
<if test="carregNo != null and carregNo != ''"> and carreg_no = #{carregNo}</if>
|
|
|
+ <if test="driverUserId != null"> and driver_user_id = #{driverUserId}</if>
|
|
|
<if test="driverName != null and driverName != ''"> and driver_name like concat('%', #{driverName}, '%')</if>
|
|
|
<if test="driverTel != null and driverTel != ''"> and driver_tel = #{driverTel}</if>
|
|
|
<if test="planDate != null "> and plan_date = #{planDate}</if>
|
|
@@ -393,18 +397,18 @@
|
|
|
t.load_attn loadAttn,
|
|
|
t.load_attntel loadAttntel,
|
|
|
t.md_load_addr mdLoadAddr,
|
|
|
- t.md_load_date mdLoadDate,
|
|
|
+ t.md_load_date tMdLoadDate,
|
|
|
t.md_load_attn mdLoadAttn,
|
|
|
t.md_load_attn_tel mdLoadAttnTel,
|
|
|
t.un_load_addr unLoadAddr,
|
|
|
- t.un_load_date unLoadDate,
|
|
|
+ t.un_load_date tUnLoadDate,
|
|
|
t.un_load_attn unLoadAttn,
|
|
|
t.un_load_attn_tel unLoadAttnTel,
|
|
|
c.accept_date acceptDate,
|
|
|
c.off_data offData,
|
|
|
c.load_date cLoadDate,
|
|
|
- c.md_load_date cMdLoadDate,
|
|
|
- c.un_load_date cUnLoadDate,
|
|
|
+ c.md_load_date mdLoadDate,
|
|
|
+ c.un_load_date unLoadDate,
|
|
|
c.waybill_date waybillDate,
|
|
|
c.waybill_remarks waybillRemarks
|
|
|
FROM
|
|
@@ -466,6 +470,7 @@
|
|
|
t.corp_id AS fCorpId,
|
|
|
corp.f_name AS fCorpIds,
|
|
|
u.nick_name AS planUserId,
|
|
|
+ driver.nick_name AS driverUserId,
|
|
|
t.un_load_date AS tUnLoadDate,
|
|
|
t.un_load_addr AS unLoadAddr,
|
|
|
t.un_load_attn AS unLoadAttn,
|
|
@@ -482,6 +487,7 @@
|
|
|
c.carreg_no AS carregNo,
|
|
|
c.mblno,
|
|
|
g.f_name AS goodsId,
|
|
|
+ c.order_status AS orderStatus,
|
|
|
c.cntr_qty AS cntrQty,
|
|
|
c.cntr_weight AS cntrWeight,
|
|
|
t.ysl,
|
|
@@ -511,6 +517,7 @@
|
|
|
F_TMSORDERBILLSCARS c
|
|
|
LEFT JOIN F_TMSORDERBILLS t ON t.id = c.org_id
|
|
|
LEFT JOIN sys_user u ON u.user_id = t.plan_user_id
|
|
|
+ LEFT JOIN sys_user driver ON driver.user_id = c.driver_user_id
|
|
|
LEFT JOIN t_corps corp ON corp.f_id = t.corp_id
|
|
|
LEFT JOIN t_goods g ON g.f_id = t.goods_id
|
|
|
where
|
|
@@ -526,34 +533,35 @@
|
|
|
<if test="cntrId != null">cntr_id,</if>
|
|
|
<if test="cntrNo != null">cntr_no,</if>
|
|
|
<if test="carcorPid != null">carcor_pid,</if>
|
|
|
- <if test="mblno != null">mblno,</if>
|
|
|
<if test="carregNo != null">carreg_no,</if>
|
|
|
+ <if test="mblno != null">mblno,</if>
|
|
|
<if test="driverName != null">driver_name,</if>
|
|
|
+ <if test="driverUserId != null">driver_user_id,</if>
|
|
|
<if test="driverTel != null">driver_tel,</if>
|
|
|
<if test="planDate != null">plan_date,</if>
|
|
|
<if test="planRemarks != null">plan_remarks,</if>
|
|
|
<if test="acceptDate != null">accept_date,</if>
|
|
|
<if test="acceptRemarks != null">accept_remarks,</if>
|
|
|
- <if test="offData != null">off_data,</if>
|
|
|
- <if test="offRemarks != null">off_remarks,</if>
|
|
|
<if test="loadDate != null">load_date,</if>
|
|
|
<if test="loadRemarks != null">load_remarks,</if>
|
|
|
+ <if test="offData != null">off_data,</if>
|
|
|
<if test="mdLoadDate != null">md_load_date,</if>
|
|
|
<if test="mdLoadRemarks != null">md_load_remarks,</if>
|
|
|
+ <if test="offRemarks != null">off_remarks,</if>
|
|
|
<if test="unLoadDate != null">un_load_date,</if>
|
|
|
<if test="unLoadRemarks != null">un_load_remarks,</if>
|
|
|
<if test="waybillDate != null">waybill_date,</if>
|
|
|
- <if test="waybillRemarks != null">waybill_remarks,</if>
|
|
|
<if test="qtyLoad != null">qty_load,</if>
|
|
|
- <if test="cntrQty != null">cntr_qty,</if>
|
|
|
<if test="qtyUnLoad != null">qty_un_load,</if>
|
|
|
- <if test="cntrWeight != null">cntr_weight,</if>
|
|
|
+ <if test="cntrQty != null">cntr_qty,</if>
|
|
|
<if test="gopodsLossQty != null">gopods_loss_qty,</if>
|
|
|
+ <if test="cntrWeight != null">cntr_weight,</if>
|
|
|
<if test="gopodsLossrate != null">gopods_lossrate,</if>
|
|
|
<if test="gopodsLossamtCr != null">gopods_lossamt_cr,</if>
|
|
|
<if test="qtyDr != null">qty_dr,</if>
|
|
|
- <if test="gopodsLossamtDr != null">gopods_lossamt_dr,</if>
|
|
|
+ <if test="waybillRemarks != null">waybill_remarks,</if>
|
|
|
<if test="qtyCr != null">qty_cr,</if>
|
|
|
+ <if test="gopodsLossamtDr != null">gopods_lossamt_dr,</if>
|
|
|
<if test="freightPriceDr != null">freight_price_dr,</if>
|
|
|
<if test="freightPriceCr != null">freight_price_cr,</if>
|
|
|
<if test="freightAmtDr != null">freight_amt_dr,</if>
|
|
@@ -617,9 +625,10 @@
|
|
|
<if test="cntrId != null">#{cntrId},</if>
|
|
|
<if test="cntrNo != null">#{cntrNo},</if>
|
|
|
<if test="carcorPid != null">#{carcorPid},</if>
|
|
|
- <if test="mblno != null">#{mblno},</if>
|
|
|
<if test="carregNo != null">#{carregNo},</if>
|
|
|
+ <if test="mblno != null">#{mblno},</if>
|
|
|
<if test="driverName != null">#{driverName},</if>
|
|
|
+ <if test="driverUserId != null">#{driverUserId},</if>
|
|
|
<if test="driverTel != null">#{driverTel},</if>
|
|
|
<if test="planDate != null">#{planDate},</if>
|
|
|
<if test="planRemarks != null">#{planRemarks},</if>
|
|
@@ -627,22 +636,24 @@
|
|
|
<if test="acceptRemarks != null">#{acceptRemarks},</if>
|
|
|
<if test="loadDate != null">#{loadDate},</if>
|
|
|
<if test="loadRemarks != null">#{loadRemarks},</if>
|
|
|
+ <if test="offData != null">#{offData},</if>
|
|
|
<if test="mdLoadDate != null">#{mdLoadDate},</if>
|
|
|
<if test="mdLoadRemarks != null">#{mdLoadRemarks},</if>
|
|
|
+ <if test="offRemarks != null">#{offRemarks},</if>
|
|
|
<if test="unLoadDate != null">#{unLoadDate},</if>
|
|
|
<if test="unLoadRemarks != null">#{unLoadRemarks},</if>
|
|
|
<if test="waybillDate != null">#{waybillDate},</if>
|
|
|
- <if test="waybillRemarks != null">#{waybillRemarks},</if>
|
|
|
<if test="qtyLoad != null">#{qtyLoad},</if>
|
|
|
- <if test="cntrQty != null">#{cntrQty},</if>
|
|
|
<if test="qtyUnLoad != null">#{qtyUnLoad},</if>
|
|
|
- <if test="cntrWeight != null">#{cntrWeight},</if>
|
|
|
+ <if test="cntrQty != null">#{cntrQty},</if>
|
|
|
<if test="gopodsLossQty != null">#{gopodsLossQty},</if>
|
|
|
+ <if test="cntrWeight != null">#{cntrWeight},</if>
|
|
|
<if test="gopodsLossrate != null">#{gopodsLossrate},</if>
|
|
|
<if test="gopodsLossamtCr != null">#{gopodsLossamtCr},</if>
|
|
|
<if test="qtyDr != null">#{qtyDr},</if>
|
|
|
- <if test="gopodsLossamtDr != null">#{gopodsLossamtDr},</if>
|
|
|
+ <if test="waybillRemarks != null">#{waybillRemarks},</if>
|
|
|
<if test="qtyCr != null">#{qtyCr},</if>
|
|
|
+ <if test="gopodsLossamtDr != null">#{gopodsLossamtDr},</if>
|
|
|
<if test="freightPriceDr != null">#{freightPriceDr},</if>
|
|
|
<if test="freightPriceCr != null">#{freightPriceCr},</if>
|
|
|
<if test="freightAmtDr != null">#{freightAmtDr},</if>
|
|
@@ -710,34 +721,35 @@
|
|
|
<if test="cntrId != null">cntr_id = #{cntrId},</if>
|
|
|
<if test="cntrNo != null">cntr_no = #{cntrNo},</if>
|
|
|
<if test="carcorPid != null">carcor_pid = #{carcorPid},</if>
|
|
|
- <if test="mblno != null">mblno = #{mblno},</if>
|
|
|
<if test="carregNo != null">carreg_no = #{carregNo},</if>
|
|
|
+ <if test="mblno != null">mblno = #{mblno},</if>
|
|
|
<if test="driverName != null">driver_name = #{driverName},</if>
|
|
|
+ <if test="driverUserId != null">driver_user_id = #{driverUserId},</if>
|
|
|
<if test="driverTel != null">driver_tel = #{driverTel},</if>
|
|
|
<if test="planDate != null">plan_date = #{planDate},</if>
|
|
|
<if test="planRemarks != null">plan_remarks = #{planRemarks},</if>
|
|
|
<if test="acceptDate != null">accept_date = #{acceptDate},</if>
|
|
|
<if test="acceptRemarks != null">accept_remarks = #{acceptRemarks},</if>
|
|
|
- <if test="offData != null">off_data = #{offData},</if>
|
|
|
- <if test="offRemarks != null">off_remarks = #{offRemarks},</if>
|
|
|
<if test="loadDate != null">load_date = #{loadDate},</if>
|
|
|
<if test="loadRemarks != null">load_remarks = #{loadRemarks},</if>
|
|
|
+ <if test="offData != null">off_data = #{offData},</if>
|
|
|
<if test="mdLoadDate != null">md_load_date = #{mdLoadDate},</if>
|
|
|
<if test="mdLoadRemarks != null">md_load_remarks = #{mdLoadRemarks},</if>
|
|
|
+ <if test="offRemarks != null">off_remarks = #{offRemarks},</if>
|
|
|
<if test="unLoadDate != null">un_load_date = #{unLoadDate},</if>
|
|
|
<if test="unLoadRemarks != null">un_load_remarks = #{unLoadRemarks},</if>
|
|
|
<if test="waybillDate != null">waybill_date = #{waybillDate},</if>
|
|
|
- <if test="waybillRemarks != null">waybill_remarks = #{waybillRemarks},</if>
|
|
|
<if test="qtyLoad != null">qty_load = #{qtyLoad},</if>
|
|
|
- <if test="cntrQty != null">cntr_qty = #{cntrQty},</if>
|
|
|
<if test="qtyUnLoad != null">qty_un_load = #{qtyUnLoad},</if>
|
|
|
- <if test="cntrWeight != null">cntr_weight = #{cntrWeight},</if>
|
|
|
+ <if test="cntrQty != null">cntr_qty = #{cntrQty},</if>
|
|
|
<if test="gopodsLossQty != null">gopods_loss_qty = #{gopodsLossQty},</if>
|
|
|
+ <if test="cntrWeight != null">cntr_weight = #{cntrWeight},</if>
|
|
|
<if test="gopodsLossrate != null">gopods_lossrate = #{gopodsLossrate},</if>
|
|
|
<if test="gopodsLossamtCr != null">gopods_lossamt_cr = #{gopodsLossamtCr},</if>
|
|
|
<if test="qtyDr != null">qty_dr = #{qtyDr},</if>
|
|
|
- <if test="gopodsLossamtDr != null">gopods_lossamt_dr = #{gopodsLossamtDr},</if>
|
|
|
+ <if test="waybillRemarks != null">waybill_remarks = #{waybillRemarks},</if>
|
|
|
<if test="qtyCr != null">qty_cr = #{qtyCr},</if>
|
|
|
+ <if test="gopodsLossamtDr != null">gopods_lossamt_dr = #{gopodsLossamtDr},</if>
|
|
|
<if test="freightPriceDr != null">freight_price_dr = #{freightPriceDr},</if>
|
|
|
<if test="freightPriceCr != null">freight_price_cr = #{freightPriceCr},</if>
|
|
|
<if test="freightAmtDr != null">freight_amt_dr = #{freightAmtDr},</if>
|