diff --git a/webht/third_party/trippestOrderSync/controllers/vendor_money.php b/webht/third_party/trippestOrderSync/controllers/vendor_money.php index e228647f..f6f63be1 100644 --- a/webht/third_party/trippestOrderSync/controllers/vendor_money.php +++ b/webht/third_party/trippestOrderSync/controllers/vendor_money.php @@ -268,6 +268,8 @@ class Vendor_money extends CI_Controller { $result['col_sum']['trippest']['sum_payout'] = bcadd($result['col_sum']['trippest']['sum_payout'], $vmi['trippest']['payout']); // $result['col_sum']['vendor']['sum_payout'] = bcadd($result['col_sum']['vendor']['sum_payout'], $vmi['vendor']['payout']); } + // 财务表成本和实际成本不相等 + $result['diff_cost'] = $this->money_model->report_tour_diff($start_date, $end_date, implode(',', $vendors)); $this->load->view('vendor_money_sum', $result); return ; } diff --git a/webht/third_party/trippestOrderSync/models/vendor_money_model.php b/webht/third_party/trippestOrderSync/models/vendor_money_model.php index 063c4efd..a7e01d3f 100644 --- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php +++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php @@ -556,6 +556,63 @@ class Vendor_money_model extends CI_Model { return $query->result_array(); } + public function report_tour_diff($start_date, $end_date, $all_vendor) + { + $sql = "SELECT * , + (SELECT top 1 RPT_Total + FROM report_tour + WHERE 1=1 + AND tourProvide=gci_vei_name + AND tourBZ LIKE '%'+REPLACE(gci_no,'[','[[]')+'%' + AND ( RPT_Total<>to_be_diff.report_total_cost0 + OR RPT_Total<>to_be_diff.total_cost ) ) AS diff_report_total_cost0 +FROM + (SELECT * , + (SELECT isnull(SUM(CONVERT(float,gcod.GCOD_sumMoney)),0) + FROM GroupCombineOperationDetail gcod + WHERE GCOD_GCI_combineNo=all_gci_no.gci_no + AND gcod.GCOD_operationType <> 'otherReceives' + AND GCOD_VEI_SN=all_gci_no.GCI_VEI_SN + ) AS total_cost , + (SELECT isnull(round(SUM(isnull(tourcost,0)),2),0) + FROM report_tour + WHERE 1=1 + AND tourProvide=gci_vei_name + AND tourBZ LIKE '%'+REPLACE(gci_no,'[','[[]')+'%' + ) AS report_cost , + (SELECT top 1 RPT_Total + FROM report_tour + WHERE 1=1 + AND tourProvide=gci_vei_name + AND tourBZ LIKE '%'+REPLACE(gci_no,'[','[[]')+'%' + ) AS report_total_cost0 + FROM ( select + CASE WHEN GCI_combineNo is NULL THEN 'nn' + WHEN GCI_combineNo='cancel' THEN CONVERT(varchar(50), 'nn') + ELSE GCI_combineNo END gci_no , + GCI_VEI_SN , + (SELECT VEI2_CompanyBN + FROM VEndorInfo2 + WHERE VEI2_VEI_SN=GCI_VEI_SN + AND VEI2_LGC=2 ) AS gci_vei_name + FROM GroupCombineInfo + WHERE GCI_travelDate + BETWEEN '$start_date' + AND '$end_date' + and GCI_VEI_SN in ($all_vendor) + and CHARINDEX('TA', GCI_combineNo ) = 0 + GROUP BY GCI_combineNo,GCI_VEI_SN + ) all_gci_no + ) AS to_be_diff +WHERE CONVERT(decimal(10,2),to_be_diff.report_cost) <> to_be_diff.report_total_cost0 + OR CONVERT(decimal(10,2),to_be_diff.total_cost) <> to_be_diff.report_total_cost0 + OR CONVERT(decimal(10,2),to_be_diff.total_cost) <> round(to_be_diff.report_cost,2) +ORDER BY to_be_diff.GCI_VEI_SN + "; + $query = $this->HT->query($sql); + return $query->result_array(); + } + } /* End of file vendor_money.php */ diff --git a/webht/third_party/trippestOrderSync/views/vendor_money_sum.php b/webht/third_party/trippestOrderSync/views/vendor_money_sum.php index d83388e4..20f05663 100644 --- a/webht/third_party/trippestOrderSync/views/vendor_money_sum.php +++ b/webht/third_party/trippestOrderSync/views/vendor_money_sum.php @@ -259,88 +259,27 @@ - + +