diff --git a/src/main/resources/mapper/srm/SrmSupplierMapper.xml b/src/main/resources/mapper/srm/SrmSupplierMapper.xml index 6961364..d7fbf13 100644 --- a/src/main/resources/mapper/srm/SrmSupplierMapper.xml +++ b/src/main/resources/mapper/srm/SrmSupplierMapper.xml @@ -15,21 +15,21 @@ s.id,s.site,s.supplier_no,s.supplier_name,s.supplier_group,sg.GroupDesc AS groupDesc,s.supplier_doc_type, s.create_date,s.create_by,s.update_date,s.update_by,s.Buyer,s.SourcingStaff AS sourcingStaff,s.PhoneNo, s.PhoneNo2,s.PhoneNo3,s.FaxNo,s.Contact,s.Address,s.Email,s.Email2, - s.PaymentTerm,pt.PaymentTerm AS paymentTermDesc, - s.DeliveryTerm,dt.DeliveryTerm AS deliveryTermDesc, - s.Currency, s.TaxCode,t.TaxDesc AS taxDesc,s.tax AS taxRate, + s.PaymentTerm,pt.payment_term AS paymentTermDesc, + s.DeliveryTerm,dt.delivery_term AS deliveryTermDesc, + s.Currency, s.TaxCode,t.tax_desc AS taxDesc,s.tax AS taxRate, s.ABC,s.Active,s.BankName,s.BankAccount,s.TaxNo, s.Other_contact1,s.Other_contact2,s.Other_contact3, s.Memo FROM srm_supplier s LEFT JOIN SupplierGroup sg ON sg.supplier_group = s.supplier_group AND sg.Site = s.site LEFT JOIN Currency c ON c.Currency = s.Currency - AND c.Site = s.site LEFT JOIN Tax t ON t.TaxCode = s.TaxCode + AND c.Site = s.site LEFT JOIN Tax t ON t.tax_code = s.TaxCode AND t.Site = s.site LEFT JOIN DeliveryTerm dt - ON dt.DeliveryTermID = s.DeliveryTerm + ON dt.delivery_term_id = s.DeliveryTerm AND dt.Site = s.site LEFT JOIN PaymentTerm pt - ON pt.PaymentTermID = s.PaymentTerm + ON pt.payment_term_id = s.PaymentTerm AND pt.Site = s.site