From adbca8bc96db3535d0bf519ad40d89b6a656e023 Mon Sep 17 00:00:00 2001 From: lyt Date: Thu, 12 Mar 2020 10:25:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E5=8A=A8=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=9B=A2=E6=AC=BE:=20=E4=B8=8D=E5=90=ABcancel,=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E7=BB=BC=E8=B4=B9=E7=BB=93=E7=AE=97=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trippestOrderSync/models/vendor_money_model.php | 10 +++++++--- .../trippestOrderSync/views/order_report_precheck.php | 5 ++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/webht/third_party/trippestOrderSync/models/vendor_money_model.php b/webht/third_party/trippestOrderSync/models/vendor_money_model.php index 1d83cdf6..f6f621f3 100644 --- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php +++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php @@ -447,11 +447,15 @@ class Vendor_money_model extends CI_Model { select gri.GRI_Name, ro.money total_income, - (select SUM(COLD_TotalPrice) from BIZ_ConfirmLineDetail d where d.DeleteFlag=0 and d.COLD_PlanVEI_SN not in ($all_vendor) + (select SUM(COLD_TotalPrice) from BIZ_ConfirmLineDetail d + inner join BIZ_PackageOrderInfo p on p.POI_COLD_SN=d.COLD_SN + where d.DeleteFlag=0 and COLD_COLI_SN=coli.COLI_SN + and ( d.COLD_PlanVEI_SN not in ($all_vendor) or + p.POI_QuotationType=4 ) ) as other_price, - (select isnull(SUM(cast(GCI_priceCNY as decimal(10,2))),0) from GroupCombineInfo where GCI_GRI_SN=COLI_GRI_SN and GCI_combineNo<>'cancel' ) as TLD_total_price, - (select isnull(SUM(cast(GCI_agencyReceipt as decimal(10,2))),0) from GroupCombineInfo where GCI_GRI_SN=COLI_GRI_SN and GCI_combineNo is not null ) as TLD_agency_receipt, + (select isnull(SUM(cast(GCI_priceCNY as decimal(10,2))),0) from GroupCombineInfo where GCI_GRI_SN=COLI_GRI_SN and isnull(GCI_combineNo,'') not in ('','cancel','forbidden') ) as TLD_total_price, + (select isnull(SUM(cast(GCI_agencyReceipt as decimal(10,2))),0) from GroupCombineInfo where GCI_GRI_SN=COLI_GRI_SN and isnull(GCI_combineNo,'') not in ('','cancel','forbidden') ) as TLD_agency_receipt, (select isnull(SUM(cast(GAI_SSJE as decimal(10,2))),0) from BIZ_GroupAccountInfo where GAI_COLI_SN=COLI_SN --and GAI_Type in (" . PAY_OTHER . ") AND GAI_VEI_SN in ($all_vendor,1343) -- 图兰朵的代收 diff --git a/webht/third_party/trippestOrderSync/views/order_report_precheck.php b/webht/third_party/trippestOrderSync/views/order_report_precheck.php index 4e2cb109..ba91eced 100644 --- a/webht/third_party/trippestOrderSync/views/order_report_precheck.php +++ b/webht/third_party/trippestOrderSync/views/order_report_precheck.php @@ -116,8 +116,7 @@

Trippest & 地接账单预审核