Merge branch 'develop'

AppData/ComLib.cs

@@ -96,6 +96,9 @@ namespace AppData
           case BatchStatus.Discarded:
             answ = "Nesting Discarded";
             break;
+          case BatchStatus.Errors:
+            answ = "Nesting Impossibile (data errors)";
+            break;
           default:
             break;
         }

NKC_SDK/Enums.cs

@@ -67,7 +67,11 @@
     /// <summary>
     /// Nesting scartato
     /// </summary>
-    Discarded
+    Discarded,
+    /// <summary>
+    /// Errori in fase di import o calcolo
+    /// </summary>
+    Errors
   }
   /// <summary>
   /// Posizione / Activity degli oggetti Batch

NKC_WF/OrderManager.aspx.cs

@@ -15,6 +15,14 @@ namespace NKC_WF
     /// Folder x SQL import
     /// </summary>
     protected string _SqlImportDir = memLayer.ML.CRS("_SqlImportDir");
+    /// <summary>
+    /// Path base x nesting
+    /// </summary>
+    protected string cadBaseBath = memLayer.ML.CRS("cadBaseBath");
+    /// <summary>
+    /// Path base x server
+    /// </summary>
+    protected string srvCadBaseBath = memLayer.ML.CRS("srvCadBaseBath");
 
     protected void Page_Load(object sender, EventArgs e)
     {
@@ -33,7 +41,8 @@ namespace NKC_WF
     /// <param name="e"></param>
     private void Cmp_fileUpload_eh_FileUploaded(object sender, WebUserContols.FileUploadEventArgs e)
     {
-      DateTime adesso = DateTime.Now;
+      bool dataValidated = true;
+     DateTime adesso = DateTime.Now;
       string dirFrom = e.LocalPath;
       string dirTo = $"{_SqlCopyDir}{adesso.ToString("yyyy-MM")}\\";
       string dirImport = $"{_SqlImportDir}{adesso.ToString("yyyy-MM")}\\";
@@ -49,25 +58,40 @@ namespace NKC_WF
         DataLayer.man.taEL.insertQuery(DateTime.Now, "Copy CSV", $"{e.BatchName}", $"{e.BatchName}.{e.FileName}", $"Exception: {exc}");
       }
       // chiamo stored caricamento
+      DS_App.ImportLogDataTable tabDati = null;
       try
       {
         // chiamo procedura SQL x import... 
-        DataLayer.man.taImpLog.importCsvOrd($"{dirImport}", e.FileName, e.BatchName, ";", "\n", "2", 0, 0, 0);
+        tabDati = DataLayer.man.taImpLog.importCsvOrd($"{dirImport}", e.FileName, e.BatchName, ";", "\n", "2", 0, 0, 0);
       }
       catch (Exception exc)
       {
         logger.lg.scriviLog($"Eccezione in IMPORT file:{Environment.NewLine}{exc}");
         // salvo log errore...
         DataLayer.man.taEL.insertQuery(DateTime.Now, "Upload CSV", $"{e.BatchName}", $"{e.BatchName}.{e.FileName}", $"Exception: {exc}");
+        dataValidated = false;
+      }
+      if (dataValidated)
+      {
+        dataValidated = doValidations(e.BatchName);
+      }
+      if (!dataValidated)
+      {
+        var newBatch = tabDati[0];
+        // vado ad inserire status NON valido
+        int batchId = 0;
+        int.TryParse(e.BatchName, out batchId);
+        int bStatus = 7;
+        DataLayer.man.taBL.updateStatus(batchId, bStatus, e.BatchName, -1);
       }
-      doValidations(e.BatchName);
       doUpdate();
     }
     /// <summary>
     /// Effettua validazione dati
     /// </summary>
-    private void doValidations(string batchName)
+    private bool doValidations(string batchName)
     {
+      bool allOk = true;
       // faccio un ciclo su OGNI record Part --> cerco se mancassero dei file dxf...
       int batchID = 0;
       int.TryParse(batchName, out batchID);
@@ -76,14 +100,25 @@ namespace NKC_WF
         var tabParts = DataLayer.man.taIL.getByBatch(batchID);
         if (tabParts.Count > 0)
         {
+          bool fileOk = false;
+          string localPath = "";
           foreach (var item in tabParts)
           {
-            // cerco file!
+            // cerco file! sostituisco cadBaseBath --> srvCadBaseBath
+            localPath = item.CadFilePath.Replace(cadBaseBath, srvCadBaseBath);
+            fileOk = fileMover.obj.fileExist(localPath);
+            if (!fileOk)
+            {
+              DataLayer.man.taEL.insertQuery(DateTime.Now, "I.1", $"{batchName}", $"{localPath}", $"DXF File not found for part {item.ItemExtCode} | {item.ItemDesc}");
+              allOk = false;
+            }
           }
         }
       }
       catch
       { }
+      // cerco errori preesistenti
+      return allOk;
     }
 
     private void Cmp_fileUpload_eh_doRefresh(object sender, EventArgs e)