diff --git a/SO_to_Inv/CustomerQuery.py b/SO_to_Inv/CustomerQuery.py index 124352a..08e5a83 100644 --- a/SO_to_Inv/CustomerQuery.py +++ b/SO_to_Inv/CustomerQuery.py @@ -36,10 +36,23 @@ class CustomerQuery: # print(f'CustomerRets:{CustomerRets}') PriceLevelName = None SP_PriceLevelName = None + Addr1, Addr2, Addr3, Addr4, Addr5 = None, None, None, None, None + Addr1s, Addr2s, Addr3s, Addr4s, Addr5s = [], [], [], [], [] for CustomerRet in CustomerRets: CustomerFullName = None PriceLevelName = None SP_PriceLevelName = None + Addr1, Addr2, Addr3, Addr4, Addr5 = None, None, None, None, None + if CustomerRet.find('Addr1'): Addr1 = CustomerRet.find('Addr1').text + if CustomerRet.find('Addr2'): Addr2 = CustomerRet.find('Addr2').text + if CustomerRet.find('Addr3'): Addr3 = CustomerRet.find('Addr3').text + if CustomerRet.find('Addr4'): Addr4 = CustomerRet.find('Addr4').text + if CustomerRet.find('Addr5'): Addr5 = CustomerRet.find('Addr5').text + Addr1s.append(Addr1) + Addr2s.append(Addr2) + Addr3s.append(Addr3) + Addr4s.append(Addr4) + Addr5s.append(Addr5) CustomerFullName = CustomerRet.find('FullName').text PriceLevelName = CustomerRet.find('.//PriceLevelRef') if PriceLevelName: @@ -62,6 +75,11 @@ class CustomerQuery: Customer['FullName']=self.CustomerFullNames Customer['PriceLevelName']=self.CustomerPriceLevelNames Customer['SPName']= self.SPPriceLevelNames + Customer['Addr1']=Addr1s + Customer['Addr2']=Addr2s + Customer['Addr3']=Addr3s + Customer['Addr4']=Addr4s + Customer['Addr5']=Addr5s # print(Customer) _df = pd.DataFrame.from_dict(Customer) print(_df) @@ -86,7 +104,8 @@ class CustomerQuery: if self.MaxReturned is not None: print("masuk maxreturn") MaxReturned = self.create_sub_element(ET, CustomerQueryRq, "MaxReturned", self.MaxReturned, 4) - IncludeRetElement = ['FullName', 'PriceLevelRef', 'DataExtRet'] + IncludeRetElement = ['FullName', 'PriceLevelRef', 'BillAddress', 'DataExtRet'] + # IncludeRetElement += [, 'BillAddress1', 'BillAddress2', 'BillAddress3', 'BillAddres4', 'BillAddress5',] for x in IncludeRetElement: IncludeRetElement = self.create_sub_element(ET, CustomerQueryRq, "IncludeRetElement", x, 4) OwnerID = self.create_sub_element(ET, CustomerQueryRq, "OwnerID", "0", 6) diff --git a/main.py b/main.py index 2af61d6..aa887e7 100644 --- a/main.py +++ b/main.py @@ -77,6 +77,7 @@ async def get_customer_fullname(maxreturned:Union[int, None] = None): customer = CustomerQuery.CustomerQuery(MaxReturned=maxreturned) # QBXML = customer.create_QBXML() itu = customer.create_customerquery_QBXML() + print(itu) status, data = customer.to_json() if status: return data