Update app.py
Browse files
app.py
CHANGED
|
@@ -85,7 +85,7 @@ def add_quantity_columns(df):
|
|
| 85 |
new_column = f'QTY {last_qty_column + 1}'
|
| 86 |
df.insert(df.columns.get_loc('Total'), new_column, None)
|
| 87 |
|
| 88 |
-
def update_inventory_and_reservation(preferred, search_by, action, part_number=None, size=None, type=None, from_length=None, used_length=None, new_length=None, count=None, job_number=None):
|
| 89 |
global reservation # Ensure reservation is accessible
|
| 90 |
global activity_log
|
| 91 |
|
|
@@ -98,21 +98,12 @@ def update_inventory_and_reservation(preferred, search_by, action, part_number=N
|
|
| 98 |
part_data = inventory_to_use[inventory_to_use["Part Number"] == part_number]
|
| 99 |
else:
|
| 100 |
part_data = inventory_to_use[(inventory_to_use["Size"] == size) & (inventory_to_use["Type"] == type)]
|
| 101 |
-
if not part_data.empty:
|
| 102 |
-
part_number = part_data["Part Number"].values[0]
|
| 103 |
-
|
| 104 |
-
# Debug statements
|
| 105 |
-
print("Preferred:", preferred)
|
| 106 |
-
print("Search By:", search_by)
|
| 107 |
-
print("Part Number:", part_number)
|
| 108 |
-
print("Size:", size)
|
| 109 |
-
print("Type:", type)
|
| 110 |
-
print("Part Data:", part_data)
|
| 111 |
|
| 112 |
if part_data.empty:
|
| 113 |
return "Part not found."
|
| 114 |
|
| 115 |
inventory_index = part_data.index[0]
|
|
|
|
| 116 |
available_lengths = part_data[[col for col in inventory.columns if 'QTY ' in col]].values[0].tolist()
|
| 117 |
available_lengths = [length for length in available_lengths if not pd.isna(length)]
|
| 118 |
|
|
@@ -123,7 +114,7 @@ def update_inventory_and_reservation(preferred, search_by, action, part_number=N
|
|
| 123 |
job_number = str(job_number) # Ensure job number is a string
|
| 124 |
reservation['Job Number'] = reservation['Job Number'].astype(str) # Convert job number column to string
|
| 125 |
|
| 126 |
-
reservation_data = reservation[(reservation['Job Number'] == job_number) & (reservation['Part Number'] == part_number) & (reservation['Quantity'] == from_length)]
|
| 127 |
|
| 128 |
if not reservation_data.empty:
|
| 129 |
reserved_length = reservation_data['Reserved'].values[0]
|
|
@@ -138,7 +129,7 @@ def update_inventory_and_reservation(preferred, search_by, action, part_number=N
|
|
| 138 |
reservation.loc[reservation['Part Number'] == part_number, 'Quantity'] -= used_length
|
| 139 |
|
| 140 |
else:
|
| 141 |
-
available_data = reservation[(reservation['Part Number'] == part_number) & (reservation['Quantity'] == from_length)]
|
| 142 |
if not available_data.empty:
|
| 143 |
available_length = available_data['Available'].values[0]
|
| 144 |
if used_length > available_length:
|
|
@@ -149,7 +140,7 @@ def update_inventory_and_reservation(preferred, search_by, action, part_number=N
|
|
| 149 |
|
| 150 |
action_description = f"Consumed {used_length} inches from {from_length} inch sheet"
|
| 151 |
else:
|
| 152 |
-
available_data = reservation[(reservation['Part Number'] == part_number) & (reservation['Quantity'] == from_length)]
|
| 153 |
if not available_data.empty:
|
| 154 |
available_length = available_data['Available'].values[0]
|
| 155 |
if used_length > available_length:
|
|
@@ -207,7 +198,6 @@ def update_inventory_and_reservation(preferred, search_by, action, part_number=N
|
|
| 207 |
if inventory.at[inventory_index, column] == from_length:
|
| 208 |
column_to_update = column
|
| 209 |
break
|
| 210 |
-
|
| 211 |
if column_to_update:
|
| 212 |
inventory.at[inventory_index, column_to_update] = None
|
| 213 |
|
|
@@ -270,6 +260,7 @@ def update_inventory_and_reservation(preferred, search_by, action, part_number=N
|
|
| 270 |
|
| 271 |
|
| 272 |
|
|
|
|
| 273 |
def main(preferred, search_by, action, part_number=None, size=None, description=None, from_length=None, job_number=None, used_length=None, new_length=None, count=None):
|
| 274 |
if used_length is not None:
|
| 275 |
used_length = float(used_length) # Convert to float
|
|
|
|
| 85 |
new_column = f'QTY {last_qty_column + 1}'
|
| 86 |
df.insert(df.columns.get_loc('Total'), new_column, None)
|
| 87 |
|
| 88 |
+
def update_inventory_and_reservation(preferred, search_by, action, part_number=None, size=None, type=None, description=None, from_length=None, used_length=None, new_length=None, count=None, job_number=None):
|
| 89 |
global reservation # Ensure reservation is accessible
|
| 90 |
global activity_log
|
| 91 |
|
|
|
|
| 98 |
part_data = inventory_to_use[inventory_to_use["Part Number"] == part_number]
|
| 99 |
else:
|
| 100 |
part_data = inventory_to_use[(inventory_to_use["Size"] == size) & (inventory_to_use["Type"] == type)]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 101 |
|
| 102 |
if part_data.empty:
|
| 103 |
return "Part not found."
|
| 104 |
|
| 105 |
inventory_index = part_data.index[0]
|
| 106 |
+
part_number = part_data["Part Number"].values[0] # Get the part number based on size and type
|
| 107 |
available_lengths = part_data[[col for col in inventory.columns if 'QTY ' in col]].values[0].tolist()
|
| 108 |
available_lengths = [length for length in available_lengths if not pd.isna(length)]
|
| 109 |
|
|
|
|
| 114 |
job_number = str(job_number) # Ensure job number is a string
|
| 115 |
reservation['Job Number'] = reservation['Job Number'].astype(str) # Convert job number column to string
|
| 116 |
|
| 117 |
+
reservation_data = reservation[(reservation['Job Number'] == job_number) & (reservation['Part Number'] == part_number) & (reservation['Size'] == size) & (reservation['Type'] == type) & (reservation['Quantity'] == from_length)]
|
| 118 |
|
| 119 |
if not reservation_data.empty:
|
| 120 |
reserved_length = reservation_data['Reserved'].values[0]
|
|
|
|
| 129 |
reservation.loc[reservation['Part Number'] == part_number, 'Quantity'] -= used_length
|
| 130 |
|
| 131 |
else:
|
| 132 |
+
available_data = reservation[(reservation['Part Number'] == part_number) & (reservation['Size'] == size) & (reservation['Type'] == type) & (reservation['Quantity'] == from_length)]
|
| 133 |
if not available_data.empty:
|
| 134 |
available_length = available_data['Available'].values[0]
|
| 135 |
if used_length > available_length:
|
|
|
|
| 140 |
|
| 141 |
action_description = f"Consumed {used_length} inches from {from_length} inch sheet"
|
| 142 |
else:
|
| 143 |
+
available_data = reservation[(reservation['Part Number'] == part_number) & (reservation['Size'] == size) & (reservation['Type'] == type) & (reservation['Quantity'] == from_length)]
|
| 144 |
if not available_data.empty:
|
| 145 |
available_length = available_data['Available'].values[0]
|
| 146 |
if used_length > available_length:
|
|
|
|
| 198 |
if inventory.at[inventory_index, column] == from_length:
|
| 199 |
column_to_update = column
|
| 200 |
break
|
|
|
|
| 201 |
if column_to_update:
|
| 202 |
inventory.at[inventory_index, column_to_update] = None
|
| 203 |
|
|
|
|
| 260 |
|
| 261 |
|
| 262 |
|
| 263 |
+
|
| 264 |
def main(preferred, search_by, action, part_number=None, size=None, description=None, from_length=None, job_number=None, used_length=None, new_length=None, count=None):
|
| 265 |
if used_length is not None:
|
| 266 |
used_length = float(used_length) # Convert to float
|