diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config index f4ff84dd..95f256be 100644 --- a/GMW/GMW_Term/Web.config +++ b/GMW/GMW_Term/Web.config @@ -58,7 +58,7 @@ - + @@ -132,14 +132,14 @@ - + - - - + + + - + diff --git a/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs index c9d79aba..a604f9bb 100644 --- a/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs @@ -361,6 +361,9 @@ namespace GMW_Term.WebUserControls esitoLoginTerm esito = TermClass.Ter.doUserLogin(dataIn); if (esito == esitoLoginTerm.ok) { + // svuoto dati lista attiva e smartlist... + memLayer.ML.emptySessionVal("CodListaAttiva"); + memLayer.ML.emptySessionVal("activeTask"); // salvo i dati di CodCS memLayer.ML.setSessionVal("CodCS", memLayer.ML.confReadString("CodCS"), true); // in caso operatore abbia liste attive le carico... diff --git a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx index 27b58773..c50ff099 100644 --- a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx +++ b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx @@ -1,45 +1,55 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_smartList.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_smartList" %>
-
-
- -
-
- - - -
-
-
-
- -
-
- -
-
-
-
- -
-
-
-
- - - - -
-
- - - - -
-
+ + + + + + + + + + + + + +
+
+ +
+
+ + + +
+
+
+ +
+
+ +
+
+
+ +
+
+
+ + + + +
+
+ + + + +
+
diff --git a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs index aad35187..d456176e 100644 --- a/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_smartList.ascx.cs @@ -145,8 +145,7 @@ namespace GMW_Term.WebUserControls GMW_data.TermClass.Ter.resetScanBarcode(true, false, false); //// aggiorno visualizzazione //updatePackListStatus(); - - lblErrore.Visible = false; + //lblErrore.Visible = false; } /// /// reset UDC x le liste di prelievo diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index d8aa9baa..9c2c6c4d 100644 Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ diff --git a/GMW/GMW_Term/bin/GMW_data.dll b/GMW/GMW_Term/bin/GMW_data.dll index d35cf4a5..3d898841 100644 Binary files a/GMW/GMW_Term/bin/GMW_data.dll and b/GMW/GMW_Term/bin/GMW_data.dll differ diff --git a/GMW/GMW_Term/mazzAppSettings.config b/GMW/GMW_Term/mazzAppSettings.config index 94d21663..cafe26ff 100644 --- a/GMW/GMW_Term/mazzAppSettings.config +++ b/GMW/GMW_Term/mazzAppSettings.config @@ -1,13 +1,13 @@  - + - + - + @@ -27,7 +27,7 @@ - + @@ -48,42 +48,42 @@ - - + + - + - - - - - - + + + + + + - - - + + + - + - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/GMW/GMW_Term/mazzAppSettingsSP.config b/GMW/GMW_Term/mazzAppSettingsSP.config index 9bf97671..8aebbc9d 100644 --- a/GMW/GMW_Term/mazzAppSettingsSP.config +++ b/GMW/GMW_Term/mazzAppSettingsSP.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW_Term/mazzAppSettingsSP_test.config b/GMW/GMW_Term/mazzAppSettingsSP_test.config index 94d21663..d39ddfa5 100644 --- a/GMW/GMW_Term/mazzAppSettingsSP_test.config +++ b/GMW/GMW_Term/mazzAppSettingsSP_test.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW_Term/mazzAppSettingsTK.config b/GMW/GMW_Term/mazzAppSettingsTK.config index 7776b240..3f6b5928 100644 --- a/GMW/GMW_Term/mazzAppSettingsTK.config +++ b/GMW/GMW_Term/mazzAppSettingsTK.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW_Term/mazzAppSettingsTK_test.config b/GMW/GMW_Term/mazzAppSettingsTK_test.config index c679ad8f..cafe26ff 100644 --- a/GMW/GMW_Term/mazzAppSettingsTK_test.config +++ b/GMW/GMW_Term/mazzAppSettingsTK_test.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW_Term/mazzConnectionStrings.config b/GMW/GMW_Term/mazzConnectionStrings.config index 3ced6e0c..090a45c1 100644 --- a/GMW/GMW_Term/mazzConnectionStrings.config +++ b/GMW/GMW_Term/mazzConnectionStrings.config @@ -1,3 +1,3 @@  - + \ No newline at end of file diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index 775ff934..8ec76f87 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ diff --git a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache index f502ecc2..f760dbdd 100644 Binary files a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term_test_installer/GMW_Term_test_installer.vdproj b/GMW/GMW_Term_test_installer/GMW_Term_test_installer.vdproj index 04912b4a..24e9bd95 100644 --- a/GMW/GMW_Term_test_installer/GMW_Term_test_installer.vdproj +++ b/GMW/GMW_Term_test_installer/GMW_Term_test_installer.vdproj @@ -55,6 +55,14 @@ "PrivateKeyFile" = "8:" "TimeStampServer" = "8:" "InstallerBootstrapper" = "3:2" + "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}" + { + "Enabled" = "11:TRUE" + "PromptEnabled" = "11:TRUE" + "PrerequisitesLocation" = "2:1" + "Url" = "8:" + "ComponentsUrl" = "8:" + } } "Release" { @@ -280,14 +288,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMWT_test" - "ProductCode" = "8:{005CEED7-3A02-4814-BCB3-5ACCACFB667F}" - "PackageCode" = "8:{D9A8D051-9303-419E-ACC4-368D98A61086}" + "ProductCode" = "8:{1A29E42C-12F1-4BD1-AE46-A56DE35D3247}" + "PackageCode" = "8:{3EFC4110-DEF0-424A-8210-56ED4B12B6C3}" "UpgradeCode" = "8:{9A41FB02-98D0-48FB-9924-75BB2A5649A0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.433" + "ProductVersion" = "8:1.1.435" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" diff --git a/GMW/GMW_Term_test_installer/Release/GMW_Term_test_installer.msi b/GMW/GMW_Term_test_installer/Release/GMW_Term_test_installer.msi index aa945877..5233bafe 100644 Binary files a/GMW/GMW_Term_test_installer/Release/GMW_Term_test_installer.msi and b/GMW/GMW_Term_test_installer/Release/GMW_Term_test_installer.msi differ diff --git a/GMW/GMW_data/DS_cartellini.Designer.cs b/GMW/GMW_data/DS_cartellini.Designer.cs index abfd6738..1682c20d 100644 --- a/GMW/GMW_data/DS_cartellini.Designer.cs +++ b/GMW/GMW_data/DS_cartellini.Designer.cs @@ -2206,7 +2206,7 @@ namespace GMW_data { this.columnNote.ReadOnly = true; this.columnNote.MaxLength = 500; this.columnNoteTratt.ReadOnly = true; - this.columnNoteTratt.MaxLength = 1; + this.columnNoteTratt.MaxLength = 500; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4919,11 +4919,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string CodCS { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.CodCSColumn])); + if (this.IsCodCSNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'CodCS\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBNull.", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.CodCSColumn])); } } set { @@ -4934,12 +4934,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string codcliente { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.codclienteColumn])); + if (this.IscodclienteNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'codcliente\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBNul" + - "l.", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.codclienteColumn])); } } set { @@ -4950,12 +4949,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string ragsociale { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.ragsocialeColumn])); + if (this.IsragsocialeNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'ragsociale\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBNul" + - "l.", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.ragsocialeColumn])); } } set { @@ -4966,12 +4964,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string particolare { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.particolareColumn])); + if (this.IsparticolareNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'particolare\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBNu" + - "ll.", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.particolareColumn])); } } set { @@ -4982,12 +4979,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string descparticolare { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.descparticolareColumn])); + if (this.IsdescparticolareNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'descparticolare\' in table \'stp_prtCartLiquidi_F18ByUDC\' is " + - "DBNull.", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.descparticolareColumn])); } } set { @@ -4998,12 +4994,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string disegnogrezzo { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.disegnogrezzoColumn])); + if (this.IsdisegnogrezzoNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'disegnogrezzo\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DB" + - "Null.", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.disegnogrezzoColumn])); } } set { @@ -5014,12 +5009,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string esponente { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.esponenteColumn])); + if (this.IsesponenteNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'esponente\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBNull" + - ".", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.esponenteColumn])); } } set { @@ -5030,12 +5024,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string codimpianto { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.codimpiantoColumn])); + if (this.IscodimpiantoNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'codimpianto\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBNu" + - "ll.", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.codimpiantoColumn])); } } set { @@ -5046,12 +5039,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string descimpianto { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.descimpiantoColumn])); + if (this.IsdescimpiantoNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'descimpianto\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBN" + - "ull.", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.descimpiantoColumn])); } } set { @@ -5062,12 +5054,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string codstampo { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.codstampoColumn])); + if (this.IscodstampoNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'codstampo\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBNull" + - ".", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.codstampoColumn])); } } set { @@ -5078,11 +5069,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string figura { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.figuraColumn])); + if (this.IsfiguraNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'figura\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBNull.", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.figuraColumn])); } } set { @@ -5124,12 +5115,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string codimballo { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.codimballoColumn])); + if (this.IscodimballoNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'codimballo\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBNul" + - "l.", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.codimballoColumn])); } } set { @@ -5140,12 +5130,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string codsoggetto { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.codsoggettoColumn])); + if (this.IscodsoggettoNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'codsoggetto\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBNu" + - "ll.", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.codsoggettoColumn])); } } set { @@ -5201,12 +5190,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string codstato { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.codstatoColumn])); + if (this.IscodstatoNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'codstato\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBNull." + - "", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.codstatoColumn])); } } set { @@ -5294,11 +5282,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string cognome { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.cognomeColumn])); + if (this.IscognomeNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'cognome\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBNull.", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.cognomeColumn])); } } set { @@ -5309,11 +5297,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string nome { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.nomeColumn])); + if (this.IsnomeNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'nome\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBNull.", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.nomeColumn])); } } set { @@ -5324,12 +5312,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string descstato { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.descstatoColumn])); + if (this.IsdescstatoNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'descstato\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBNull" + - ".", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.descstatoColumn])); } } set { @@ -5340,12 +5327,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string descimballo { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.descimballoColumn])); + if (this.IsdescimballoNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'descimballo\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBNu" + - "ll.", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.descimballoColumn])); } } set { @@ -5356,12 +5342,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string CodFamiglia { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.CodFamigliaColumn])); + if (this.IsCodFamigliaNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'CodFamiglia\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBNu" + - "ll.", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.CodFamigliaColumn])); } } set { @@ -5372,12 +5357,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string DescFamiglia { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.DescFamigliaColumn])); + if (this.IsDescFamigliaNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'DescFamiglia\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBN" + - "ull.", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.DescFamigliaColumn])); } } set { @@ -5388,11 +5372,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string Note { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.NoteColumn])); + if (this.IsNoteNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Note\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBNull.", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.NoteColumn])); } } set { @@ -5403,12 +5387,11 @@ namespace GMW_data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] public string NoteTratt { get { - try { - return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.NoteTrattColumn])); + if (this.IsNoteTrattNull()) { + return string.Empty; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'NoteTratt\' in table \'stp_prtCartLiquidi_F18ByUDC\' is DBNull" + - ".", e); + else { + return ((string)(this[this.tablestp_prtCartLiquidi_F18ByUDC.NoteTrattColumn])); } } set { diff --git a/GMW/GMW_data/DS_cartellini.xsd b/GMW/GMW_data/DS_cartellini.xsd index 5bdfb1fb..e698ebc9 100644 --- a/GMW/GMW_data/DS_cartellini.xsd +++ b/GMW/GMW_data/DS_cartellini.xsd @@ -258,14 +258,476 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -422,115 +884,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -540,7 +894,7 @@ - + @@ -708,360 +1062,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj index 7f9e226a..1bee9cb5 100644 --- a/GMW/GMW_data/GMW_data.csproj +++ b/GMW/GMW_data/GMW_data.csproj @@ -271,6 +271,7 @@ + @@ -289,6 +290,7 @@ + diff --git a/GMW/GMW_data/SqlScripts/V1.2/GMW_00435.sql b/GMW/GMW_data/SqlScripts/V1.2/GMW_00435.sql new file mode 100644 index 00000000..550a1e9f --- /dev/null +++ b/GMW/GMW_data/SqlScripts/V1.2/GMW_00435.sql @@ -0,0 +1,134 @@ +set xact_abort on; +go + +begin transaction; +go + +set ANSI_NULLS on; +go + +/*************************************** +* STORED stp_prtCartLiquidi_F18ByUDC +* +* ottiene il record del Cartellino Liquidi dato l'UDC richiesto x la stampa +* +* Steamware, S.E.L. +* mod: 2011.12.19 +* +****************************************/ +alter PROCEDURE stp_prtCartLiquidi_F18ByUDC +( + @UDC NVARCHAR(50) +) +AS + + -- estraggo gli UDC parent di quello passato ( x max 10 ) per poi stamparlo nel campo + -- NoteTratt che era utilizzato per stampare i trattamenti nel artellino F10 + DECLARE @tmp NVARCHAR(500) + DECLARE @NoteTratt NVARCHAR(500) -- usato per memorizzare gli UDC F10 parent associati + SET @tmp = '' + SELECT TOP 10 @tmp = @tmp + RTRIM(UDC_PARENT) + ' - ' from RelazUDC WHERE UDC_child = @UDC + + SET @NoteTratt = (SELECT SUBSTRING(@tmp, 0, LEN(@tmp))) + + -- ora seleziono i dati veri e propri + SELECT ISNULL(ElencoCartellini.UDC, N'') AS UDC + ,ISNULL(ElencoCartellini.CodCS, N'') AS CodCS + ,ISNULL(ElencoCartellini.CodCliente, N'') AS codcliente + ,ISNULL(ElencoCartellini.RagSociale, N'') AS ragsociale + ,ISNULL(ElencoCartellini.Particolare, N'') AS particolare + ,ISNULL(ElencoCartellini.DescParticolare, N'') AS descparticolare + ,ISNULL(ElencoCartellini.DisegnoGrezzo, N'') AS disegnogrezzo + ,ISNULL(ElencoCartellini.Esponente, N'') AS esponente + ,ISNULL(ElencoCartellini.CodImpianto, N'') AS codimpianto + ,ISNULL(ElencoCartellini.DescImpianto, N'') AS descimpianto + ,ISNULL(ElencoCartellini.CodStampo, N'') AS codstampo + ,ISNULL(ElencoCartellini.Figura, N'') AS figura + ,ISNULL(ElencoCartellini.DataFus, N'') AS datafus + ,ISNULL(ElencoCartellini.TurnoFus, N'') AS turnofus + ,ISNULL(ElencoCartellini.CodImballo, N'') AS codimballo + ,ISNULL(ElencoCartellini.CodSoggetto, N'') AS codsoggetto + ,ISNULL(ElencoCartellini.NumCont, N'') AS numcont + ,ISNULL(ElencoCartellini.Tara, N'') AS tara + ,ISNULL(ElencoCartellini.Qta, N'') AS qta + ,ISNULL(ElencoCartellini.CodStato, N'') AS codstato + ,ISNULL(ElencoCartellini.IdxPosizione, N'') AS idxposizione + ,ISNULL(ElencoCartellini.PesoTot, N'') AS pesotot + ,ISNULL(ElencoCartellini.PesoCad, N'') AS pesocad + ,ElencoCartellini.CreateDate + ,ElencoCartellini.ModDate + ,ISNULL(RilPro.AnagOperatori.Cognome, N'') AS cognome + ,ISNULL(RilPro.AnagOperatori.Nome, N'') AS nome + ,ISNULL(AnagStatiProdotto.DescStato, N'') AS descstato + ,ISNULL(RilPro.AnagImballi.DescImballo, N'') AS descimballo + ,ISNULL(RilPro.AnagParticolari.CodFamiglia, N'') AS CodFamiglia + ,ISNULL(RilPro.AnagFamiglie.DescFamiglia, N'') AS DescFamiglia + ,ISNULL(ElencoCartellini.Note, N'') AS Note + ,ISNULL(@NoteTratt, N'') AS NoteTratt + FROM RilPro.AnagParticolari + LEFT OUTER JOIN + RilPro.AnagFamiglie + ON + RilPro.AnagParticolari.CodFamiglia = RilPro.AnagFamiglie.CodFamiglia + RIGHT OUTER JOIN + ElencoCartellini + ON + RilPro.AnagParticolari.Particolare = ElencoCartellini.Particolare + LEFT OUTER JOIN + AnagStatiProdotto + ON + ElencoCartellini.CodStato = AnagStatiProdotto.CodStato + LEFT OUTER JOIN + RilPro.AnagOperatori + ON + ElencoCartellini.CodSoggetto = RilPro.AnagOperatori.CodSoggetto + LEFT OUTER JOIN + RilPro.AnagImballi + ON + ElencoCartellini.CodImballo = RilPro.AnagImballi.CodImballo + WHERE + (ElencoCartellini.UDC = @UDC) + + +RETURN +go + +commit; +go + + +set xact_abort on +go + +begin transaction +go + +INSERT INTO dbo.Permessi + VALUES ('POST_anime_mult', 'animeMult.aspx', 4, 6, 'PostAnimeMult', 'PostAnimeMultExpl') +go + +commit transaction +go + + +set xact_abort on +go + +begin transaction +go + +INSERT INTO dbo.Permessi2Funzione + VALUES ('POST_anime_mult', N'GMW_animeMulti', 'S') +go + +commit transaction +go + + + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(435, GETDATE()) +GO diff --git a/GMW/GMW_data/SqlScripts/Vocabolario/vocab_435.sql b/GMW/GMW_data/SqlScripts/Vocabolario/vocab_435.sql new file mode 100644 index 00000000..a0dc6ac4 --- /dev/null +++ b/GMW/GMW_data/SqlScripts/Vocabolario/vocab_435.sql @@ -0,0 +1,9 @@ + + + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(435, GETDATE()) +GO diff --git a/GMW/GMW_data/TermClass.cs b/GMW/GMW_data/TermClass.cs index 669c78ba..33e4e054 100644 --- a/GMW/GMW_data/TermClass.cs +++ b/GMW/GMW_data/TermClass.cs @@ -207,9 +207,9 @@ namespace GMW_data answ = esitoLoginTerm.errore_noCodSogg; } } - catch + catch (Exception e) { - logger.lg.scriviLog(string.Format("Errore login per il CodSoggetto {0}", CodSoggetto), tipoLog.FATAL); + logger.lg.scriviLog(string.Format("Errore login per il CodSoggetto {0}: eccezione {1}", CodSoggetto, e), tipoLog.FATAL); } return answ; } diff --git a/GMW/GMW_data/app.config b/GMW/GMW_data/app.config index fc1e47b7..aa16a075 100644 --- a/GMW/GMW_data/app.config +++ b/GMW/GMW_data/app.config @@ -4,7 +4,7 @@