Update src/streamlit_app.py

src/streamlit_app.py

@@ -63,15 +63,15 @@ def convert_json_to_excel_data_outbound(json_file_content: str, customers_df: pd
         order_type_json = outbound_info.get('orderType')
         delivery_type_fixed = "DELIVERY" # Valore fisso
 
-        order_doc_date_str = outbound_info.get('orderDocDate')
-        order_date_detail = outbound_info.get('orderDateDetail')
-        due_date_str = outbound_info.get('orderDate') # Corrisponde a 'dueDate'
+        order_doc_date_str = outbound_info.get('orderDocDate') # JSON field name
+        date_detail_json = outbound_info.get('orderDateDetail') # JSON field name, becomes 'dateDetail'
+        due_date_str = outbound_info.get('orderDate') # JSON field name, becomes 'dueDate'
 
         reason_code = outbound_info.get('reasonCode')
-        service_fixed = "PDB" # Valore fisso
-        service_type_fixed = "Standard" # Valore fisso
+        # service_fixed = "PDB" # Rimosso
+        # service_type_fixed = "Standard" # Rimosso
 
-        payment_info_value = outbound_info.get('paymentInfo', {}).get('value')
+        payment_info_value = outbound_info.get('paymentInfo', {}).get('value') # JSON field name
         
         delivery_customer = outbound_info.get('deliveryCustomer', {})
         customer_code = delivery_customer.get('code')
@@ -79,7 +79,12 @@ def convert_json_to_excel_data_outbound(json_file_content: str, customers_df: pd
 
         # Consignee data (from JSON)
         consignee_name = delivery_customer.get('name')
-        consignee_address = delivery_customer.get('address')
+        consignee_address_base = delivery_customer.get('address', '')
+        consignee_address_number = delivery_customer.get('addressNumber', '') # Nuovo campo da JSON
+        
+        # Concatenazione indirizzo e civico per consignee.address
+        consignee_address = f"{consignee_address_base} {consignee_address_number}".strip() if consignee_address_base or consignee_address_number else ""
+
         consignee_city = delivery_customer.get('city')
         consignee_province = delivery_customer.get('province')
         consignee_zip_code = delivery_customer.get('zipCode')
@@ -87,7 +92,7 @@ def convert_json_to_excel_data_outbound(json_file_content: str, customers_df: pd
 
         # Customer data (from Excel lookup)
         customer_name = ""
-        customer_address = ""
+        customer_address = "" # Questo sarà concatenazione
         customer_city = ""
         customer_province = ""
         customer_zip_code = ""
@@ -95,18 +100,21 @@ def convert_json_to_excel_data_outbound(json_file_content: str, customers_df: pd
         
         # Esegui la lookup solo se customers_df è fornito e non vuoto
         if customers_df is not None and not customers_df.empty and customer_code and company_code_json:
-            # Filtra per Code e company.code
-            # Assicurati che le colonne di join siano dello stesso tipo, convertendo a str
+            # Filtra per 'code' e 'company.code' (assicurandosi che siano stringhe)
             customer_data = customers_df[
-                (customers_df['Code'].astype(str) == str(customer_code)) &
+                (customers_df['code'].astype(str) == str(customer_code)) & # Modificato da 'Code' a 'code'
                 (customers_df['company.code'].astype(str) == str(company_code_json))
             ]
 
             if not customer_data.empty:
-                # Prendiamo la prima riga se ce ne sono più di una
                 customer_row = customer_data.iloc[0]
                 customer_name = customer_row.get('partner.name', '')
-                customer_address = customer_row.get('partner.address', '')
+                
+                # Concatenazione partner.address.address e partner.address.addressNumber
+                excel_customer_address_base = customer_row.get('partner.address.address', '')
+                excel_customer_address_number = customer_row.get('partner.address.addressNumber', '')
+                customer_address = f"{excel_customer_address_base} {excel_customer_address_number}".strip() if excel_customer_address_base or excel_customer_address_number else ""
+
                 customer_city = customer_row.get('partner.address.city', '')
                 customer_province = customer_row.get('partner.address.province', '')
                 customer_zip_code = customer_row.get('partner.address.zipCode', '')
@@ -115,27 +123,27 @@ def convert_json_to_excel_data_outbound(json_file_content: str, customers_df: pd
                 st.warning(f"Attenzione: Dettagli cliente non trovati nell'Excel per Code: '{customer_code}' e Company: '{company_code_json}'.")
 
         # Note fields
-        note_ddt = outbound_info.get('noteDdt')
-        note_warehouse = outbound_info.get('noteWarehouse')
+        note_ddt = outbound_info.get('noteDdt') # JSON field name
+        note_warehouse = outbound_info.get('noteWarehouse') # JSON field name
+        
         note_delivery = outbound_info.get('noteDelivery')
         note_shipment = outbound_info.get('noteShipment')
         reason_code_shp = outbound_info.get('reasonCodeShp')
         info_delivery = outbound_info.get('infoDelivery')
         booking_info = outbound_info.get('bookingInfo')
 
-        # Formattazione delle date (Outbound sembra avere solo date, senza ora)
-        order_doc_date_formatted = None
+        # Formattazione delle date
+        order_date_formatted = None # Cambiato nome variabile
         if order_doc_date_str:
             try:
-                # Rimuovi 'Z' se presente e converti a datetime senza info fuso orario, poi formatta
                 dt_object = datetime.fromisoformat(order_doc_date_str.replace('Z', ''))
-                order_doc_date_formatted = dt_object.strftime('%d/%m/%Y')
+                order_date_formatted = dt_object.strftime('%d/%m/%Y')
             except ValueError:
-                order_doc_date_formatted = order_doc_date_str
+                order_date_formatted = order_doc_date_str
                 st.warning(f"Attenzione: Impossibile parsare 'orderDocDate' '{order_doc_date_str}'. Verrà usata la stringa originale.")
         
         due_date_formatted = None
-        if due_date_str: # Questo è il campo 'orderDate' del JSON che diventa 'dueDate'
+        if due_date_str: 
             try:
                 dt_object = datetime.fromisoformat(due_date_str.replace('Z', ''))
                 due_date_formatted = dt_object.strftime('%d/%m/%Y')
@@ -153,38 +161,38 @@ def convert_json_to_excel_data_outbound(json_file_content: str, customers_df: pd
                 'orderNumber': order_number,
                 'orderType': order_type_json, 
                 'deliveryType': delivery_type_fixed, 
-                'orderDocDate': order_doc_date_formatted,
-                'orderDateDetail': order_date_detail,
+                'orderDate': order_date_formatted, # Cambiato nome colonna
+                'dateDetail': date_detail_json, # Cambiato nome colonna
                 'dueDate': due_date_formatted,
                 'reasonCode': reason_code,
-                'service': service_fixed, 
-                'serviceType': service_type_fixed, 
-                'paymentInfo.value': payment_info_value,
+                # 'service': service_fixed, # Rimosso
+                # 'serviceType': service_type_fixed, # Rimosso
+                'paymentValue': payment_info_value, # Cambiato nome colonna
                 'customer.code': customer_code,
                 'customer.name': customer_name, # Da Excel
-                'customer.address': customer_address, # Da Excel
+                'customer.address': customer_address, # Da Excel (concatenato)
                 'customer.city': customer_city, # Da Excel
                 'customer.province': customer_province, # Da Excel
                 'customer.zipCode': customer_zip_code, # Da Excel
                 'customer.country': customer_country, # Da Excel
                 'consignee.name': consignee_name, # Dal JSON
-                'consignee.address': consignee_address, # Dal JSON
+                'consignee.address': consignee_address, # Dal JSON (concatenato)
                 'consignee.city': consignee_city, # Dal JSON
                 'consignee.province': consignee_province, # Dal JSON
                 'consignee.zipCode': consignee_zip_code, # Dal JSON
                 'consignee.country': consignee_country, # Dal JSON
                 'customer.mail': customer_mail, # Dal JSON
                 'details.positionId': item.get('positionId'),
-                'details.itemNumber': item.get('itemCode'), # Rinominato da itemCode
-                'details.requestedQt': item.get('quantity'), # Rinominato da quantity
+                'details.itemNumber': item.get('itemCode'), 
+                'details.requestedQt': item.get('quantity'), 
                 'details.lotId': item.get('lotId'),
                 'details.stockOwner': item.get('stockOwner'),
-                'details.magCli': item.get('warehouse'), # Rinominato da warehouse
+                'details.magCli': item.get('warehouse'), 
                 'details.availability': item.get('availability'),
                 'details.accountingStatus': item.get('accountingStatus'),
                 'details.refOrder': item.get('refOrder'),
-                'noteDdt': note_ddt,
-                'noteWarehouse': note_warehouse,
+                'noteDDT': note_ddt, # Cambiato nome colonna
+                'noteMag': note_warehouse, # Cambiato nome colonna
                 'noteDelivery': note_delivery,
                 'noteShipment': note_shipment,
                 'reasonCodeShp': reason_code_shp,
@@ -213,11 +221,12 @@ st.title("Convertitore JSON Outbound a Template Excel Outbound")
 st.write("Carica i tuoi file JSON degli ordini Outbound e un file Excel con i dati dei clienti.")
 
 st.header("1. Carica il file Excel dei Clienti")
-st.info("Questo file Excel deve contenere le colonne: `Code`, `company.code`, `partner.name`, `partner.address`, `partner.address.city`, `partner.address.province`, `partner.address.zipCode`, `partner.address.country`.")
+st.info("Questo file Excel deve contenere le colonne: `code`, `company.code`, `partner.name`, `partner.address.address`, `partner.address.addressNumber`, `partner.address.city`, `partner.address.province`, `partner.address.zipCode`, `partner.address.country`.")
 uploaded_customers_file = st.file_uploader(
     "Scegli il file Excel con i dettagli dei Clienti",
     type=["xlsx", "xls"],
-    key=st.session_state.file_uploader_key_customers # Usa la chiave unica
+    accept_multiple_files=False, # Limitato a un solo file
+    key=st.session_state.file_uploader_key_customers
 )
 
 customers_df = pd.DataFrame()
@@ -225,7 +234,7 @@ if uploaded_customers_file:
     try:
         customers_df = pd.read_excel(uploaded_customers_file)
         # Assicurati che le colonne per il merge siano stringhe per evitare problemi di tipo
-        customers_df['Code'] = customers_df['Code'].astype(str)
+        customers_df['code'] = customers_df['code'].astype(str) # Modificato da 'Code' a 'code'
         customers_df['company.code'] = customers_df['company.code'].astype(str)
         st.success("File Excel Clienti caricato con successo.")
     except Exception as e:
@@ -237,7 +246,7 @@ uploaded_json_files = st.file_uploader(
     "Scegli uno o più file JSON di tipo 'Ordine_Outbound'",
     type=["json"],
     accept_multiple_files=True,
-    key=st.session_state.file_uploader_key_json # Usa la chiave unica
+    key=st.session_state.file_uploader_key_json
 )
 
 all_processed_data = []
@@ -281,13 +290,14 @@ if uploaded_json_files and not customers_df.empty:
         # Definizione delle colonne di testata
         header_columns = [
             'siteCode', 'companyCode', 'orderNumber', 'orderType', 'deliveryType',
-            'orderDocDate', 'orderDateDetail', 'dueDate', 'reasonCode',
-            'service', 'serviceType', 'paymentInfo.value', 
+            'orderDate', 'dateDetail', 'dueDate', 'reasonCode',
+            # 'service', 'serviceType', # Rimosso
+            'paymentValue', 
             'customer.code', 'customer.name', 'customer.address', 'customer.city',
             'customer.province', 'customer.zipCode', 'customer.country',
             'consignee.name', 'consignee.address', 'consignee.city', 'consignee.province',
             'consignee.zipCode', 'consignee.country', 'customer.mail',
-            'noteDdt', 'noteWarehouse', 'noteDelivery', 'noteShipment',
+            'noteDDT', 'noteMag', 'noteDelivery', 'noteShipment', # Modificati
             'reasonCodeShp', 'infoDelivery', 'bookingInfo'
         ]
 
@@ -307,16 +317,14 @@ if uploaded_json_files and not customers_df.empty:
         sheet_name_excel = 'OutboundOrder'
 
         workbook = writer.book
-        # Crea il worksheet esplicitamente se non esiste, altrimenti lo ottieni
-        worksheet = writer.sheets.get(sheet_name_excel)
-        if worksheet is None:
-            worksheet = workbook.add_worksheet(sheet_name_excel)
+        worksheet = workbook.add_worksheet(sheet_name_excel) # Creiamo sempre un nuovo worksheet
 
         # Lista delle colonne finali nell'ordine desiderato
         final_columns_order = [
             'siteCode', 'companyCode', 'orderNumber', 'orderType', 'deliveryType',
-            'orderDocDate', 'orderDateDetail', 'dueDate', 'reasonCode',
-            'service', 'serviceType', 'paymentInfo.value', 
+            'orderDate', 'dateDetail', 'dueDate', 'reasonCode',
+            # 'service', 'serviceType', # Rimosso
+            'paymentValue', 
             'customer.code', 'customer.name', 'customer.address', 'customer.city',
             'customer.province', 'customer.zipCode', 'customer.country',
             'consignee.name', 'consignee.address', 'consignee.city', 'consignee.province',
@@ -324,21 +332,24 @@ if uploaded_json_files and not customers_df.empty:
             'details.positionId', 'details.itemNumber', 'details.requestedQt',
             'details.lotId', 'details.stockOwner', 'details.magCli', 'details.availability',
             'details.accountingStatus', 'details.refOrder',
-            'noteDdt', 'noteWarehouse', 'noteDelivery', 'noteShipment',
+            'noteDDT', 'noteMag', 'noteDelivery', 'noteShipment', # Modificati
             'reasonCodeShp', 'infoDelivery', 'bookingInfo'
         ]
         
         # Assicurati che il DataFrame abbia tutte le colonne nell'ordine desiderato
+        # Se una colonna non esiste nel DataFrame, la aggiungiamo vuota
         for col in final_columns_order:
             if col not in final_df.columns:
                 final_df[col] = "" 
+        # Riordina le colonne del DataFrame
         final_df = final_df[final_columns_order]
 
         # Larghezze delle colonne aggiornate (adattate per Outbound)
         col_widths = {
             'siteCode': 10, 'companyCode': 15, 'orderNumber': 15, 'orderType': 10, 'deliveryType': 12,
-            'orderDocDate': 12, 'orderDateDetail': 15, 'dueDate': 12, 'reasonCode': 12, # Date solo gg/mm/aaaa
-            'service': 10, 'serviceType': 12, 'paymentInfo.value': 15, 
+            'orderDate': 12, 'dateDetail': 15, 'dueDate': 12, 'reasonCode': 12, # Date solo gg/mm/aaaa
+            # 'service': 10, 'serviceType': 12, # Rimosso
+            'paymentValue': 15, # Modificato
             'customer.code': 15, 'customer.name': 30, 'customer.address': 30, 'customer.city': 15, 
             'customer.province': 10, 'customer.zipCode': 10, 'customer.country': 10,
             'consignee.name': 30, 'consignee.address': 30, 'consignee.city': 15, 'consignee.province': 10,
@@ -346,7 +357,7 @@ if uploaded_json_files and not customers_df.empty:
             'details.positionId': 12, 'details.itemNumber': 20, 'details.requestedQt': 15,
             'details.lotId': 10, 'details.stockOwner': 15, 'details.magCli': 15, 'details.availability': 15,
             'details.accountingStatus': 18, 'details.refOrder': 15,
-            'noteDdt': 20, 'noteWarehouse': 20, 'noteDelivery': 20, 'noteShipment': 20,
+            'noteDDT': 20, 'noteMag': 20, 'noteDelivery': 20, 'noteShipment': 20, # Modificati
             'reasonCodeShp': 15, 'infoDelivery': 20, 'bookingInfo': 20
         }
         
@@ -363,12 +374,11 @@ if uploaded_json_files and not customers_df.empty:
             else:
                 worksheet.set_column(col_num, col_num, 15) 
             
-            # Applica il formato data alle colonne 'orderDocDate' e 'dueDate'
-            if col_name in ['orderDocDate', 'dueDate']:
+            # Applica il formato data alle colonne 'orderDate' e 'dueDate'
+            if col_name in ['orderDate', 'dueDate']: # Modificato 'orderDocDate' in 'orderDate'
                 worksheet.set_column(col_num, col_num, col_widths[col_name], date_format)
 
         # Scrivi i dati a partire dalla riga 3 (indice 2 in xlsxwriter)
-        # NOTA: header=False perché li abbiamo già scritti noi nella riga 2
         final_df.to_excel(writer, sheet_name=sheet_name_excel, index=False, header=False, startrow=2)
 
         writer.close()
@@ -392,17 +402,10 @@ if uploaded_json_files and not customers_df.empty:
 
 # --- Funzione per il reset ---
 def clear_inputs():
-    # Incrementa i contatori delle chiavi per forzare il reset dei file uploader
-    # Nota: L'incremento è solo per il "nome" della chiave, il valore numerico non ha significato
-    # st.session_state.file_uploader_key_json = 'json_uploader_' + str(int(st.session_state.file_uploader_key_json.split('_')[1]) + 1)
-    # st.session_state.file_uploader_key_customers = 'customers_uploader_' + str(int(st.session_state.file_uploader_key_customers.split('_')[1]) + 1)
-    # Un reset più semplice e sicuro è usare una chiave che cambia ogni volta, ad esempio con il tempo corrente.
-    # Tuttavia, per il reset del file_uploader, Streamlit richiede un cambio della 'key'.
-    # Una pratica comune è resettare la chiave con un nuovo valore statico o una funzione che genera una nuova chiave.
-    # Per semplicità e robustezza, userò un approccio che "toggle" il valore o lo cambia.
-    # L'errore originale era '0', quindi ora usiamo stringhe diverse.
-    st.session_state.file_uploader_key_json = 'json_uploader_reset'
-    st.session_state.file_uploader_key_customers = 'customers_uploader_reset'
+    # Per forzare il reset del file uploader, cambiamo la sua chiave
+    # Usiamo un timestamp per generare una chiave sempre nuova e unica
+    st.session_state.file_uploader_key_json = f'json_uploader_{datetime.now().timestamp()}'
+    st.session_state.file_uploader_key_customers = f'customers_uploader_{datetime.now().timestamp()}'
 
 st.markdown("---")
 st.button("Pulisci Input (RESET)", on_click=clear_inputs)