This commit is contained in:
bcomsugi 2024-09-02 02:54:52 +07:00
parent ab9847c4d3
commit 92352a2dc1
3 changed files with 24 additions and 4 deletions

View File

@ -1,7 +1,7 @@
from server import baseQBQuery, timing
import pprint
import timeit
import xml.dom.minidom
# import timeit
# import xml.dom.minidom
from utils import timing, cleanIncludeRetElements, makeAList
import json
from typing import Union
@ -655,7 +655,11 @@ class SalesOrderAdd(baseQBQuery):
self.QBDict[self.classNameRq]={}
self.isRequiredFieldSatisfied = False
if 'requestID' in kwargs:
self.QBDict[self.classNameRq]={'@requestID':kwargs.get('requestID', '1')}
self.QBDict[self.classNameRq][self.__class__.__name__]={'@defMacro':'MACROTYPE'}
if 'CustomerRef_ListID' in kwargs:
if 'CustomerRef' in self.QBDict[self.classNameRq][self.__class__.__name__]:

View File

@ -23,7 +23,10 @@ def addSO(data:dict)->bool:
UnitOfMeasure=SOLine.get('UnitOfMeasure', None)
def main():
data = {'CustomerRef_FullName': '999 HPL', 'RefNumber':'Ref12345', 'TxnDate': "2024-09-01"}
data = {'requestID': '345', 'CustomerRef_FullName': '999 HPL', 'RefNumber':'Ref12345', 'TxnDate': "2024-09-01"}
# data = { 'CustomerRef_FullName': '999 HPL', 'RefNumber':'Ref12345', 'TxnDate': "2024-09-01"}
includeRetElement = ['TxnID', 'EditSequence', 'CustomerRef', 'TemplateRef', 'TxnDate', 'RefNumber', 'TotalAmount', 'SalesOrderLineRet']
data['IncludeRetElement'] = includeRetElement
lineAdd = [{'ItemRef_FullName':'TACO:AA:TH-006AA', 'Quantity':5, 'Rate':1200}, {'ItemRef_FullName':'TACO:J_FC_NT:TH-807J','Other1':"my reftoother1", 'Quantity':1, 'Rate':5500}]
lineAdd = [{'ItemRef_FullName':'TACO:AA:TH-006AA', 'Quantity':5, 'Rate':1200}, {'ItemRef_FullName':'TACO:J_FC_NT:TH-807J','Other1':"my reftoother1", 'Quantity':1, }]
# lineAdd = {'ItemRef_FullName':'Item123', 'Quantity':5, 'Rate':1200}#, {'ItemRef_FullName':'Item23A', 'Quantity':1, 'Rate':5500}
@ -35,6 +38,8 @@ def main():
soAdd = SalesOrderAdd(**data)
print(f'{soAdd = }')
print(f'{soAdd.__repr__ = }')
print(f'{soAdd.all() = }')
pprint(soAdd.to_json())
def test_preparedata():
print("Test Preparedata")

View File

@ -5,6 +5,7 @@ import win32com.client
import xml.dom.minidom as minidom
from time import time
from utils import cleanIncludeRetElements
import json
def timing(f):
# @wraps(f)
@ -36,6 +37,7 @@ class baseQBQuery:
self.class_debug = False
### end ### variable to be replace with other class init value
self.listOfDict = self.ListOfDict(None, self.varDict, self.retName, False)
self.requestID = None
self.statusCode = -1
self.statusMessage = ""
self.statusSeverity = ""
@ -113,6 +115,8 @@ class baseQBQuery:
if self.class_debug:
pprint.pprint("isDataOK", self.varDict)
self.listOfDict.varDict = self.varDict
self.listOfDict.filterKey = ["@requestID"]
self.requestID = self.listOfDict.firstValue().get('@requestID',None)
self.listOfDict.filterKey = ["@statusCode"]
self.statusCode = self.listOfDict.firstValue().get('@statusCode',None)
self.listOfDict.filterKey = ["@statusMessage"]
@ -231,13 +235,20 @@ class baseQBQuery:
if not self.runCheck():
return None
# return self.ListOfDict(None, self.varDict, self.retName).firstValue()
return self.ListOfDict(None, self.varDict, self.retName, self.includeRetElements_allowed, self.statusOk).firstValue()[self.retName]
temp = self.ListOfDict(None, self.varDict, self.retName, self.includeRetElements_allowed, self.statusOk).firstValue()[self.retName]
if self.requestID:
temp['requestID']=self.requestID
# print(f'{temp = }')
return temp
# return self.ListOfDict(None, self.varDict, self.retName, self.includeRetElements_allowed, self.statusOk).firstValue()[self.retName]
### dont use this way
self.listOfDict.varDict = self.varDict
self.listOfDict.filterKey = self.retName
return self.listOfDict
###
def to_json(self) -> str:
return json.dumps(self.all(), indent = 2)
class ListOfDict: