Merge branch 'feature/trippest'

6 years ago · d8b1a6a738
parent 6cc206dd50 74bf566485
commit d8b1a6a738
1 changed files with 6 additions and 2 deletions
--- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php
+++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php
@ -71,8 +71,12 @@ class Vendor_money_model extends CI_Model {
                    )
                    and CGI_Checked=1
                    and GRI_OrderType=227002
-
-                    and COLI_sourcetype=$sourcetype
+                    and exists (
+                        select 1 from BIZ_ConfirmLineDetail where COLD_COLI_SN=coli.COLI_SN
+                            and DeleteFlag=0
+                            and COLD_PlanVEI_SN=$vendor
+                    )
+                    -- and COLI_sourcetype=$sourcetype
                ) as cgi_group
            ) as sum_opi
            group by sum_opi.COLI_OPI_ID