diff --git a/AppData/ComLib.cs b/AppData/ComLib.cs index c20aa5d..f20515b 100644 --- a/AppData/ComLib.cs +++ b/AppData/ComLib.cs @@ -121,7 +121,7 @@ namespace AppData /// /// Elenco degli Stack da lavorare /// - public List StackList { get; set; } + public List StackList { get; set; } /// /// Numero di Stack da lavorare /// @@ -398,7 +398,7 @@ namespace AppData if (offOrder.Stacks.Count == 1) { // se ho 1 solo sheet - var sheets = offOrder.Stacks[0].Sheets; + var sheets = offOrder.Stacks[0].SheetList; if (sheets.Count == 1) { // controllo se ho CNC prog @@ -562,18 +562,18 @@ namespace AppData /// /// Cache redis del PRIMO bunk da lavorare /// - private static WBunk redisFirstBunk + private static ProdBunk redisFirstBunk { get { - WBunk answ = null; + ProdBunk answ = null; string rawData = memLayer.ML.getRSV(redFirstBunkKey); if (rawData != "") { // provo a deserializzare try { - answ = JsonConvert.DeserializeObject(rawData); + answ = JsonConvert.DeserializeObject(rawData); } catch { } @@ -604,16 +604,16 @@ namespace AppData /// /// /// - private static WBunk getRedisNextBunk(int currBunkId) + private static ProdBunk getRedisNextBunk(int currBunkId) { - WBunk answ = null; + ProdBunk answ = null; string rawData = memLayer.ML.getRSV(redNextBunkKey(currBunkId)); if (rawData != "") { // provo a deserializzare try { - answ = JsonConvert.DeserializeObject(rawData); + answ = JsonConvert.DeserializeObject(rawData); } catch { } @@ -625,7 +625,7 @@ namespace AppData /// /// /// - private static void setRedisNextBunk(int currBunkId, WBunk value) + private static void setRedisNextBunk(int currBunkId, ProdBunk value) { if (value != null) { @@ -647,10 +647,10 @@ namespace AppData /// - Ordinato per StackIndex (crescente) x avere il più VECCHIO /// /// - public static WBunk prodGetFirstBunk() + public static ProdBunk prodGetFirstBunk() { // cerco prima su REDIS... - WBunk answ = redisFirstBunk; + ProdBunk answ = redisFirstBunk; if (answ == null) { // vado sul DB e leggo ... @@ -675,9 +675,9 @@ namespace AppData /// - SUCCESSIVO al BunkID(=StackID) ricevuto /// /// - public static WBunk prodGetNextBunk(int BunkID) + public static ProdBunk prodGetNextBunk(int BunkID) { - WBunk answ = getRedisNextBunk(BunkID); + ProdBunk answ = getRedisNextBunk(BunkID); if (answ == null) { // vado sul DB e leggo ... @@ -717,9 +717,9 @@ namespace AppData /// /// /// - private static WBunk getBunkFromDb(DS_App.StackListRow currBunk) + private static ProdBunk getBunkFromDb(DS_App.StackListRow currBunk) { - WBunk answ; + ProdBunk answ; // calcolo attributi oggetti CStatus currSt = CStatus.Programmed; if (currBunk.Position == 5) @@ -730,11 +730,11 @@ namespace AppData { currSt = CStatus.Done; } - List elSheet = new List(); + List elSheet = new List(); // recupero gli sheets di questo stack... DS_App.SheetListDataTable tabSheets = DataLayer.man.taSHL.getByStack(currBunk.StackID); DateTime dataStart = DateTime.Now; - Pannel currPanel; + ProdSheet currPanel; foreach (var item in tabSheets) { // converto i workData @@ -763,13 +763,13 @@ namespace AppData }; PStatus currPnlStatus = PStatus.Programmed; Enum.TryParse(item.ShStatus.ToString(), out currPnlStatus); - currPanel = new Pannel() + currPanel = new ProdSheet() { Printing = wdPrint, Machining = wdMachining, Unloading = wdUnload, Material = material, - PanelId = item.StackID, + SheetId = item.StackID, Status = currPnlStatus }; elSheet.Add(currPanel); @@ -779,12 +779,12 @@ namespace AppData } } // compongo il bunk... - answ = new WBunk() + answ = new ProdBunk() { - StackId = currBunk.StackID, + BunkId = currBunk.StackID, Status = currSt, DataMatrix = currBunk.StackDtmx, - PanelsList = elSheet, + SheetList = elSheet, DtStart = dataStart }; return answ; @@ -795,10 +795,10 @@ namespace AppData /// /// /// - public static WBunk prodGetBunk(int StackID) + public static ProdBunk prodGetBunk(int StackID) { - WBunk answ = null; - List elSheet = new List(); + ProdBunk answ = null; + List elSheet = new List(); var tabBunks = DataLayer.man.taSTL.getByKey(StackID); if (tabBunks.Count == 1) { @@ -816,7 +816,7 @@ namespace AppData // recupero gli sheets di questo stack... DS_App.SheetListDataTable tabSheets = DataLayer.man.taSHL.getByStack(StackID); DateTime dataStart = DateTime.Now; - Pannel currPanel; + ProdSheet currPanel; foreach (var item in tabSheets) { // converto i workData @@ -845,13 +845,13 @@ namespace AppData }; PStatus currPnlStatus = PStatus.Programmed; Enum.TryParse(item.ShStatus.ToString(), out currPnlStatus); - currPanel = new Pannel() + currPanel = new ProdSheet() { Printing = wdPrint, Machining = wdMachining, Unloading = wdUnload, Material = material, - PanelId = item.StackID, + SheetId = item.StackID, Status = currPnlStatus }; elSheet.Add(currPanel); @@ -861,12 +861,12 @@ namespace AppData } } // compongo il bunk... - answ = new WBunk() + answ = new ProdBunk() { - StackId = currBunk.StackID, + BunkId = currBunk.StackID, Status = currSt, DataMatrix = currBunk.StackDtmx, - PanelsList = elSheet, + SheetList = elSheet, DtStart = dataStart }; } diff --git a/AppData/DataLayer.cs b/AppData/DataLayer.cs index 3c805d5..8c64db9 100644 --- a/AppData/DataLayer.cs +++ b/AppData/DataLayer.cs @@ -1,4 +1,5 @@ -using SteamWare; +using NKC_SDK; +using SteamWare; using System.Globalization; namespace AppData diff --git a/AppData/Utils.cs b/AppData/Utils.cs index 8293102..19287d5 100644 --- a/AppData/Utils.cs +++ b/AppData/Utils.cs @@ -1,6 +1,5 @@ using SteamWare; using System; -using System.Collections.Generic; using System.Web; namespace AppData @@ -27,300 +26,6 @@ namespace AppData } } - /// - /// Classe che rappresenta la richiesta di AZIONI al NESTING - /// - public struct commandRequest - { - /// - /// ID del processo richiesto (generato in fase di import) - /// - public int BatchID { get; set; } - /// - /// Richiesta per il nesting: DoNesting / HaltNesting - /// - public string ActionRequested { get; set; } - } - /// - /// Classe che rappresenta la richiesta di processing di NESTING da inserire in REDIS - /// - public struct batchRequest - { - /// - /// ID del processo richiesto (generato in fase di import) - /// - public int BatchID { get; set; } - /// - /// Elenco ordini richeisti da processare / nestare - /// - public List Orders { get; set; } - } - /// - /// Struttura Ordine passata a NESTING - /// - public struct Order - { - /// - /// Cod ordine di NKC - /// - public string OrderCod { get; set; } - /// - /// Codice ordine esterno da cliente (HFA) - /// - public string OrderExtCode { get; set; } - /// - /// Plant di destinazione - /// - public string DestPlant { get; set; } - /// - /// Quantità di oggetti da produrre x singola riga di ordine - /// - public int OrderQty { get; set; } - /// - /// Elenco Items da produrre x ordine - /// - public List Items { get; set; } - } - /// - /// Struttura Item passata a NESTING - /// - public struct Item - { - /// - /// Cod ITEM di NKC - /// - public int ItemId { get; set; } - /// - /// Codice ITEM esterno da cliente (HFA) - /// - public string ItemExtCode { get; set; } - /// - /// Quantità di Item per SINGOLO ordine - /// - public int ItemrQty { get; set; } - /// - /// ID del materiale dell'item - /// - public int MatID { get; set; } - /// - /// Path del disegno CAD dell'item da produrre x NESTING - /// - public string CadFilePath { get; set; } - } - /// - /// Struttura stack - /// - public struct Stack - { - /// - /// Identificativo univoco stack - /// - public String StackId { get; set; } - /// - /// Num di fogli nello stack - /// - public int NumSheet { get; set; } - /// - /// Elenco Sheet previsti - /// - public List Sheets { get; set; } - } - /// - /// Struttura Sheet - /// - public struct Sheet - { - /// - /// Identificativo univoco Sheet - /// - public String SheetId { get; set; } - /// - /// Materiale - /// - public int MatID { get; set; } - /// - /// Tempo STIMATO di taglio calcolato dal Nesting espresso in Secondi - /// - public double EstimatedWorktime { get; set; } - /// - /// Programma x printing - /// - public string PrintProgram { get; set; } - /// - /// Programma x Machining - /// - public string MachiningProgram { get; set; } - /// - /// SVG del lavoro previsto - /// - public string Drawing { get; set; } - } - - /// - /// Classe che rappresenta stato ordine ricevuto via REDIS da NESTING - /// - public class baseNestAnsw - { - /// - /// Status del procesos di nesting - /// - public procStatus ProcessStatus { get; set; } - /// - /// Note libere del nesting - /// - public string ProcessNotes { get; set; } - /// - /// Tempo di processing del Nesting espresso in Secondi - /// - public double ProcessingRuntime { get; set; } - /// - /// Tempo STIMATO di taglio calcolato dal Nesting espresso in Secondi - /// - public double EstimatedWorktime { get; set; } - } - - /// - /// Classe che rappresenta stato ordine ricevuto via REDIS da NESTING - /// - public class orderStatus : baseNestAnsw - { - /// - /// ID del processo di Nesting in corso (generato in fase di import) - /// - public string BatchID { get; set; } - } - public class nestReplyBatch : baseNestAnsw - { - /// - /// Elenco Items da produrre x ordine - /// - public List Items { get; set; } - } - - public class nestReplyOffOrd : orderStatus - { - /// - /// ID dell'ordine offlien da processare - /// - public string OffOrderID { get; set; } - /// - /// Elenco Items da produrre x ordine - /// - public List Items { get; set; } - - /// - /// Elenco Stack previsti - /// - public List Stacks { get; set; } - } - - /// - /// Enum degli stati ammessi epr il Nesting - /// - public enum procStatus - { - waiting = 0, - running, - error, - completed, - aborted, - accepted, - refused - } } -/// -/// Valori decodificati -/// -public class decodedData -{ - /// - /// Tipo codice decodificato - /// - public codeType codeType { get; set; } = codeType.UNK; - /// - /// Codice decodificato - /// - public string code { get; set; } = ""; - /// - /// Codice decodificato in formato INT - /// - public int codeInt { get; set; } = 0; - /// - /// Descrizione associata - /// - public string description { get; set; } = ""; - /// - /// Dato letto RAW - /// - public string rawData { get; set; } = ""; -} -/// -/// Tipi di barcode gestiti -/// -public enum codeType -{ - UNK = 0, - Item, - ItemGeneric, - Material, - Sheet, - Stack, - Batch, - Cart, - Bin, - BinProcessed, - SecScreen -} -/// -/// tipologia di report (FILE rdlc) gestito in stampa... -/// -public enum reportRichiesto -{ - cartLabel, - paintLabelPre, - paintLabelPost, - partLabel, - stackLabel -} -/// -/// tipologia di DOCUMENTO gestito in stampa... -/// -public enum tipoDocumento -{ - /// - /// Etichetta per un BIN (pre esecuzione compito, es verniciatura) - /// - docBinPre, - /// - /// Etichetta per un BIN (POST esecuzione compito, es verniciatura) - /// - docBinPost, - /// - /// Etichetta per un CART - /// - docCart, - /// - /// Docuemtno per singolo ITEM: - /// - QR code - /// - num cart/bin - /// - T/P/* (se va fatto qualcosa di speciale) - /// - codice dmtx leggibile (es IT000023) su NUOVA riga - /// - docPart, - /// - /// doc per STACK - /// - docStack, - /// - /// NON DEFINITO - /// - docND -} -//public enum tipoSelettore -//{ -// cdc, -// cellaMagazzino, -// magazzino, -// UDC_byPart -//} + diff --git a/AppData/reportPrinter.cs b/AppData/reportPrinter.cs index 001ab76..d4827df 100644 --- a/AppData/reportPrinter.cs +++ b/AppData/reportPrinter.cs @@ -1,4 +1,5 @@ using Microsoft.Reporting.WinForms; +using NKC_SDK; using SteamWare; using System; using System.Collections.Generic; diff --git a/NKC_SDK/Enums.cs b/NKC_SDK/Enums.cs index 888fc4b..e7ddb20 100644 --- a/NKC_SDK/Enums.cs +++ b/NKC_SDK/Enums.cs @@ -136,4 +136,80 @@ Present } + /// + /// Tipi di barcode gestiti + /// + public enum codeType + { + UNK = 0, + Item, + ItemGeneric, + Material, + Sheet, + Stack, + Batch, + Cart, + Bin, + BinProcessed, + SecScreen + } + /// + /// tipologia di report (FILE rdlc) gestito in stampa... + /// + public enum reportRichiesto + { + cartLabel, + paintLabelPre, + paintLabelPost, + partLabel, + stackLabel + } + /// + /// tipologia di DOCUMENTO gestito in stampa... + /// + public enum tipoDocumento + { + /// + /// Etichetta per un BIN (pre esecuzione compito, es verniciatura) + /// + docBinPre, + /// + /// Etichetta per un BIN (POST esecuzione compito, es verniciatura) + /// + docBinPost, + /// + /// Etichetta per un CART + /// + docCart, + /// + /// Docuemtno per singolo ITEM: + /// - QR code + /// - num cart/bin + /// - T/P/* (se va fatto qualcosa di speciale) + /// - codice dmtx leggibile (es IT000023) su NUOVA riga + /// + docPart, + /// + /// doc per STACK + /// + docStack, + /// + /// NON DEFINITO + /// + docND + } + + /// + /// Enum degli stati ammessi epr il Nesting + /// + public enum procStatus + { + waiting = 0, + running, + error, + completed, + aborted, + accepted, + refused + } } diff --git a/NKC_SDK/NKC.cs b/NKC_SDK/NKC.cs index fce0251..34eeab9 100644 --- a/NKC_SDK/NKC.cs +++ b/NKC_SDK/NKC.cs @@ -120,14 +120,14 @@ namespace NKC_SDK /// - il risutlato viene deserializzato nell'oggetto richiesto /// /// - public WBunk getFirstBunk() + public ProdBunk getFirstBunk() { - WBunk answ = null; + ProdBunk answ = null; // chiamo metodo x recupero WBunk... try { string rawdata = callUrl(urlCurrBunk); - answ = JsonConvert.DeserializeObject(rawdata); + answ = JsonConvert.DeserializeObject(rawdata); } catch { } @@ -139,14 +139,14 @@ namespace NKC_SDK /// - il risutlato viene deserializzato nell'oggetto richiesto /// /// - public WBunk getNextBunk(int currBunkId) + public ProdBunk getNextBunk(int currBunkId) { - WBunk answ = null; + ProdBunk answ = null; // chiamo metodo x recupero WBunk... try { string rawdata = callUrl(urlNextBunk(currBunkId)); - answ = JsonConvert.DeserializeObject(rawdata); + answ = JsonConvert.DeserializeObject(rawdata); } catch { } @@ -158,14 +158,14 @@ namespace NKC_SDK /// - il risutlato viene deserializzato nell'oggetto richiesto /// /// - public WBunk getBunk(int currBunkId) + public ProdBunk getBunk(int currBunkId) { - WBunk answ = null; + ProdBunk answ = null; // chiamo metodo x recupero WBunk... try { string rawdata = callUrl(urlGetBunk(currBunkId)); - answ = JsonConvert.DeserializeObject(rawdata); + answ = JsonConvert.DeserializeObject(rawdata); } catch { } diff --git a/NKC_SDK/Objects.cs b/NKC_SDK/Objects.cs index 58ac24f..eaee9ab 100644 --- a/NKC_SDK/Objects.cs +++ b/NKC_SDK/Objects.cs @@ -4,6 +4,201 @@ using System.Collections.Generic; namespace NKC_SDK { + #region classi per NESTING + + + /// + /// Classe che rappresenta la richiesta di AZIONI al NESTING + /// + public class commandRequest + { + /// + /// ID del processo richiesto (generato in fase di import) + /// + public int BatchID { get; set; } + /// + /// Richiesta per il nesting: DoNesting / HaltNesting + /// + public string ActionRequested { get; set; } + } + /// + /// Classe che rappresenta la richiesta di processing di NESTING da inserire in REDIS + /// + public class batchRequest + { + /// + /// ID del processo richiesto (generato in fase di import) + /// + public int BatchID { get; set; } + /// + /// Elenco ordini richeisti da processare / nestare + /// + public List Orders { get; set; } + } + /// + /// Struttura Ordine passata a NESTING + /// + public class Order + { + /// + /// Cod ordine di NKC + /// + public string OrderCod { get; set; } + /// + /// Codice ordine esterno da cliente (HFA) + /// + public string OrderExtCode { get; set; } + /// + /// Plant di destinazione + /// + public string DestPlant { get; set; } + /// + /// Quantità di oggetti da produrre x singola riga di ordine + /// + public int OrderQty { get; set; } + /// + /// Elenco Items da produrre x ordine + /// + public List PartList { get; set; } + } + /// + /// Struttura Item passata a NESTING + /// + public class Part + { + /// + /// Cod ITEM di NKC + /// + public int PartId { get; set; } + /// + /// Codice ITEM esterno da cliente (HFA) + /// + public string PartExtCode { get; set; } + /// + /// Quantità di Item per SINGOLO ordine + /// + public int PartQty { get; set; } + /// + /// ID del materiale dell'item + /// + public int MatID { get; set; } + /// + /// Path del disegno CAD dell'item da produrre x NESTING + /// + public string CadFilePath { get; set; } + } + /// + /// Classe Sheet x Nesting + /// + public class NestSheet + { + /// + /// Identificativo univoco Sheet + /// + public String SheetId { get; set; } + /// + /// Materiale + /// + public int MatID { get; set; } + /// + /// Tempo STIMATO di taglio calcolato dal Nesting espresso in Secondi + /// + public double EstimatedWorktime { get; set; } + /// + /// Programma x printing + /// + public string PrintProgram { get; set; } + /// + /// Programma x Machining + /// + public string MachiningProgram { get; set; } + /// + /// SVG del lavoro previsto + /// + public string Drawing { get; set; } + } + /// + /// Struttura stack + /// + public class NestBunk + { + /// + /// Identificativo univoco stack + /// + public String BunkId { get; set; } + /// + /// Num di fogli nello stack + /// + public int NumSheet { get; set; } + /// + /// Elenco Sheet previsti + /// + public List SheetList { get; set; } + } + + /// + /// Classe che rappresenta stato ordine ricevuto via REDIS da NESTING + /// + public class baseNestAnsw + { + /// + /// Status del procesos di nesting + /// + public procStatus ProcessStatus { get; set; } + /// + /// Note libere del nesting + /// + public string ProcessNotes { get; set; } + /// + /// Tempo di processing del Nesting espresso in Secondi + /// + public double ProcessingRuntime { get; set; } + /// + /// Tempo STIMATO di taglio calcolato dal Nesting espresso in Secondi + /// + public double EstimatedWorktime { get; set; } + } + + /// + /// Classe che rappresenta stato ordine ricevuto via REDIS da NESTING + /// + public class orderStatus : baseNestAnsw + { + /// + /// ID del processo di Nesting in corso (generato in fase di import) + /// + public string BatchID { get; set; } + } + public class nestReplyBatch : baseNestAnsw + { + /// + /// Elenco Items da produrre x ordine + /// + public List Items { get; set; } + } + + public class nestReplyOffOrd : orderStatus + { + /// + /// ID dell'ordine offlien da processare + /// + public string OffOrderID { get; set; } + /// + /// Elenco Items da produrre x ordine + /// + public List Items { get; set; } + + /// + /// Elenco Stack previsti + /// + public List Stacks { get; set; } + } + + #endregion + + + #region classi per PROD + /// /// dati del materiale /// @@ -62,14 +257,14 @@ namespace NKC_SDK } /// - /// Singolo Pannello da lavorare + /// Singolo Pannello IN LAVORAZIONE /// - public class Pannel + public class ProdSheet { /// /// Identificativo univoco pannello /// - public int PanelId { get; set; } + public int SheetId { get; set; } /// /// Materiale /// @@ -96,12 +291,12 @@ namespace NKC_SDK /// /// Classe che rappresenta i BUNK da lavorare /// - public class WBunk + public class ProdBunk { /// /// Identificativo univoco stack /// - public int StackId { get; set; } + public int BunkId { get; set; } /// /// Stato dello Stack di pannelli /// @@ -121,18 +316,18 @@ namespace NKC_SDK /// /// Elenco dei pannelli(sheets) dello Stack /// - public List PanelsList { get; set; } + public List SheetList { get; set; } /// - /// Numero di Panels da lavorare + /// Numero di Sheets da lavorare /// - public int NumPanels + public int NumSheets { get { int answ = 0; try { - answ = PanelsList.Count; + answ = SheetList.Count; } catch { } @@ -141,4 +336,34 @@ namespace NKC_SDK } } + /// + /// Valori decodificati + /// + public class decodedData + { + /// + /// Tipo codice decodificato + /// + public codeType codeType { get; set; } = codeType.UNK; + /// + /// Codice decodificato + /// + public string code { get; set; } = ""; + /// + /// Codice decodificato in formato INT + /// + public int codeInt { get; set; } = 0; + /// + /// Descrizione associata + /// + public string description { get; set; } = ""; + /// + /// Dato letto RAW + /// + public string rawData { get; set; } = ""; + } + + + #endregion + } diff --git a/NKC_WF/Controllers/BunkController.cs b/NKC_WF/Controllers/BunkController.cs index 50177bf..e35df48 100644 --- a/NKC_WF/Controllers/BunkController.cs +++ b/NKC_WF/Controllers/BunkController.cs @@ -12,9 +12,9 @@ namespace NKC_WF.Controllers /// // GET: api/Bunk [HttpGet] - public WBunk Get() + public ProdBunk Get() { - WBunk answ = null; + ProdBunk answ = null; try { answ = ComLib.prodGetFirstBunk(); @@ -52,9 +52,9 @@ namespace NKC_WF.Controllers /// // GET: api/GetNext/5 [HttpGet] - public WBunk Get(int id, bool showNext) + public ProdBunk Get(int id, bool showNext) { - WBunk answ = null; + ProdBunk answ = null; try { if (showNext) diff --git a/NKC_WF/OrderManager.aspx.cs b/NKC_WF/OrderManager.aspx.cs index 540cbd9..36fdd53 100644 --- a/NKC_WF/OrderManager.aspx.cs +++ b/NKC_WF/OrderManager.aspx.cs @@ -1,5 +1,6 @@ using AppData; using Newtonsoft.Json; +using NKC_SDK; using SteamWare; using System; using System.Collections.Generic; @@ -49,13 +50,13 @@ namespace NKC_WF { // !!!FIXME!!! leggere da DB!!! - var articoli = new List(); - var articolo = new Item() + var articoli = new List(); + var articolo = new Part() { - ItemId = 1, - ItemExtCode = "abc.2345", + PartId = 1, + PartExtCode = "abc.2345", MatID = 2, - ItemrQty = 2, + PartQty = 2, CadFilePath = @"c:\temp\prova.dxf" }; articoli.Add(articolo); @@ -67,7 +68,7 @@ namespace NKC_WF OrderExtCode = "HFA_123456", DestPlant = "Striker", OrderQty = 1, - Items = articoli + PartList = articoli }; ordini.Add(ordine); diff --git a/NKC_WF/Utility.aspx.cs b/NKC_WF/Utility.aspx.cs index 7d51bda..d91e5d9 100644 --- a/NKC_WF/Utility.aspx.cs +++ b/NKC_WF/Utility.aspx.cs @@ -41,10 +41,10 @@ namespace NKC_WF protected void lbtMakeSim_Click(object sender, EventArgs e) { // creazione degli stack e dei pannelli... - List stackList = new List(); - List panelList; - WBunk currStack; - Pannel currPanel; + List stackList = new List(); + List panelList; + ProdBunk currStack; + ProdSheet currPanel; MaterialData currMaterial; WorkData currPrintData; WorkData currMachiningData; @@ -52,7 +52,7 @@ namespace NKC_WF for (int i = 1; i <= numStackReq; i++) { // devo creare fino a maxNumPanels - panelList = new List(); + panelList = new List(); for (int j = 1; j <= numPanels; j++) { currMaterial = new MaterialData() @@ -73,9 +73,9 @@ namespace NKC_WF { ProgramPath = @"" }; - currPanel = new Pannel() + currPanel = new ProdSheet() { - PanelId = j, + SheetId = j, Status = PStatus.Programmed, Material = currMaterial, Printing = currPrintData, @@ -85,12 +85,12 @@ namespace NKC_WF panelList.Add(currPanel); } - currStack = new WBunk() + currStack = new ProdBunk() { DataMatrix = $"DM{txtCodTakt.Text}.{i}", - StackId = i, + BunkId = i, Status = CStatus.Programmed, - PanelsList = panelList + SheetList = panelList }; stackList.Add(currStack); } diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx b/NKC_WF/WebUserControls/cmp_batchDetail.ascx index 6ec2e7d..4fda068 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx @@ -8,11 +8,11 @@

