This commit is contained in:
bcomsugi 2023-12-27 04:23:20 +07:00
parent fcdd70c6cc
commit 323be7c7e7
2 changed files with 11 additions and 11 deletions

View File

@ -119,7 +119,7 @@ def read_DN_excel(filename):
data.append(temp_)
else:
print("HEADER ERROR!!!")
data.append(['Item No', 'Description', 'QuantityUOM', 'No.SO/Ext.Doc.No.', 'LPN No.'])
data.append(['Item No', 'Description', 'QuantityUOM', 'No.SO', 'LPN No.'])
boldataline=True
firstpage=False
@ -233,10 +233,10 @@ def read_DN_excel(filename):
print(f'len newdata={len(newdata)}')
df=pd.DataFrame(newdata, columns=['Item No', 'Description', 'Quantity', 'No.SO/Ext.Doc.No.', 'LPN No.', 'UOM', 'Ext.Doc.No.'])#, columns=data[0]+"UOM")
df=pd.DataFrame(newdata, columns=['Item No', 'Description', 'Quantity', 'No.SO', 'LPN No.', 'UOM', 'Ext.Doc.No'])#, columns=data[0]+"UOM")
# print(df)
# df=df.groupby(['No.SO/Ext.Doc.No.','Item No', 'UOM'])['Quantity'].sum().reset_index().sort_values(by=['Item No', 'No.SO/Ext.Doc.No.'])#.sort_values(by=['No.SO/Ext.Doc.No.'])
df=df.groupby(['Ext.Doc.No.', 'No.SO/Ext.Doc.No.','Item No', 'UOM'])['Quantity'].sum().reset_index().sort_values(by=['Ext.Doc.No.','No.SO/Ext.Doc.No.', 'Item No'])
# df=df.groupby(['No.SO','Item No', 'UOM'])['Quantity'].sum().reset_index().sort_values(by=['Item No', 'No.SO'])#.sort_values(by=['No.SO'])
df=df.groupby(['Ext.Doc.No', 'No.SO','Item No', 'UOM'])['Quantity'].sum().reset_index().sort_values(by=['Ext.Doc.No','No.SO', 'Item No'])
df['NameFromTaco']=df['Item No']
# print(df)
# df['FullName'] = inteminvdf.loc[df['Item No'],'FullName']
@ -248,14 +248,14 @@ def read_DN_excel(filename):
print("Cannot Find Item FullName")
listitemNoFullName = df.loc[df['FullName'].isnull()].values.tolist()
df=df.reindex(columns=['Ext.Doc.No.', 'No.SO/Ext.Doc.No.', 'Item No', 'FullName', 'Quantity', 'UOM'])
df=df.reindex(columns=['Ext.Doc.No', 'No.SO', 'Item No', 'FullName', 'Quantity', 'UOM'])
# print(df)
# print(listitemNoFullName)
# print(listitemNoFullName)
return False, listitemNoFullName
else:
df=df.groupby(['Ext.Doc.No.', 'No.SO/Ext.Doc.No.','Item No', 'UOM', 'FullName'])['Quantity'].sum().reset_index().sort_values(by=['Ext.Doc.No.','No.SO/Ext.Doc.No.', 'Item No'])
df=df.reindex(columns=['Ext.Doc.No.', 'No.SO/Ext.Doc.No.', 'Item No', 'FullName', 'Quantity', 'UOM'])
df=df.groupby(['Ext.Doc.No', 'No.SO','Item No', 'UOM', 'FullName'])['Quantity'].sum().reset_index().sort_values(by=['Ext.Doc.No','No.SO', 'Item No'])
df=df.reindex(columns=['Ext.Doc.No', 'No.SO', 'Item No', 'FullName', 'Quantity', 'UOM'])
# print(df)
lst = df.to_dict('records')
# print(lst)

File diff suppressed because one or more lines are too long