Merge branch 'feature/trippest'

webht/third_party/trippestOrderSync/models/orderFinance_model.php

@@ -87,7 +87,7 @@ class OrderFinance_model extends CI_Model {
                 ,PAG_Title
                 ,(select count(1) from GroupCombineInfo where gci_gri_sn=coli_gri_sn) as combine_cnt
                 from GroupCombineInfo gci
-                inner join BIZ_ConfirmLineInfo coli on gci.GCI_GRI_SN=COLI_GRI_SN and coli.COLI_State NOT IN (30,40,50)
+                inner join BIZ_ConfirmLineInfo coli on gci.GCI_GRI_SN=COLI_GRI_SN and coli.COLI_State NOT IN (50)
                 inner join BIZ_ConfirmLineDetail cold on cold.COLD_COLI_SN=coli.COLI_SN
                     and cold.COLD_ServiceType='D' and cold.DeleteFlag=0 and COLD_PlanVEI_SN = GCI_VEI_SN
                 left join BIZ_PackageInfo pag on PAG_SN=COLD_ServiceSN