diff --git a/webht/third_party/trippestOrderSync/models/vendor_money_model.php b/webht/third_party/trippestOrderSync/models/vendor_money_model.php index b4a901d4..ecd06ac2 100644 --- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php +++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php @@ -335,17 +335,23 @@ class Vendor_money_model extends CI_Model { AND gcod.GCOD_operationType<> 'otherReceives' ) AS cost FROM - (SELECT DISTINCT isnull(gci.GCI_combineNo,'1') GCI_combineNo, + (SELECT DISTINCT isnull(gci.GCI_combineNo,'?') GCI_combineNo, GCI_VEI_SN FROM GroupCombineInfo gci WHERE 1=1 AND GCI_VEI_SN IN ($all_vendor) - 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') + -- 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') + and exists ( + select 1 from BIZ_ConfirmLineInfo + inner join BIZ_ConfirmLineDetail on COLI_SN=COLD_COLI_SN + where COLI_GRI_SN=GCI_GRI_SN + and COLD_StartDate BETWEEN '$start_date' AND '$end_date' + ) ) AS group_cost order by GCI_combineNo desc"; $query = $this->HT->query($sql);