diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..32ff0bd --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +myenv +dist +build +main.spec +.idea \ No newline at end of file diff --git a/.~lock.LISTINO SETTEF OK 2025.xlsx# b/.~lock.LISTINO SETTEF OK 2025.xlsx# deleted file mode 100644 index 911e93d..0000000 --- a/.~lock.LISTINO SETTEF OK 2025.xlsx# +++ /dev/null @@ -1 +0,0 @@ -,pc-sviluppo1,pcsviluppo1,13.12.2024 10:29,file:///home/pc-sviluppo1/.config/libreoffice/4; \ No newline at end of file diff --git a/main.py b/main.py index f8e76a7..8a45f99 100644 --- a/main.py +++ b/main.py @@ -1,19 +1,13 @@ import pandas as pd -import mysql.connector import math -import xlsxwriter -import tkinter as tk -from tkinter import filedialog,messagebox -from datetime import datetime -from mysql.connector import Error -from connection import create_connection -from connection import close_connection -from search import search_article -from update import update_records -from insert import insert_records -from write import write_excel -from write_excel_insert import write_excel_insert -from upload import upload_excel +from utils.connection import create_connection +from utils.connection import close_connection +from utils.search import search_article +from utils.update import update_records +from utils.insert import insert_records +from utils.write import write_excel +from utils.write_excel_insert import write_excel_insert +from utils.upload import upload_excel host = "62.86.98.170" @@ -26,7 +20,7 @@ port = 3307 conn = create_connection(host, user, password, database, port) #leggo il file excel file_input = upload_excel() -df = pd.read_excel(file_input, usecols='A:O') +df = pd.read_excel(file_input, usecols='A:O', dtype={'FORNITORE': str, 'CODICE ALTERNATIVO': str}) #leggo le colonne del file excel for index, row in df.iterrows(): @@ -84,9 +78,9 @@ for index, row in df.iterrows(): len_descrizione = len(descrizione) if len_descrizione > 40 : descrizione1 = descrizione [: 40] - print(descrizione1) + #print(descrizione1) descrizione2 = descrizione [40 :] - print(descrizione2) + #print(descrizione2) descrizione = descrizione1 if conn : @@ -122,13 +116,13 @@ for index, row in df.iterrows(): sc2 = ' ' if math.isnan(ricarica): ricarica = ' ' - if not pd.isna(codice_alternativo): + if pd.isna(codice_alternativo): codice_alternativo = ' ' - if not pd.isna(codice_barre): + if pd.isna(codice_barre): codice_barre = '0000000000000' if math.isnan(tsa_codice): tsa_codice = '0' - if not pd.isna(frn): + if pd.isna(frn): frn = ' ' value_insert = insert_records(conn,codice,descrizione,descrizione2,um,prezzo,sc1,sc2,ricarica,listino,codice_alternativo,codice_barre,art,tsa_codice,frn) diff --git a/utils/__init__.py b/utils/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/connection.py b/utils/connection.py similarity index 100% rename from connection.py rename to utils/connection.py diff --git a/insert.py b/utils/insert.py similarity index 98% rename from insert.py rename to utils/insert.py index f2e7187..0da8b51 100644 --- a/insert.py +++ b/utils/insert.py @@ -1,7 +1,4 @@ -import mysql.connector from mysql.connector import Error -import pandas as pd -import math import datetime today = datetime.date.today() diff --git a/search.py b/utils/search.py similarity index 86% rename from search.py rename to utils/search.py index d539d2b..d94b797 100644 --- a/search.py +++ b/utils/search.py @@ -1,11 +1,4 @@ -import pandas as pd -import mysql.connector -import math -import xlsxwriter -import tkinter as tk -from tkinter import filedialog,messagebox -from datetime import datetime -from mysql.connector import Error + def search_article(connection, codice, listino): cursor_1 = connection.cursor(buffered=True) diff --git a/update.py b/utils/update.py similarity index 97% rename from update.py rename to utils/update.py index 0e9e961..45be852 100644 --- a/update.py +++ b/utils/update.py @@ -1,4 +1,4 @@ -import mysql.connector + from mysql.connector import Error import pandas as pd import math @@ -37,13 +37,13 @@ def update_records(connection,codice,prezzo,sc1,sc2,listino,ricarica,codice_barr count = cursor.rowcount result.append(count) - if codice_barre is not None: + if len(codice_barre.strip()) > 0: query_bar = "UPDATE bar SET CODICE_BARRE = %s WHERE ART_CODICE = %s" cursor.execute(query_bar, (codice_barre, codice)) count = cursor.rowcount result.append(count) - if not pd.isna(codice_alternativo): + if len(codice_alternativo.strip()) > 0: query_alt = "UPDATE art SET CODICE_ALTERNATIVO = %s WHERE codice = %s" cursor.execute(query_alt, (codice_alternativo, codice)) count = cursor.rowcount @@ -55,7 +55,7 @@ def update_records(connection,codice,prezzo,sc1,sc2,listino,ricarica,codice_barr count = cursor.rowcount result.append(count) - if frn is not None and math.isnan(frn): + if len(frn.strip()) > 0: query_art = "UPDATE art SET FRN_CODICE = %s WHERE codice = %s" cursor.execute(query_art, (frn, codice)) count = cursor.rowcount diff --git a/upload.py b/utils/upload.py similarity index 72% rename from upload.py rename to utils/upload.py index 6f81614..eb6a463 100644 --- a/upload.py +++ b/utils/upload.py @@ -1,11 +1,6 @@ -import pandas as pd -import mysql.connector -import math import xlsxwriter import tkinter as tk -from tkinter import filedialog,messagebox -from datetime import datetime -from mysql.connector import Error +from tkinter import filedialog def upload_excel(): # Crea una finestra di dialogo per selezionare il file diff --git a/write.py b/utils/write.py similarity index 98% rename from write.py rename to utils/write.py index f6ecc8d..7f06a86 100644 --- a/write.py +++ b/utils/write.py @@ -1,4 +1,4 @@ -import pandas as pd + import xlsxwriter import tkinter as tk from datetime import datetime diff --git a/write_excel_insert.py b/utils/write_excel_insert.py similarity index 98% rename from write_excel_insert.py rename to utils/write_excel_insert.py index 7329b29..cc7eafb 100644 --- a/write_excel_insert.py +++ b/utils/write_excel_insert.py @@ -1,4 +1,4 @@ -import pandas as pd + import xlsxwriter import tkinter as tk from datetime import datetime