diff --git a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs
index fbbb6394..c3d0d532 100644
--- a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs
@@ -450,7 +450,7 @@ namespace GMW.WebUserControls
if (!UdcExists)
{
// creo UDC
- MagClass.magazzino.creaUdc("TR", "", currParticolare, "", "", "", "", "", 0, "", "U", "", 0, 0, 0, DateTime.Now, 0, "Wip", memLayer.ML.confReadInt("IdxPosizioneTrattamenti"), false, "IdxPosizioneTrattamenti", "UDC_WIP", "LI", newUdcParent, anno);
+ MagClass.magazzino.creaUdc("TR", "", "", "", "", "", "", "", 0, "", "U", "", 0, 0, 0, DateTime.Now, 0, "Wip", memLayer.ML.confReadInt("IdxPosizioneTrattamenti"), false, "IdxPosizioneTrattamenti", "UDC_WIP", "LI", newUdcParent, anno);
}
// associo tratt termici e liquidi
MagClass.magazzino.associaUdcParent(newUdcChild, newUdcParent);
diff --git a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs
index 12fc50a6..c0a8c872 100644
--- a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs
+++ b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs
@@ -130,24 +130,6 @@ namespace GMW.WebUserControls {
///
protected global::System.Web.UI.WebControls.Button btnSvuota;
- ///
- /// lblQta control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.Label lblQta;
-
- ///
- /// txtQta control.
- ///
- ///
- /// Auto-generated field.
- /// To modify move field declaration from designer file to code-behind file.
- ///
- protected global::System.Web.UI.WebControls.TextBox txtQta;
-
///
/// lblAnnoTratt control.
///
@@ -166,6 +148,24 @@ namespace GMW.WebUserControls {
///
protected global::System.Web.UI.WebControls.TextBox txtAnno;
+ ///
+ /// lblQta control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblQta;
+
+ ///
+ /// txtQta control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox txtQta;
+
///
/// btnStampa control.
///
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index 46ea477d..3de65f48 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 1c306cc6..fdabf987 100644
Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ
diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config
index 42f5508d..e759f5ec 100644
--- a/GMW/GMW/mazzAppSettings.config
+++ b/GMW/GMW/mazzAppSettings.config
@@ -7,7 +7,7 @@
-
+
@@ -75,31 +75,47 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -108,6 +124,8 @@
+
+
diff --git a/GMW/GMW/mazzAppSettingsSP.config b/GMW/GMW/mazzAppSettingsSP.config
index 60ebcb7e..88531772 100644
--- a/GMW/GMW/mazzAppSettingsSP.config
+++ b/GMW/GMW/mazzAppSettingsSP.config
@@ -7,7 +7,7 @@
-
+
@@ -75,31 +75,47 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -108,6 +124,8 @@
+
+
diff --git a/GMW/GMW/mazzAppSettingsSP_test.config b/GMW/GMW/mazzAppSettingsSP_test.config
index 42f5508d..174dab09 100644
--- a/GMW/GMW/mazzAppSettingsSP_test.config
+++ b/GMW/GMW/mazzAppSettingsSP_test.config
@@ -7,7 +7,7 @@
-
+
@@ -75,31 +75,47 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -108,6 +124,8 @@
+
+
diff --git a/GMW/GMW/mazzAppSettingsTK.config b/GMW/GMW/mazzAppSettingsTK.config
index d586e995..d253f339 100644
--- a/GMW/GMW/mazzAppSettingsTK.config
+++ b/GMW/GMW/mazzAppSettingsTK.config
@@ -7,7 +7,7 @@
-
+
@@ -75,39 +75,57 @@
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll
index 797e8e13..3de65f48 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/RdlCompile.cache b/GMW/GMW/obj/Debug/RdlCompile.cache
index 351fd79b..0e197f12 100644
Binary files a/GMW/GMW/obj/Debug/RdlCompile.cache and b/GMW/GMW/obj/Debug/RdlCompile.cache differ
diff --git a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache
index e7b64c3d..94b35f87 100644
Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll
index 46ea477d..b637ac2b 100644
Binary files a/GMW/GMW/obj/Release/GMW.dll and b/GMW/GMW/obj/Release/GMW.dll differ
diff --git a/GMW/GMW/obj/Release/RdlCompile.cache b/GMW/GMW/obj/Release/RdlCompile.cache
index 351fd79b..0e197f12 100644
Binary files a/GMW/GMW/obj/Release/RdlCompile.cache and b/GMW/GMW/obj/Release/RdlCompile.cache differ
diff --git a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache
index 7c4a9659..fb9b7959 100644
Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_data/DS_Odette.Designer.cs b/GMW/GMW_data/DS_Odette.Designer.cs
index 64abd5ab..abe1dcb4 100644
--- a/GMW/GMW_data/DS_Odette.Designer.cs
+++ b/GMW/GMW_data/DS_Odette.Designer.cs
@@ -2402,7 +2402,7 @@ namespace GMW_data {
this.columnCampoUDC}, true));
this.columnCampoUDC.AllowDBNull = false;
this.columnCampoUDC.Unique = true;
- this.columnCampoUDC.MaxLength = 10;
+ this.columnCampoUDC.MaxLength = 50;
this.columnCampo1_1.AllowDBNull = false;
this.columnCampo1_1.MaxLength = 50;
this.columnCampo1_2.AllowDBNull = false;
diff --git a/GMW/GMW_data/DS_Odette.xsd b/GMW/GMW_data/DS_Odette.xsd
index 3991ac3c..06d72beb 100644
--- a/GMW/GMW_data/DS_Odette.xsd
+++ b/GMW/GMW_data/DS_Odette.xsd
@@ -922,805 +922,805 @@ SELECT CampoUDC, Campo1_1, Campo1_2, Campo1_3, Campo1_4, Campo1_5, Campo2_1, Cam
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
@@ -1733,8 +1733,8 @@ SELECT CampoUDC, Campo1_1, Campo1_2, Campo1_3, Campo1_4, Campo1_5, Campo2_1, Cam
-
-
+
+
diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs
index 7431afeb..2ccc0cee 100644
--- a/GMW/GMW_data/MagClass.cs
+++ b/GMW/GMW_data/MagClass.cs
@@ -467,6 +467,11 @@ namespace GMW_data
string defIdxPosizTrim = defIdxPosiz.Trim();
string codEventoTrim = codEvento.Trim();
string noteTrim = note.Trim();
+ string annoTrim = anno.ToString();
+ if (annoTrim.Length > 2)
+ {
+ annoTrim = annoTrim.Substring(2, 2);
+ }
// determino se cancellare udcTara
bool doDeleteUdcTara = false; // memLayer.ML.confReadBool("doDeleteUdcTara");
// ricavo cod company...
@@ -494,7 +499,7 @@ namespace GMW_data
{
try
{
- logger.lg.scriviLog(string.Format("Liquidi_Trattamenti: {0} | {1} | {2} | {3} | {4} | {5} | {6} | {7} | {8} | {9} | {10} | {11} | {12} | {13} | {14} | {15} | {16} | {17} | {18} | {19} | {20} | {21} | {22} | {23}", CodCS, CodBilanciaTrim, string.Format("{0:yy}", DateTime.Now), CodClienteTrim, ParticolareTrim, CodImpiantoTrim, CodStampoTrim, EsponenteTrim, FiguraTrim, DataRif, TurnoRif, CodImballoTrim, CodSoggettoTrim, Tara, IdxPosizione, CodTipoDichiarazioneTrim, codEventoTrim, Quantita, PesoTot, PesoCad, CodStatoTrim, UDC_ParentTrim, toAS400, noteTrim), tipoLog.INFO);
+ logger.lg.scriviLog(string.Format("Liquidi_Trattamenti: {0} | {1} | {2} | {3} | {4} | {5} | {6} | {7} | {8} | {9} | {10} | {11} | {12} | {13} | {14} | {15} | {16} | {17} | {18} | {19} | {20} | {21} | {22} | {23}", CodCS, CodBilanciaTrim, annoTrim, CodClienteTrim, ParticolareTrim, CodImpiantoTrim, CodStampoTrim, EsponenteTrim, FiguraTrim, DataRif, TurnoRif, CodImballoTrim, CodSoggettoTrim, Tara, IdxPosizione, CodTipoDichiarazioneTrim, codEventoTrim, Quantita, PesoTot, PesoCad, CodStatoTrim, UDC_ParentTrim, toAS400, noteTrim), tipoLog.INFO);
}
catch
{ }
@@ -505,13 +510,13 @@ namespace GMW_data
if (UDC != "")
{
// insert nuovo UDC con codice impostato
- tabUdc = DataProxy.obj.taCartellini.stp_insNewFull_fixUDC(UDC, CodCS, CodBilanciaTrim, string.Format("{0:##}", anno), CodClienteTrim, ParticolareTrim, CodImpiantoTrim, CodStampoTrim, EsponenteTrim, FiguraTrim, DataRif, TurnoRif, CodImballoTrim, CodSoggettoTrim, Tara, IdxPosizione, CodTipoDichiarazioneTrim, codEventoTrim, Quantita, PesoTot, PesoCad, CodStatoTrim, UDC_ParentTrim, doDeleteUdcTara, noteTrim);
+ tabUdc = DataProxy.obj.taCartellini.stp_insNewFull_fixUDC(UDC, CodCS, CodBilanciaTrim, annoTrim, CodClienteTrim, ParticolareTrim, CodImpiantoTrim, CodStampoTrim, EsponenteTrim, FiguraTrim, DataRif, TurnoRif, CodImballoTrim, CodSoggettoTrim, Tara, IdxPosizione, CodTipoDichiarazioneTrim, codEventoTrim, Quantita, PesoTot, PesoCad, CodStatoTrim, UDC_ParentTrim, doDeleteUdcTara, noteTrim);
answ = UDC;
}
else
{
// insert con calcolo UDC
- tabUdc = DataProxy.obj.taCartellini.stp_insNewFull(CodCS, CodBilanciaTrim, string.Format("{0:##}", anno), CodClienteTrim, ParticolareTrim, CodImpiantoTrim, CodStampoTrim, EsponenteTrim, FiguraTrim, DataRif, TurnoRif, CodImballoTrim, CodSoggettoTrim, Tara, IdxPosizione, CodTipoDichiarazioneTrim, codEventoTrim, Quantita, PesoTot, PesoCad, CodStatoTrim, UDC_ParentTrim, doDeleteUdcTara, noteTrim);
+ tabUdc = DataProxy.obj.taCartellini.stp_insNewFull(CodCS, CodBilanciaTrim, annoTrim, CodClienteTrim, ParticolareTrim, CodImpiantoTrim, CodStampoTrim, EsponenteTrim, FiguraTrim, DataRif, TurnoRif, CodImballoTrim, CodSoggettoTrim, Tara, IdxPosizione, CodTipoDichiarazioneTrim, codEventoTrim, Quantita, PesoTot, PesoCad, CodStatoTrim, UDC_ParentTrim, doDeleteUdcTara, noteTrim);
}
try
{
diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index afc84102..fdabf987 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 afc84102..fdabf987 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/TempPE/DS_Odette.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_Odette.Designer.cs.dll
index 49f98be8..22e5f645 100644
Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_Odette.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_Odette.Designer.cs.dll differ
diff --git a/GMW/GMW_test_installer/GMW_test_installer.vdproj b/GMW/GMW_test_installer/GMW_test_installer.vdproj
index 427962de..d821a9bc 100644
--- a/GMW/GMW_test_installer/GMW_test_installer.vdproj
+++ b/GMW/GMW_test_installer/GMW_test_installer.vdproj
@@ -301,14 +301,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW_test"
- "ProductCode" = "8:{C5262B5A-BD9F-4EB1-B74F-410CB8761B87}"
- "PackageCode" = "8:{29EC96A2-7489-4B0F-A290-77E7B0683DDE}"
+ "ProductCode" = "8:{C1DAF855-2AAE-4D2B-A627-43BA7C9E10BD}"
+ "PackageCode" = "8:{FE42FA6B-BC27-4195-93FC-1C1C91EFF5F6}"
"UpgradeCode" = "8:{6FD64E39-D93B-4ADA-ADF3-303A1BCA49C2}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
- "ProductVersion" = "8:1.1.402"
+ "ProductVersion" = "8:1.1.403"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
@@ -753,7 +753,7 @@
{
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_110D6612090D4EDA92F772F593B23D78"
{
- "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe"
+ "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_D4983B53F0234BFF98835BF3AFECBB8D"
@@ -781,7 +781,7 @@
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_179F2C709A0749C4A5EBA956FADE7EE3"
{
- "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe"
+ "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_D4983B53F0234BFF98835BF3AFECBB8D"
diff --git a/GMW/GMW_test_installer/Release/GMW_test_installer.msi b/GMW/GMW_test_installer/Release/GMW_test_installer.msi
index 215a5947..f48e6b74 100644
Binary files a/GMW/GMW_test_installer/Release/GMW_test_installer.msi and b/GMW/GMW_test_installer/Release/GMW_test_installer.msi differ