Batch Detail

- Send to Estimation - Stop Estimation - Send to Nesting - Stop Nesting - Accept Nesting + Send to Estimation + Stop Estimation + Send to Nesting + Stop Nesting + Accept Nesting
diff --git a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs index de0e46a..35d523e 100644 --- a/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_batchDetail.ascx.cs @@ -1,11 +1,6 @@ using AppData; using NKC_SDK; using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; namespace NKC_WF.WebUserControls { diff --git a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs index 3b59272..b0a7b2b 100644 --- a/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs @@ -1,4 +1,5 @@ using AppData; +using NKC_SDK; using SteamWare; using System; using System.IO; diff --git a/NKC_WF/WebUserControls/cmp_orderStatus.ascx.cs b/NKC_WF/WebUserControls/cmp_orderStatus.ascx.cs index 5d1413b..4b0335f 100644 --- a/NKC_WF/WebUserControls/cmp_orderStatus.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_orderStatus.ascx.cs @@ -1,5 +1,6 @@ using AppData; using Newtonsoft.Json; +using NKC_SDK; using SteamWare; using System; using System.Collections.Generic; diff --git a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs index c1eb123..2ac2927 100644 --- a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs @@ -1,4 +1,5 @@ using AppData; +using NKC_SDK; using System; using System.Web.UI; diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs index 90c115c..58a9273 100644 --- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx.cs @@ -1,4 +1,5 @@ using AppData; +using NKC_SDK; using System; namespace NKC_WF.WebUserControls diff --git a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs index bacc73d..c1c3a6b 100644 --- a/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs @@ -1,4 +1,5 @@ using AppData; +using NKC_SDK; using System; namespace NKC_WF.WebUserControls