Update app.py
Browse files
app.py
CHANGED
|
@@ -11,7 +11,7 @@ def process_excel_files(member_file, order_file, ์์ฑ์ผ์):
|
|
| 11 |
|
| 12 |
# ์ด ์ด๋ฆ ํ์ธ
|
| 13 |
required_member_columns = ['์์ด๋', '์ด๋ฆ', '์ํธ', '์ฌ์
์๋ฒํธ', '์ด๋ฉ์ผ']
|
| 14 |
-
required_order_columns = ['์์ด๋', '์ฃผ๋ฌธ๊ธ์ก']
|
| 15 |
|
| 16 |
missing_member_columns = [col for col in required_member_columns if col not in member_df.columns]
|
| 17 |
missing_order_columns = [col for col in required_order_columns if col not in order_df.columns]
|
|
@@ -21,10 +21,18 @@ def process_excel_files(member_file, order_file, ์์ฑ์ผ์):
|
|
| 21 |
if missing_order_columns:
|
| 22 |
return f"์๋ฌ ๋ฐ์: '์ฃผ๋ฌธ๋ด์ญ ํ์ผ'์ ๋๋ฝ๋ ์ด: {missing_order_columns}. ํ์ผ ์ด ์ด๋ฆ: {list(order_df.columns)}"
|
| 23 |
|
| 24 |
-
# ์ฃผ๋ฌธ
|
| 25 |
-
order_df.drop_duplicates(subset="
|
| 26 |
order_df = order_df[order_df['์ฃผ๋ฌธ๊ธ์ก'] != 0]
|
| 27 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 28 |
# ํ์์ ๋ณด์ ์ฃผ๋ฌธ๋ด์ญ ๋ณํฉ (์์ด๋ ๊ธฐ์ค)
|
| 29 |
merged_df = pd.merge(order_df, member_df, on="์์ด๋", how="left")
|
| 30 |
|
|
|
|
| 11 |
|
| 12 |
# ์ด ์ด๋ฆ ํ์ธ
|
| 13 |
required_member_columns = ['์์ด๋', '์ด๋ฆ', '์ํธ', '์ฌ์
์๋ฒํธ', '์ด๋ฉ์ผ']
|
| 14 |
+
required_order_columns = ['์ฃผ๋ฌธ๋ฒํธ', '์์ด๋', '์ฃผ๋ฌธ๊ธ์ก']
|
| 15 |
|
| 16 |
missing_member_columns = [col for col in required_member_columns if col not in member_df.columns]
|
| 17 |
missing_order_columns = [col for col in required_order_columns if col not in order_df.columns]
|
|
|
|
| 21 |
if missing_order_columns:
|
| 22 |
return f"์๋ฌ ๋ฐ์: '์ฃผ๋ฌธ๋ด์ญ ํ์ผ'์ ๋๋ฝ๋ ์ด: {missing_order_columns}. ํ์ผ ์ด ์ด๋ฆ: {list(order_df.columns)}"
|
| 23 |
|
| 24 |
+
# ์ฃผ๋ฌธ๋ฒํธ ๊ธฐ์ค ์ค๋ณต ์ ๊ฑฐ ๋ฐ ์ฃผ๋ฌธ๊ธ์ก์ด 0์ธ ํ ์ญ์
|
| 25 |
+
order_df.drop_duplicates(subset="์ฃผ๋ฌธ๋ฒํธ", inplace=True)
|
| 26 |
order_df = order_df[order_df['์ฃผ๋ฌธ๊ธ์ก'] != 0]
|
| 27 |
|
| 28 |
+
# ๋์ผ ์์ด๋์ ์ฃผ๋ฌธ๊ธ์ก ํฉ์ฐํ์ฌ ์ฃผ๋ฌธํฉ๊ณ ์ด ์์ฑ
|
| 29 |
+
order_sum = order_df.groupby("์์ด๋")['์ฃผ๋ฌธ๊ธ์ก'].sum().reset_index()
|
| 30 |
+
order_sum.rename(columns={'์ฃผ๋ฌธ๊ธ์ก': '์ฃผ๋ฌธํฉ๊ณ'}, inplace=True)
|
| 31 |
+
order_df = pd.merge(order_df, order_sum, on="์์ด๋", how="left")
|
| 32 |
+
|
| 33 |
+
# Q1 ์ด์ ์ฃผ๋ฌธํฉ๊ณ ์ถ๊ฐ
|
| 34 |
+
order_df['Q1'] = order_df['์ฃผ๋ฌธํฉ๊ณ']
|
| 35 |
+
|
| 36 |
# ํ์์ ๋ณด์ ์ฃผ๋ฌธ๋ด์ญ ๋ณํฉ (์์ด๋ ๊ธฐ์ค)
|
| 37 |
merged_df = pd.merge(order_df, member_df, on="์์ด๋", how="left")
|
| 38 |
|