diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj index b9b39d07..16cae400 100644 --- a/GMW/GMW/GMW.csproj +++ b/GMW/GMW/GMW.csproj @@ -133,6 +133,20 @@ jumper.aspx + + LabConsumaUdc.aspx + ASPXCodeBehind + + + LabConsumaUdc.aspx + + + LabStampaUdc.aspx + ASPXCodeBehind + + + LabStampaUdc.aspx + login.aspx ASPXCodeBehind @@ -400,6 +414,20 @@ mod_filtro.ascx + + mod_labAssStampaUdc.ascx + ASPXCodeBehind + + + mod_labAssStampaUdc.ascx + + + mod_labConsUdc.ascx + ASPXCodeBehind + + + mod_labConsUdc.ascx + mod_lemmiVocab.ascx ASPXCodeBehind @@ -902,12 +930,16 @@ + + + + diff --git a/GMW/GMW/LabConsumaUdc.aspx b/GMW/GMW/LabConsumaUdc.aspx new file mode 100644 index 00000000..15a100dd --- /dev/null +++ b/GMW/GMW/LabConsumaUdc.aspx @@ -0,0 +1,5 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxTitle.master" AutoEventWireup="true" CodeBehind="LabConsumaUdc.aspx.cs" Inherits="GMW.LabConsumaUdc" %> +<%@ Register src="WebUserControls/mod_labConsUdc.ascx" tagname="mod_labConsUdc" tagprefix="uc1" %> + + + diff --git a/GMW/GMW/LabConsumaUdc.aspx.cs b/GMW/GMW/LabConsumaUdc.aspx.cs new file mode 100644 index 00000000..5d974d41 --- /dev/null +++ b/GMW/GMW/LabConsumaUdc.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GMW +{ + public partial class LabConsumaUdc : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} diff --git a/GMW/GMW/LabConsumaUdc.aspx.designer.cs b/GMW/GMW/LabConsumaUdc.aspx.designer.cs new file mode 100644 index 00000000..f36f2d11 --- /dev/null +++ b/GMW/GMW/LabConsumaUdc.aspx.designer.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GMW { + + + public partial class LabConsumaUdc { + + /// + /// mod_labConsUdc1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_labConsUdc mod_labConsUdc1; + } +} diff --git a/GMW/GMW/LabStampaUdc.aspx b/GMW/GMW/LabStampaUdc.aspx new file mode 100644 index 00000000..0a6a6e15 --- /dev/null +++ b/GMW/GMW/LabStampaUdc.aspx @@ -0,0 +1,5 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSearch.master" AutoEventWireup="true" CodeBehind="LabStampaUdc.aspx.cs" Inherits="GMW.LabStampaUdc" %> +<%@ Register src="WebUserControls/mod_labAssStampaUdc.ascx" tagname="mod_labAssStampaUdc" tagprefix="uc1" %> + + + diff --git a/GMW/GMW/LabStampaUdc.aspx.cs b/GMW/GMW/LabStampaUdc.aspx.cs new file mode 100644 index 00000000..76080fa1 --- /dev/null +++ b/GMW/GMW/LabStampaUdc.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GMW +{ + public partial class LabStampaUdc : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} diff --git a/GMW/GMW/LabStampaUdc.aspx.designer.cs b/GMW/GMW/LabStampaUdc.aspx.designer.cs new file mode 100644 index 00000000..2a65ff8e --- /dev/null +++ b/GMW/GMW/LabStampaUdc.aspx.designer.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GMW { + + + public partial class LabStampaUdc { + + /// + /// mod_labAssStampaUdc1 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::GMW.WebUserControls.mod_labAssStampaUdc mod_labAssStampaUdc1; + } +} diff --git a/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx b/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx new file mode 100644 index 00000000..f3ed51b7 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx @@ -0,0 +1,5 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_labAssStampaUdc.ascx.cs" Inherits="GMW.WebUserControls.mod_labAssStampaUdc" %> + +
+ \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx.cs b/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx.cs new file mode 100644 index 00000000..c18b3547 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using SteamWare; +using GMW_data; + +namespace GMW.WebUserControls +{ + public partial class mod_labAssStampaUdc : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + + protected void btnAssStampa_Click(object sender, EventArgs e) + { + associaStampaUdc(Convert.ToInt32(txtNumRapp.Text.Trim())); + } + + /// + /// effettua creazioen Udc, associazioen e stampa dato il num del rapporto del lab + /// + /// + private void associaStampaUdc(int numRappUdc) + { + bool fatto= MagClass.magazzino.creaUdcDaRappQualita(numRappUdc, true); + if (!fatto) + { + MagClass.magazzino.stampaUdcDaRappQualita(numRappUdc); + } + } + } +} \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx.designer.cs new file mode 100644 index 00000000..60650252 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_labAssStampaUdc.ascx.designer.cs @@ -0,0 +1,34 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.4927 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GMW.WebUserControls { + + + public partial class mod_labAssStampaUdc { + + /// + /// txtNumRapp control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtNumRapp; + + /// + /// btnAssStampa control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnAssStampa; + } +} diff --git a/GMW/GMW/WebUserControls/mod_labConsUdc.ascx b/GMW/GMW/WebUserControls/mod_labConsUdc.ascx new file mode 100644 index 00000000..6fb60cf5 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_labConsUdc.ascx @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_labConsUdc.ascx.cs" Inherits="GMW.WebUserControls.mod_labConsUdc" %> diff --git a/GMW/GMW/WebUserControls/mod_labConsUdc.ascx.cs b/GMW/GMW/WebUserControls/mod_labConsUdc.ascx.cs new file mode 100644 index 00000000..f136c2c9 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_labConsUdc.ascx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace GMW.WebUserControls +{ + public partial class mod_labConsUdc : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_labConsUdc.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_labConsUdc.ascx.designer.cs new file mode 100644 index 00000000..cc14ee22 --- /dev/null +++ b/GMW/GMW/WebUserControls/mod_labConsUdc.ascx.designer.cs @@ -0,0 +1,18 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.42 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace GMW.WebUserControls +{ + + + public partial class mod_labConsUdc + { + } +} diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index c6007ecc..b9fae75d 100644 Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ diff --git a/GMW/GMW/bin/GMW_data.dll b/GMW/GMW/bin/GMW_data.dll index ce8ac84a..02f96700 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index c6007ecc..b9fae75d 100644 Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ diff --git a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache index 7d2f0e53..0ac50e08 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_data/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs index 75c4c697..14c07113 100644 --- a/GMW/GMW_data/DS_magazzino.Designer.cs +++ b/GMW/GMW_data/DS_magazzino.Designer.cs @@ -12443,11 +12443,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string UDC { get { - try { - return ((string)(this[this.tableRapQual.UDCColumn])); + if (this.IsUDCNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'UDC\' in table \'RapQual\' is DBNull.", e); + else { + return ((string)(this[this.tableRapQual.UDCColumn])); } } set { diff --git a/GMW/GMW_data/DS_magazzino.xsd b/GMW/GMW_data/DS_magazzino.xsd index 1500a8b7..e7027d44 100644 --- a/GMW/GMW_data/DS_magazzino.xsd +++ b/GMW/GMW_data/DS_magazzino.xsd @@ -2312,273 +2312,127 @@ SELECT nRapQual, DataRapQual, ProgUDC, CodFor, DestTerz, CodLega, DataPrelFus, T - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2593,18 +2447,17 @@ SELECT nRapQual, DataRapQual, ProgUDC, CodFor, DestTerz, CodLega, DataPrelFus, T - - - - - - - - + + + + + + + - + @@ -2614,14 +2467,273 @@ SELECT nRapQual, DataRapQual, ProgUDC, CodFor, DestTerz, CodLega, DataPrelFus, T - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2635,102 +2747,320 @@ SELECT nRapQual, DataRapQual, ProgUDC, CodFor, DestTerz, CodLega, DataPrelFus, T - + + + + + + + + + + - + - - - - - - - - + - - - - - - - - - - - + - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + + + + + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2747,351 +3077,21 @@ SELECT nRapQual, DataRapQual, ProgUDC, CodFor, DestTerz, CodLega, DataPrelFus, T - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -3104,8 +3104,8 @@ SELECT nRapQual, DataRapQual, ProgUDC, CodFor, DestTerz, CodLega, DataPrelFus, T - - + + @@ -3118,123 +3118,123 @@ SELECT nRapQual, DataRapQual, ProgUDC, CodFor, DestTerz, CodLega, DataPrelFus, T - - + + - - - + + + - + - - + + - - + + - + - - - + + + - + - - - + + + - + - + - + - - + + - - + + - + - + - + diff --git a/GMW/GMW_data/DS_magazzino.xss b/GMW/GMW_data/DS_magazzino.xss index 3c19e095..1bdafeaa 100644 --- a/GMW/GMW_data/DS_magazzino.xss +++ b/GMW/GMW_data/DS_magazzino.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs index 4e12af13..89dd0c3d 100644 --- a/GMW/GMW_data/MagClass.cs +++ b/GMW/GMW_data/MagClass.cs @@ -1046,9 +1046,8 @@ namespace GMW_data /// /// identificativo rapp qualità /// true/false se stampare - /// codice operatore /// - public bool creaUdcDaRappQualita(int numRapQual, bool doPrint, string CodOperatore) + public bool creaUdcDaRappQualita(int numRapQual, bool doPrint) { bool answ = false; // ottengo elenco righe dei cartellini del rapp qualità indicato SENZA righe UDC @@ -1059,21 +1058,25 @@ namespace GMW_data string UDC = ""; foreach (DS_magazzino.RapQualRow rqRow in tabRapQual) { - answ = true; - - // per ogni riga creo un UDC - DS_Applicazione.ElencoCartelliniDataTable tabCartellini = DataProxy.obj.taCartellini.stp_insNewFull(memLayer.ML.confReadString("CodCS"), memLayer.ML.confReadString("BilanciaMP"), string.Format("{0:yy}", DateTime.Now), rqRow.CodFor, rqRow.CodLega, "", "", "", "", DateTime.Now, 0, memLayer.ML.confReadString("CodImballoMP"), CodOperatore, 0, memLayer.ML.confReadInt("IdxPosizMP"), "M", "UDC_MP", rqRow.Qta, Convert.ToDouble(rqRow.Qta), 1, memLayer.ML.confReadString("CodStatoMP"), ""); // UDC_MP HARD CODED!!! - //DS_Applicazione.ElencoCartelliniDataTable tabCartellini = DataProxy.obj.taCartellini.stp_insNew(memLayer.ML.confReadString("CodCS"), memLayer.ML.confReadString("BilanciaMP"), string.Format("{0:yy}", DateTime.Now), 0, memLayer.ML.confReadString("CodImballoMP"), "M", CodOperatore, "UDC_MP"); // UDC_MP HARD CODED!!! - - try + // se non ha già un UDC... + if (rqRow.UDC != "") { - UDC = tabCartellini[0].UDC; - // lo associo! - taRapQual.stp_associaUDC(rqRow.ProgUDC, UDC); - } - catch (Exception e) - { - logger.lg.scriviLog(string.Format("Non sono riuscito a creare associazioen UDC / rapp qual: UDC creato: {0}, progRappQual: {1}, eccezione: {2}", UDC, rqRow.ProgUDC, e), tipoLog.EXCEPTION); + answ = true; + + // per ogni riga creo un UDC + DS_Applicazione.ElencoCartelliniDataTable tabCartellini = DataProxy.obj.taCartellini.stp_insNewFull(memLayer.ML.confReadString("CodCS"), memLayer.ML.confReadString("BilanciaMP"), string.Format("{0:yy}", DateTime.Now), rqRow.CodFor, rqRow.CodLega, "", "", "", "", DateTime.Now, 0, memLayer.ML.confReadString("CodImballoMP"), CodSoggCurrUser, 0, memLayer.ML.confReadInt("IdxPosizMP"), "M", "UDC_MP", rqRow.Qta, Convert.ToDouble(rqRow.Qta), 1, memLayer.ML.confReadString("CodStatoMP"), ""); // UDC_MP HARD CODED!!! + //DS_Applicazione.ElencoCartelliniDataTable tabCartellini = DataProxy.obj.taCartellini.stp_insNew(memLayer.ML.confReadString("CodCS"), memLayer.ML.confReadString("BilanciaMP"), string.Format("{0:yy}", DateTime.Now), 0, memLayer.ML.confReadString("CodImballoMP"), "M", CodOperatore, "UDC_MP"); // UDC_MP HARD CODED!!! + + try + { + UDC = tabCartellini[0].UDC; + // lo associo! + taRapQual.stp_associaUDC(rqRow.ProgUDC, UDC); + } + catch (Exception e) + { + logger.lg.scriviLog(string.Format("Non sono riuscito a creare associazioen UDC / rapp qual: UDC creato: {0}, progRappQual: {1}, eccezione: {2}", UDC, rqRow.ProgUDC, e), tipoLog.EXCEPTION); + } } } diff --git a/GMW/GMW_data/SqlScripts/GMW_00257.sql b/GMW/GMW_data/SqlScripts/GMW_00257.sql index d9d2ddf4..93e1fb1d 100644 --- a/GMW/GMW_data/SqlScripts/GMW_00257.sql +++ b/GMW/GMW_data/SqlScripts/GMW_00257.sql @@ -3,6 +3,11 @@ create schema RawData authorization db_accessadmin go +-- creo schema x gestione richieste batch +create schema BatchQueue authorization db_accessadmin +go + + -- lascio in schema As400 i dati attuali, creo tab nuove RAW create table RawData.XOGIX00F( XRPQLN numeric(6,0) not null constraint DF_XOGIX00F_XRPQLN default (0), diff --git a/GMW/GMW_data/SqlScripts/GMW_00258.sql b/GMW/GMW_data/SqlScripts/GMW_00258.sql index 29c134b6..3aeb7f45 100644 --- a/GMW/GMW_data/SqlScripts/GMW_00258.sql +++ b/GMW/GMW_data/SqlScripts/GMW_00258.sql @@ -1,6 +1,3 @@ --- creo schema x gestione richieste batch -create schema BatchQueue authorization db_accessadmin -go diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 830998a0..02f96700 100644 Binary files a/GMW/GMW_data/bin/Debug/GMW_data.dll and b/GMW/GMW_data/bin/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll index 830998a0..02f96700 100644 Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll b/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll index 227ed0ba..a7ae4930 100644 Binary files a/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll and b/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll index 36f5a6e7..7f7e569c 100644 Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll differ