Merge branch 'develop'

NKC_WF/Controllers/BatchProcController.cs

@@ -151,7 +151,7 @@ namespace NKC_WF.Controllers
                   break;
               }
               // SALVO info riguardo al batch running
-              DataLayer.man.taBL.updateStatus(rispStima.BatchID, bStatus, rispStima.EnvNum, (decimal)rispStima.EstimatedWorktime);
+              DataLayer.man.taBL.updateStatus(rispStima.BatchID, bStatus, rispStima.EnvNum, (decimal)rispStima.EstimatedWorktime / 60);
               // salvo udpate elenco ITEMS
               ComLib.updatePartsFromNesting(rispStima.PartList);
               // aggiorno cadPath x items che non abbiano valorizzato...
@@ -187,7 +187,7 @@ namespace NKC_WF.Controllers
                   break;
               }
               // SALVO info riguardo al batch completato
-              DataLayer.man.taBL.updateStatus(rispNest.BatchID, bStatus, rispNest.EnvNum, (decimal)rispNest.EstimatedWorktime);
+              DataLayer.man.taBL.updateStatus(rispNest.BatchID, bStatus, rispNest.EnvNum, (decimal)rispNest.EstimatedWorktime / 60);
               // aggiorno il resto SOLO SE status == completo...
               if (rispNest.ProcessStatus == procStatus.completed)
               {

NKC_WF/OrderManager.aspx.cs

@@ -46,6 +46,7 @@ namespace NKC_WF
       catch (Exception exc)
       {
         logger.lg.scriviLog($"Eccezione in Copia SQL file:{Environment.NewLine}{exc}");
+        DataLayer.man.taEL.insertQuery(DateTime.Now, "Copy CSV", $"{e.BatchName}", $"{e.BatchName}.{e.FileName}", $"Exception: {exc}");
       }
       // chiamo stored caricamento
       try
@@ -59,8 +60,31 @@ namespace NKC_WF
         // salvo log errore...
         DataLayer.man.taEL.insertQuery(DateTime.Now, "Upload CSV", $"{e.BatchName}", $"{e.BatchName}.{e.FileName}", $"Exception: {exc}");
       }
+      doValidations(e.BatchName);
       doUpdate();
     }
+    /// <summary>
+    /// Effettua validazione dati
+    /// </summary>
+    private void doValidations(string batchName)
+    {
+      // faccio un ciclo su OGNI record Part --> cerco se mancassero dei file dxf...
+      int batchID = 0;
+      int.TryParse(batchName, out batchID);
+      try
+      {
+        var tabParts = DataLayer.man.taIL.getByBatch(batchID);
+        if (tabParts.Count > 0)
+        {
+          foreach (var item in tabParts)
+          {
+            // cerco file!
+          }
+        }
+      }
+      catch
+      { }
+    }
 
     private void Cmp_fileUpload_eh_doRefresh(object sender, EventArgs e)
     {
@@ -71,7 +95,9 @@ namespace NKC_WF
     {
       doUpdate();
     }
-
+    /// <summary>
+    /// Update interfaccia
+    /// </summary>
     public void doUpdate()
     {
 

NKC_WF/WebUserControls/cmp_ErrorsLog.ascx

@@ -7,7 +7,6 @@
     <asp:BoundField DataField="ParentUid" HeaderText="PUID" SortExpression="ParentUid" />
     <asp:BoundField DataField="Uid" HeaderText="UID" SortExpression="Uid" />
     <asp:BoundField DataField="Description" HeaderText="Description" SortExpression="Description" />
-    <asp:BoundField DataField="DtRif" HeaderText="When" SortExpression="DtRif" />
   </Columns>
 </asp:GridView>
 <asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByParent" TypeName="AppData.DS_AppTableAdapters.ErrorsLogTableAdapter">
@@ -16,4 +15,4 @@
     <asp:ControlParameter ControlID="hfPuid" DefaultValue="#" Name="ParentUid" PropertyName="Value" Type="String" />
   </SelectParameters>
 </asp:ObjectDataSource>
-<asp:HiddenField ID="hfPuid" runat="server" />
+<asp:HiddenField ID="hfPuid" runat="server" />