mirror of
https://github.com/bcomsugi/dasaproject.git
synced 2026-01-10 16:52:38 +07:00
update disc dict
This commit is contained in:
parent
c160fc619b
commit
bd0304b409
@ -288,7 +288,8 @@ class SalesOrderQuery:
|
|||||||
if len(SalesOrderLineRet) > 0:
|
if len(SalesOrderLineRet) > 0:
|
||||||
disc_amount=0
|
disc_amount=0
|
||||||
for SalesOrderLineRet in SalesOrderLineRet:
|
for SalesOrderLineRet in SalesOrderLineRet:
|
||||||
disc = 0
|
discPerItem = 0
|
||||||
|
discPerPcs = 0
|
||||||
TxnLineID = SalesOrderLineRet.find('TxnLineID').text
|
TxnLineID = SalesOrderLineRet.find('TxnLineID').text
|
||||||
ItemFullName = SalesOrderLineRet.find('ItemRef/FullName')
|
ItemFullName = SalesOrderLineRet.find('ItemRef/FullName')
|
||||||
if ItemFullName is None:
|
if ItemFullName is None:
|
||||||
@ -312,11 +313,13 @@ class SalesOrderQuery:
|
|||||||
BackOrdered = float(Quantity) - float(Invoiced)
|
BackOrdered = float(Quantity) - float(Invoiced)
|
||||||
if BackOrdered and LineIsManuallyClosed.lower() == 'false' :
|
if BackOrdered and LineIsManuallyClosed.lower() == 'false' :
|
||||||
if self.Customer[2]:
|
if self.Customer[2]:
|
||||||
disc = Rate-self._df_price_level.loc[(self._df_price_level['FullName']==ItemFullName) & (self._df_price_level['PriceLevelName']==self.Customer[2])].values.tolist()[0][2]
|
discPerPcs = Rate-self._df_price_level.loc[(self._df_price_level['FullName']==ItemFullName) & (self._df_price_level['PriceLevelName']==self.Customer[2])].values.tolist()[0][2]
|
||||||
# ic(Rate, disc, (Rate - self._df_price_level.loc[(self._df_price_level['FullName']==ItemFullName) & (self._df_price_level['PriceLevelName']==self.SPPriceLevelName)].values.tolist()[0][2]))
|
# ic(Rate, disc, (Rate - self._df_price_level.loc[(self._df_price_level['FullName']==ItemFullName) & (self._df_price_level['PriceLevelName']==self.SPPriceLevelName)].values.tolist()[0][2]))
|
||||||
if disc > 0:
|
if discPerPcs > 0:
|
||||||
ic(Quantity, BackOrdered, Rate, (Rate - self._df_price_level.loc[(self._df_price_level['FullName']==ItemFullName) & (self._df_price_level['PriceLevelName']==self.Customer[2])].values.tolist()[0][2]))
|
ic(Quantity, BackOrdered, Rate, (Rate - self._df_price_level.loc[(self._df_price_level['FullName']==ItemFullName) & (self._df_price_level['PriceLevelName']==self.Customer[2])].values.tolist()[0][2]))
|
||||||
disc_amount += BackOrdered * disc # (Rate-self._df_price_level.loc[(self._df_price_level['FullName']==ItemFullName) & (self._df_price_level['PriceLevelName']==self.Customer[2])].values.tolist()[0][2])
|
discPerItem = BackOrdered * discPerPcs
|
||||||
|
disc_amount += discPerItem
|
||||||
|
# disc_amount += BackOrdered * discPerPcs # (Rate-self._df_price_level.loc[(self._df_price_level['FullName']==ItemFullName) & (self._df_price_level['PriceLevelName']==self.Customer[2])].values.tolist()[0][2])
|
||||||
# disc_amount += BackOrdered * 2500#(Rate-self._df_price_level.loc[(self._df_price_level['FullName']==ItemFullName) & (self._df_price_level['PriceLevelName']==self.Customer[2])].values.tolist()[0][2])
|
# disc_amount += BackOrdered * 2500#(Rate-self._df_price_level.loc[(self._df_price_level['FullName']==ItemFullName) & (self._df_price_level['PriceLevelName']==self.Customer[2])].values.tolist()[0][2])
|
||||||
|
|
||||||
SalesOrderLinedict = {'TxnLineID':TxnLineID,
|
SalesOrderLinedict = {'TxnLineID':TxnLineID,
|
||||||
@ -328,7 +331,7 @@ class SalesOrderQuery:
|
|||||||
'BackOrdered':BackOrdered,
|
'BackOrdered':BackOrdered,
|
||||||
'Invoiced':Invoiced,
|
'Invoiced':Invoiced,
|
||||||
'LineIsManuallyClosed':LineIsManuallyClosed,
|
'LineIsManuallyClosed':LineIsManuallyClosed,
|
||||||
'disc':disc,
|
'disc':discPerItem, # backorder qty * disc per pcs
|
||||||
}
|
}
|
||||||
SalesOrderdict['SalesOrderLineRet'].append(SalesOrderLinedict)
|
SalesOrderdict['SalesOrderLineRet'].append(SalesOrderLinedict)
|
||||||
SalesOrderdict['Disc_Amount']=disc_amount
|
SalesOrderdict['Disc_Amount']=disc_amount
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user