diff --git a/webht/third_party/trippestOrderSync/models/vendor_money_model.php b/webht/third_party/trippestOrderSync/models/vendor_money_model.php index 374b9c8e..99e606b0 100644 --- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php +++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php @@ -126,26 +126,30 @@ class Vendor_money_model extends CI_Model { public function vendor_cost($vendor_str, $start_date, $end_date) { - $sql = "SELECT group_cost.GCI_VEI_SN vendor_code, - SUM(group_cost.cost) vendor_cost - FROM - (SELECT DISTINCT gci.GCI_combineNo, - (SELECT SUM(CONVERT(float, gcod.GCOD_sumMoney)) + $sql = "SELECT tmp.vendor_code , + SUM(tmp.cost) vendor_cost + from + ( + SELECT group_cost.GCI_VEI_SN vendor_code, + (SELECT SUM(CONVERT(float, gcod.GCOD_sumMoney)) FROM GroupCombineOperationDetail gcod WHERE gcod.GCOD_GCI_combineNo=GCI_combineNo - AND gcod.GCOD_operationType <> 'otherReceives' ) AS cost , - GCI_VEI_SN - FROM GroupCombineInfo gci - WHERE 1=1 - AND GCI_VEI_SN IN ($vendor_str) - AND EXISTS - ( SELECT 1 - FROM CK_GroupInfo - WHERE CGI_Checked=1 - AND CGI_GRI_SN=GCI_GRI_SN - AND CGI_ArriveDate BETWEEN '$start_date' AND '$end_date') - ) AS group_cost - GROUP BY group_cost.GCI_VEI_SN"; + AND gcod.GCOD_operationType <> 'otherReceives' ) AS cost + FROM + (SELECT DISTINCT gci.GCI_combineNo, + GCI_VEI_SN + FROM GroupCombineInfo gci + WHERE 1=1 + AND GCI_VEI_SN IN ($vendor_str) + AND EXISTS + ( SELECT 1 + FROM CK_GroupInfo + WHERE CGI_Checked=1 + AND CGI_GRI_SN=GCI_GRI_SN + AND CGI_ArriveDate BETWEEN '$start_date' AND '$end_date') + ) AS group_cost + ) as tmp + GROUP BY tmp.vendor_code "; $query = $this->HT->query($sql); return $query->result_array(); }