|
@@ -17,11 +17,14 @@
|
|
|
d.VOI_PICKUP_STT "stt",
|
|
|
r.VCI_SALL_PRICE "sallPrice",
|
|
|
r.VCI_GAME_PRICE "gamePrice",
|
|
|
- r.VCI_COST_PRICE "costPrice"
|
|
|
- FROM vm_order_details o,vm_order_inf d, vm_pro_equ_rel r, vm_person_inf p
|
|
|
+ r.VCI_COST_PRICE "costPrice",
|
|
|
+ e.VEQ_IMEI_ADDR "imeiAddr",
|
|
|
+ r.VCI_AISLE "aisle"
|
|
|
+ FROM vm_order_details o,vm_order_inf d, vm_pro_equ_rel r, vm_person_inf p,vm_equipment_inf e
|
|
|
where o.VOD_PRO_EQU_REL_ID = r.VCI_ID
|
|
|
and d.VOI_PERSON_ID = p.VCI_ID
|
|
|
and o.VOD_ORDER_ID = d.VOI_ID
|
|
|
+ and r.VCI_EQUIPMENT_ID = e.VEQ_ID
|
|
|
<if test="branchId != null and branchId != ''">
|
|
|
and VOI_BRANCHID = #{branchId,jdbcType=VARCHAR}
|
|
|
</if>
|
|
@@ -64,12 +67,15 @@
|
|
|
p.VCI_NAME "userName",
|
|
|
r.VCI_SALL_PRICE "sallPrice",
|
|
|
r.VCI_GAME_PRICE "gamePrice",
|
|
|
- r.VCI_COST_PRICE "costPrice"
|
|
|
- from vm_delivery_inf di, vm_order_details od, vm_order_inf oi, vm_person_inf p, vm_pro_equ_rel r
|
|
|
+ r.VCI_COST_PRICE "costPrice",
|
|
|
+ e.VEQ_IMEI_ADDR "imeiAddr",
|
|
|
+ r.VCI_AISLE "aisle"
|
|
|
+ from vm_delivery_inf di, vm_order_details od, vm_order_inf oi, vm_person_inf p, vm_pro_equ_rel r,vm_equipment_inf e
|
|
|
where di.VDI_ORD_DET_ID = od.VOD_DETAILS_ID
|
|
|
and VOD_ORDER_ID = oi.VOI_ID
|
|
|
and oi.VOI_PERSON_ID = p.VCI_ID
|
|
|
and od.VOD_PRO_EQU_REL_ID = r.VCI_ID
|
|
|
+ and r.VCI_EQUIPMENT_ID = e.VEQ_ID
|
|
|
and VOI_BRANCHID = #{branchId,jdbcType=VARCHAR}
|
|
|
<if test="machineNo != null and machineNo != ''">
|
|
|
AND oi.VOI_EQUIPMENT_ID = #{machineNo,jdbcType=VARCHAR}
|