SalesOrder shipto fix if then else

This commit is contained in:
bcomsugi 2025-07-22 04:56:26 +07:00
parent c1377db500
commit d415450cc6
2 changed files with 155 additions and 31 deletions

View File

@ -1,5 +1,5 @@
cd "C:\Sources\dasaproject\"
echo already cd
cmd /k "cd /d C:\Sources\dasaproject\env\Scripts\ & activate & cd /d C:\Sources\dasaproject\ & uvicorn main:app --host 0.0.0.0 --port 8888
cmd /k "cd /d C:\Sources\dasaproject\env\Scripts\ & activate & cd /d C:\Sources\dasaproject\ & uvicorn main:app --host 0.0.0.0 --port 8889
echo uvicorn main:app --reload
echo start app

View File

@ -414,27 +414,55 @@ class InvoiceAdd(baseQBQuery):
self.QBDict[self.__class__.__name__]["BillAddress"]={'Country': kwargs['BillAddress_Country']}
if 'BillAddress_Note' in kwargs:
self.QBDict[self.__class__.__name__]["BillAddress"]={'Note': kwargs['BillAddress_Note']}
if 'ShipAddress_Addr1' in kwargs:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'Addr1': kwargs['ShipAddress_Addr1']}
if 'ShipAddress_Addr2' in kwargs:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'Addr2': kwargs['ShipAddress_Addr2']}
if self.QBDict[self.__class__.__name__].get('ShipAddress'):
self.QBDict[self.__class__.__name__]["ShipAddress"]['Addr2'] = kwargs['ShipAddress_Addr2']
else:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'Addr2': kwargs['ShipAddress_Addr2']}
if 'ShipAddress_Addr3' in kwargs:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'Addr3': kwargs['ShipAddress_Addr3']}
if self.QBDict[self.__class__.__name__].get('ShipAddress'):
self.QBDict[self.__class__.__name__]["ShipAddress"]['Addr3'] = kwargs['ShipAddress_Addr3']
else:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'Addr3': kwargs['ShipAddress_Addr3']}
if 'ShipAddress_Addr4' in kwargs:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'Addr4': kwargs['ShipAddress_Addr4']}
if self.QBDict[self.__class__.__name__].get('ShipAddress'):
self.QBDict[self.__class__.__name__]["ShipAddress"]['Addr4'] = kwargs['ShipAddress_Addr4']
else:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'Addr4': kwargs['ShipAddress_Addr4']}
if 'ShipAddress_Addr5' in kwargs:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'Addr5': kwargs['ShipAddress_Addr5']}
if self.QBDict[self.__class__.__name__].get('ShipAddress'):
self.QBDict[self.__class__.__name__]["ShipAddress"]['Addr5'] = kwargs['ShipAddress_Addr5']
else:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'Addr5': kwargs['ShipAddress_Addr5']}
if 'ShipAddress_City' in kwargs:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'City': kwargs['ShipAddress_City']}
if self.QBDict[self.__class__.__name__].get('ShipAddress'):
self.QBDict[self.__class__.__name__]["ShipAddress"]['City'] = kwargs['ShipAddress_City']
else:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'City': kwargs['ShipAddress_City']}
if 'ShipAddress_State' in kwargs:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'State': kwargs['ShipAddress_State']}
if self.QBDict[self.__class__.__name__].get('ShipAddress'):
self.QBDict[self.__class__.__name__]["ShipAddress"]['State'] = kwargs['ShipAddress_State']
else:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'State': kwargs['ShipAddress_State']}
if 'ShipAddress_PostalCode' in kwargs:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'PostalCode': kwargs['ShipAddress_PostalCode']}
if self.QBDict[self.__class__.__name__].get('ShipAddress'):
self.QBDict[self.__class__.__name__]["ShipAddress"]['PostalCode'] = kwargs['ShipAddress_PostalCode']
else:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'PostalCode': kwargs['ShipAddress_PostalCode']}
if 'ShipAddress_Country' in kwargs:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'Country': kwargs['ShipAddress_Country']}
if self.QBDict[self.__class__.__name__].get('ShipAddress'):
self.QBDict[self.__class__.__name__]["ShipAddress"]['Country'] = kwargs['ShipAddress_Country']
else:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'Country': kwargs['ShipAddress_Country']}
if 'ShipAddress_Note' in kwargs:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'Note': kwargs['ShipAddress_Note']}
if self.QBDict[self.__class__.__name__].get('ShipAddress'):
self.QBDict[self.__class__.__name__]["ShipAddress"]['Note'] = kwargs['ShipAddress_Note']
else:
self.QBDict[self.__class__.__name__]["ShipAddress"]={'Note': kwargs['ShipAddress_Note']}
if 'IsPending' in kwargs:
self.QBDict[self.__class__.__name__]["IsPending"]=kwargs['IsPending']
@ -865,47 +893,143 @@ class SalesOrderAdd(baseQBQuery):
self.QBDict[self.classNameRq][self.__class__.__name__]["TxnDate"]=kwargs['TxnDate']
if 'RefNumber' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["RefNumber"]=kwargs['RefNumber']
# if 'BillAddress_Addr1' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Addr1': kwargs['BillAddress_Addr1']}
# if 'BillAddress_Addr2' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Addr2': kwargs['BillAddress_Addr2']}
# if 'BillAddress_Addr3' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Addr3': kwargs['BillAddress_Addr3']}
# if 'BillAddress_Addr4' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Addr4': kwargs['BillAddress_Addr4']}
# if 'BillAddress_Addr5' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Addr5': kwargs['BillAddress_Addr5']}
# if 'BillAddress_City' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'City': kwargs['BillAddress_City']}
# if 'BillAddress_State' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'State': kwargs['BillAddress_State']}
# if 'BillAddress_PostalCode' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'PostalCode': kwargs['BillAddress_PostalCode']}
# if 'BillAddress_Country' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Country': kwargs['BillAddress_Country']}
# if 'BillAddress_Note' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Note': kwargs['BillAddress_Note']}
if 'BillAddress_Addr1' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Addr1': kwargs['BillAddress_Addr1']}
if 'BillAddress_Addr2' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Addr2': kwargs['BillAddress_Addr2']}
if self.QBDict[self.classNameRq][self.__class__.__name__].get('BillAddress'):
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]['Addr2'] = kwargs['BillAddress_Addr2']
else:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Addr2': kwargs['BillAddress_Addr2']}
if 'BillAddress_Addr3' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Addr3': kwargs['BillAddress_Addr3']}
if self.QBDict[self.classNameRq][self.__class__.__name__].get('BillAddress'):
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]['Addr3'] = kwargs['BillAddress_Addr3']
else:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Addr3': kwargs['BillAddress_Addr3']}
if 'BillAddress_Addr4' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Addr4': kwargs['BillAddress_Addr4']}
if self.QBDict[self.classNameRq][self.__class__.__name__].get('BillAddress'):
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]['Addr4'] = kwargs['BillAddress_Addr4']
else:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Addr4': kwargs['BillAddress_Addr4']}
if 'BillAddress_Addr5' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Addr5': kwargs['BillAddress_Addr5']}
if self.QBDict[self.classNameRq][self.__class__.__name__].get('BillAddress'):
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]['Addr5'] = kwargs['BillAddress_Addr5']
else:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Addr5': kwargs['BillAddress_Addr5']}
if 'BillAddress_City' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'City': kwargs['BillAddress_City']}
if self.QBDict[self.classNameRq][self.__class__.__name__].get('BillAddress'):
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]['City'] = kwargs['BillAddress_City']
else:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'City': kwargs['BillAddress_City']}
if 'BillAddress_State' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'State': kwargs['BillAddress_State']}
if self.QBDict[self.classNameRq][self.__class__.__name__].get('BillAddress'):
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]['State'] = kwargs['BillAddress_State']
else:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'State': kwargs['BillAddress_State']}
if 'BillAddress_PostalCode' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'PostalCode': kwargs['BillAddress_PostalCode']}
if self.QBDict[self.classNameRq][self.__class__.__name__].get('BillAddress'):
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]['PostalCode'] = kwargs['BillAddress_PostalCode']
else:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'PostalCode': kwargs['BillAddress_PostalCode']}
if 'BillAddress_Country' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Country': kwargs['BillAddress_Country']}
if self.QBDict[self.classNameRq][self.__class__.__name__].get('BillAddress'):
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]['Country'] = kwargs['BillAddress_Country']
else:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Country': kwargs['BillAddress_Country']}
if 'BillAddress_Note' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Note': kwargs['BillAddress_Note']}
if self.QBDict[self.classNameRq][self.__class__.__name__].get('BillAddress'):
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]['Note'] = kwargs['BillAddress_Note']
else:
self.QBDict[self.classNameRq][self.__class__.__name__]["BillAddress"]={'Note': kwargs['BillAddress_Note']}
if 'ShipAddress_Addr1' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Addr1': kwargs['ShipAddress_Addr1']}
if 'ShipAddress_Addr2' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Addr2': kwargs['ShipAddress_Addr2']}
if self.QBDict[self.classNameRq][self.__class__.__name__].get('ShipAddress'):
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]['Addr2'] = kwargs['ShipAddress_Addr2']
else:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Addr2': kwargs['ShipAddress_Addr2']}
if 'ShipAddress_Addr3' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Addr3': kwargs['ShipAddress_Addr3']}
if self.QBDict[self.classNameRq][self.__class__.__name__].get('ShipAddress'):
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]['Addr3'] = kwargs['ShipAddress_Addr3']
else:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Addr3': kwargs['ShipAddress_Addr3']}
if 'ShipAddress_Addr4' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Addr4': kwargs['ShipAddress_Addr4']}
if self.QBDict[self.classNameRq][self.__class__.__name__].get('ShipAddress'):
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]['Addr4'] = kwargs['ShipAddress_Addr4']
else:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Addr4': kwargs['ShipAddress_Addr4']}
if 'ShipAddress_Addr5' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Addr5': kwargs['ShipAddress_Addr5']}
if self.QBDict[self.classNameRq][self.__class__.__name__].get('ShipAddress'):
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]['Addr5'] = kwargs['ShipAddress_Addr5']
else:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Addr5': kwargs['ShipAddress_Addr5']}
if 'ShipAddress_City' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'City': kwargs['ShipAddress_City']}
if self.QBDict[self.classNameRq][self.__class__.__name__].get('ShipAddress'):
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]['City'] = kwargs['ShipAddress_City']
else:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'City': kwargs['ShipAddress_City']}
if 'ShipAddress_State' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'State': kwargs['ShipAddress_State']}
if self.QBDict[self.classNameRq][self.__class__.__name__].get('ShipAddress'):
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]['State'] = kwargs['ShipAddress_State']
else:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'State': kwargs['ShipAddress_State']}
if 'ShipAddress_PostalCode' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'PostalCode': kwargs['ShipAddress_PostalCode']}
if self.QBDict[self.classNameRq][self.__class__.__name__].get('ShipAddress'):
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]['PostalCode'] = kwargs['ShipAddress_PostalCode']
else:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'PostalCode': kwargs['ShipAddress_PostalCode']}
if 'ShipAddress_Country' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Country': kwargs['ShipAddress_Country']}
if self.QBDict[self.classNameRq][self.__class__.__name__].get('ShipAddress'):
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]['Country'] = kwargs['ShipAddress_Country']
else:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Country': kwargs['ShipAddress_Country']}
if 'ShipAddress_Note' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Note': kwargs['ShipAddress_Note']}
if self.QBDict[self.classNameRq][self.__class__.__name__].get('ShipAddress'):
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]['Note'] = kwargs['ShipAddress_Note']
else:
self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Note': kwargs['ShipAddress_Note']}
# if 'ShipAddress_Addr1' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Addr1': kwargs['ShipAddress_Addr1']}
# if 'ShipAddress_Addr2' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Addr2': kwargs['ShipAddress_Addr2']}
# if 'ShipAddress_Addr3' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Addr3': kwargs['ShipAddress_Addr3']}
# if 'ShipAddress_Addr4' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Addr4': kwargs['ShipAddress_Addr4']}
# if 'ShipAddress_Addr5' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Addr5': kwargs['ShipAddress_Addr5']}
# if 'ShipAddress_City' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'City': kwargs['ShipAddress_City']}
# if 'ShipAddress_State' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'State': kwargs['ShipAddress_State']}
# if 'ShipAddress_PostalCode' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'PostalCode': kwargs['ShipAddress_PostalCode']}
# if 'ShipAddress_Country' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Country': kwargs['ShipAddress_Country']}
# if 'ShipAddress_Note' in kwargs:
# self.QBDict[self.classNameRq][self.__class__.__name__]["ShipAddress"]={'Note': kwargs['ShipAddress_Note']}
if 'IsPending' in kwargs:
self.QBDict[self.classNameRq][self.__class__.__name__]["IsPending"]=kwargs['IsPending']
@ -1042,8 +1166,8 @@ class SalesOrderAdd(baseQBQuery):
elif 'PriceLevelRef_FullName' in eachLineAdd:
self.LineAddDict["PriceLevelRef"]={'FullName': eachLineAdd['PriceLevelRef_FullName']}
if 'Amount ' in eachLineAdd:
self.LineAddDict["Amount "]=eachLineAdd['Amount ']
if 'Amount' in eachLineAdd:
self.LineAddDict["Amount"]=eachLineAdd['Amount']
# Others
if 'Other1' in eachLineAdd:
self.LineAddDict["Other1"]=eachLineAdd['Other1']