|
@@ -269,7 +269,7 @@ class TPlusServerService extends Service
|
|
|
COALESCE(pn.idsaleman, 0) as employee_id_2,
|
|
COALESCE(pn.idsaleman, 0) as employee_id_2,
|
|
|
COALESCE(pn.code, '') as customer_code,
|
|
COALESCE(pn.code, '') as customer_code,
|
|
|
COALESCE(pn.name, '') as customer_title,
|
|
COALESCE(pn.name, '') as customer_title,
|
|
|
- COALESCE(pn.priuserdefnvc14, 0) as customer_profit_rate,
|
|
|
|
|
|
|
+ COALESCE(pn.priuserdefnvc14, '') as customer_profit_rate,
|
|
|
COALESCE(sd.pubuserdefnvc11, '') as channel_finance,
|
|
COALESCE(sd.pubuserdefnvc11, '') as channel_finance,
|
|
|
COALESCE(sd.pubuserdefnvc12, '') as channel_details,
|
|
COALESCE(sd.pubuserdefnvc12, '') as channel_details,
|
|
|
COALESCE(it.code, '') as product_code,
|
|
COALESCE(it.code, '') as product_code,
|
|
@@ -356,7 +356,7 @@ class TPlusServerService extends Service
|
|
|
si.voucherdate as order_time,
|
|
si.voucherdate as order_time,
|
|
|
COALESCE(pn.code, '') as customer_code,
|
|
COALESCE(pn.code, '') as customer_code,
|
|
|
COALESCE(pn.name, '') as customer_title,
|
|
COALESCE(pn.name, '') as customer_title,
|
|
|
- COALESCE(pn.priuserdefnvc14, 0) as customer_profit_rate,
|
|
|
|
|
|
|
+ COALESCE(pn.priuserdefnvc14, '') as customer_profit_rate,
|
|
|
COALESCE(si.idclerk, 0) as employee_id_1,
|
|
COALESCE(si.idclerk, 0) as employee_id_1,
|
|
|
COALESCE(ps.name, '') as employee_id_1_title,
|
|
COALESCE(ps.name, '') as employee_id_1_title,
|
|
|
COALESCE(pn.idsaleman, 0) as employee_id_2,
|
|
COALESCE(pn.idsaleman, 0) as employee_id_2,
|
|
@@ -445,7 +445,7 @@ class TPlusServerService extends Service
|
|
|
rp.voucherdate as order_time,
|
|
rp.voucherdate as order_time,
|
|
|
COALESCE(pn.code, '') as customer_code,
|
|
COALESCE(pn.code, '') as customer_code,
|
|
|
COALESCE(pn.name, '') as customer_title,
|
|
COALESCE(pn.name, '') as customer_title,
|
|
|
- COALESCE(pn.priuserdefnvc14, 0) as customer_profit_rate,
|
|
|
|
|
|
|
+ COALESCE(pn.priuserdefnvc14, '') as customer_profit_rate,
|
|
|
COALESCE(it.code, '') as product_code,
|
|
COALESCE(it.code, '') as product_code,
|
|
|
COALESCE(it.name, '') as product_title,
|
|
COALESCE(it.name, '') as product_title,
|
|
|
COALESCE(rp.idperson, 0) as employee_id_1,
|
|
COALESCE(rp.idperson, 0) as employee_id_1,
|
|
@@ -569,7 +569,7 @@ class TPlusServerService extends Service
|
|
|
'id_detail_upstream' => $item->id_detail_upstream?? 0,
|
|
'id_detail_upstream' => $item->id_detail_upstream?? 0,
|
|
|
'order_number_upstream' => $item->order_number_upstream ?? "",
|
|
'order_number_upstream' => $item->order_number_upstream ?? "",
|
|
|
'is_activity' => $item->is_activity ?? 0,
|
|
'is_activity' => $item->is_activity ?? 0,
|
|
|
- 'customer_profit_rate' => $item->customer_profit_rate ?? 0,
|
|
|
|
|
|
|
+ 'customer_profit_rate' => $item->customer_profit_rate ?? '',
|
|
|
'crt_time' => $time,
|
|
'crt_time' => $time,
|
|
|
];
|
|
];
|
|
|
})->toArray();
|
|
})->toArray();
|
cqp