Map: add rnote for jumping flags
This commit is contained in:
parent
cbaf976ba3
commit
6c0df1994b
|
|
@ -490,7 +490,8 @@ class API extends CONF {
|
||||||
point(".(float)$_POST['center_lon'].", ".(float)$_POST['center_lat']."),
|
point(".(float)$_POST['center_lon'].", ".(float)$_POST['center_lat']."),
|
||||||
point(tc.c_geolon, tc.c_geolat)
|
point(tc.c_geolon, tc.c_geolat)
|
||||||
)
|
)
|
||||||
) / 1000 AS distance_km
|
) / 1000 AS distance_km,
|
||||||
|
td.r_note
|
||||||
FROM
|
FROM
|
||||||
(SELECT
|
(SELECT
|
||||||
c_uid,
|
c_uid,
|
||||||
|
|
@ -516,17 +517,19 @@ class API extends CONF {
|
||||||
FROM
|
FROM
|
||||||
tbl_customer) tc,
|
tbl_customer) tc,
|
||||||
(SELECT
|
(SELECT
|
||||||
d_uid,
|
td.d_uid,
|
||||||
d_customeruid,
|
td.d_customeruid,
|
||||||
d_orderdate,
|
td.d_orderdate,
|
||||||
d_quantity,
|
td.d_quantity,
|
||||||
d_estquantity,
|
td.d_estquantity,
|
||||||
d_ordertype,
|
td.d_ordertype,
|
||||||
d_driveruid,
|
td.d_driveruid,
|
||||||
d_createruid,
|
td.d_createruid,
|
||||||
d_status
|
td.d_status,
|
||||||
|
tr.r_note
|
||||||
FROM
|
FROM
|
||||||
tbl_daily) td
|
tbl_daily td
|
||||||
|
LEFT OUTER JOIN tbl_request tr ON td.d_ruid = tr.r_uid) td
|
||||||
WHERE
|
WHERE
|
||||||
tc.c_uid = td.d_customeruid
|
tc.c_uid = td.d_customeruid
|
||||||
|
|
||||||
|
|
@ -597,6 +600,7 @@ class API extends CONF {
|
||||||
"last_pickup_date" => $rstOptionPoint['c_lastpickupdate'],
|
"last_pickup_date" => $rstOptionPoint['c_lastpickupdate'],
|
||||||
"last_paid_date" => $rstOptionPoint['c_lastpaiddate'],
|
"last_paid_date" => $rstOptionPoint['c_lastpaiddate'],
|
||||||
"duid" => $rstOptionPoint['d_uid'],
|
"duid" => $rstOptionPoint['d_uid'],
|
||||||
|
"rnote" => $rstOptionPoint['r_note'],
|
||||||
"orderFlag" => $orderFlag
|
"orderFlag" => $orderFlag
|
||||||
);
|
);
|
||||||
if(strlen($uidList) > 0){
|
if(strlen($uidList) > 0){
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue