diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php index 8e490339..7a31a671 100644 --- a/webht/third_party/trippestOrderSync/models/orders_model.php +++ b/webht/third_party/trippestOrderSync/models/orders_model.php @@ -544,7 +544,7 @@ class Orders_model extends CI_Model { $sql = "SELECT TOP 1 coli.COLI_GRI_SN,coli.COLI_SN,gci.GCI_SN FROM GroupCombineInfo gci INNER JOIN BIZ_ConfirmLineInfo coli ON coli.COLI_GRI_SN=gci.GCI_GRI_SN - WHERE gci.GCI_VendorOrderId='$vendorOrderId' and GCI_VEI_SN='$vendorID'"; + WHERE gci.GCI_VendorOrderId='$vendorOrderId' "; // and GCI_VEI_SN='$vendorID' $query = $this->HT->query($sql); if ($query->row()) { $this->BIZ_COLI_SN = $query->row()->COLI_SN; diff --git a/webht/third_party/vendorPlanSync/models/Group_model.php b/webht/third_party/vendorPlanSync/models/Group_model.php index 522e50ec..83a46092 100644 --- a/webht/third_party/vendorPlanSync/models/Group_model.php +++ b/webht/third_party/vendorPlanSync/models/Group_model.php @@ -24,7 +24,7 @@ class Group_model extends CI_Model { $sql .= $gri_sn!==0 ? $gri_sql : " AND isnull(VAS_IsCancel,0)=0 AND isnull(VAS_Delete,0)=0 AND isnull(vas.DeleteFlag,0)=0 AND VAS_IsSendSucceed=1 AND isnull(VAS_IsReceive,0)=0 - AND EOI_GetDate between '$start_date' AND '$end_date' + -- AND EOI_GetDate between '$start_date' AND '$end_date' -- Trippest, not confirm, not change -- for Trippest deploy AND isnull(VAS_IsConfirm,0)=0 AND isnull(VAS_SendVary,0)=0 AND GRI_OrderType=227002