mirror of
https://github.com/bcomsugi/dasaproject.git
synced 2026-01-10 05:42:38 +07:00
Merge branch 'master' of https://github.com/bcomsugi/dasaproject
This commit is contained in:
commit
7b63cd8bfd
@ -229,7 +229,7 @@ class PurchaseOrderQuery:
|
|||||||
_bolfoundrefnum=False
|
_bolfoundrefnum=False
|
||||||
_bol_dictisadded=False
|
_bol_dictisadded=False
|
||||||
Error_msg = None
|
Error_msg = None
|
||||||
|
# print(('adddnqtytopurchaseorderlist'))
|
||||||
for poidx, _po in enumerate(self.PurchaseOrderList):
|
for poidx, _po in enumerate(self.PurchaseOrderList):
|
||||||
if _po['RefNumber']==_dict['RefNum']:
|
if _po['RefNumber']==_dict['RefNum']:
|
||||||
_bolfoundrefnum=True
|
_bolfoundrefnum=True
|
||||||
@ -239,8 +239,10 @@ class PurchaseOrderQuery:
|
|||||||
pass
|
pass
|
||||||
if _poline['ItemFullName']==_dict['FullName']:
|
if _poline['ItemFullName']==_dict['FullName']:
|
||||||
bolfind_poline_dict = True
|
bolfind_poline_dict = True
|
||||||
if _poline['UOM'].upper()==_dict['UOM'].upper():
|
print(f"{_dict['FullName'] = } {_poline['ItemFullName'] = } {_poline['UOM'] = } {_dict['UOM'] = }")
|
||||||
|
if _poline['UOM'].upper()==_dict['UOM'].upper() or _dict['UOM'].upper().startswith('ROLL_'):
|
||||||
# first do UOM in _dict convert treatment
|
# first do UOM in _dict convert treatment
|
||||||
|
print(f"{_dict['FullName'] = } {_poline['UOM'] = } {_dict['UOM'] = }")
|
||||||
QuantityIn_dict = _dict['Quantity']
|
QuantityIn_dict = _dict['Quantity']
|
||||||
if _dict['UOM'].upper().startswith('ROLL_'):
|
if _dict['UOM'].upper().startswith('ROLL_'):
|
||||||
print(f"addDNQtyToPurchaseOrderList->DNqty:{_dict['Quantity']}, Roll_:{_dict['UOM'].split('_')[1]}")
|
print(f"addDNQtyToPurchaseOrderList->DNqty:{_dict['Quantity']}, Roll_:{_dict['UOM'].split('_')[1]}")
|
||||||
@ -304,7 +306,7 @@ class PurchaseOrderQuery:
|
|||||||
else:
|
else:
|
||||||
_dflist = self.dfDN.to_dict('records')
|
_dflist = self.dfDN.to_dict('records')
|
||||||
# print(self.dfDN)
|
# print(self.dfDN)
|
||||||
# print(f'_dflist1:{_dflist}')
|
print(f'_dflist1:{_dflist}')
|
||||||
# print("")
|
# print("")
|
||||||
# print(f'self.PurchaseOrderList: {self.PurchaseOrderList}')
|
# print(f'self.PurchaseOrderList: {self.PurchaseOrderList}')
|
||||||
for idx, xdf in enumerate(_dflist):
|
for idx, xdf in enumerate(_dflist):
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user