diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index 47cf768e..0b2b5f4c 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -62,7 +62,7 @@ - + diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 69cb4f3a..3048736a 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 30d1a394..72d234c0 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 fa494b3f..93016763 100644 --- a/GMW/GMW/mazzAppSettings.config +++ b/GMW/GMW/mazzAppSettings.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 5d110ca2..3048736a 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 3233c20d..a11b754c 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 69cb4f3a..2f636881 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/ResolveAssemblyReference.cache b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache index 8dd50a33..367ada6b 100644 Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_WS/Web.config b/GMW/GMW_WS/Web.config index 2a46f515..deb463fc 100644 --- a/GMW/GMW_WS/Web.config +++ b/GMW/GMW_WS/Web.config @@ -88,7 +88,7 @@ - + diff --git a/GMW/GMW_WS/bilance.asmx.cs b/GMW/GMW_WS/bilance.asmx.cs index a05cfe4e..764d7d5c 100644 --- a/GMW/GMW_WS/bilance.asmx.cs +++ b/GMW/GMW_WS/bilance.asmx.cs @@ -14,7 +14,7 @@ namespace GMW_WS /// /// WebService per gestione sw bilance /// - [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.1.0.310")] + [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.1.0.315")] [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)] [System.ComponentModel.ToolboxItem(false)] public class bilance : System.Web.Services.WebService @@ -476,7 +476,7 @@ namespace GMW_WS // se NON richiesto di generare movimento a magazzino crea rettifica in tab batch if (!toAS400) { - DataProxy.obj.taCartellini.stp_rettMovAs400(ParticolareTrim, answ, IdxPosizione.ToString(), Quantita); + DataProxy.obj.taCartellini.stp_rettMovAs400(ParticolareTrim, answ, IdxPosizione.ToString(), Quantita, "UDC_NOQTY"); } return answ; } @@ -563,7 +563,17 @@ namespace GMW_WS // se NON richiesto di generare movimento a magazzino crea rettifica in tab batch if (!toAS400) { - DataProxy.obj.taCartellini.stp_rettMovAs400(ParticolareTrim, answ, IdxPosizione.ToString(), Quantita); + DataProxy.obj.taCartellini.stp_rettMovAs400(ParticolareTrim, answ, IdxPosizione.ToString(), Quantita, "UDC_NOQTY"); + } + // controllo, se sono in condizione di "consumo immediato" dell'area WIP 84 allora scarico da li la quantità dei finiti... + if (memLayer.ML.confReadBool("Cosumo84PostDelibera")) + { + // calcolo l'eventuale rettifica x AS + if (answ != "") + { + // devo fare un movimento di compensazioen su mag 84 x scaricare la quantità che ho appena CREATO IN 54... + DataProxy.obj.taCartellini.stp_rettMovAs400(ParticolareTrim, answ, "84", Quantita, "UDC_MOV"); + } } return answ; } @@ -652,7 +662,7 @@ namespace GMW_WS // se NON richiesto di generare movimento a magazzino crea rettifica in tab batch if (!toAS400) { - DataProxy.obj.taCartellini.stp_rettMovAs400(ParticolareTrim, answ, IdxPosizione.ToString(), Quantita); + DataProxy.obj.taCartellini.stp_rettMovAs400(ParticolareTrim, answ, IdxPosizione.ToString(), Quantita, "UDC_NOQTY"); } return answ; } @@ -733,7 +743,7 @@ namespace GMW_WS try { answ = tabUdc[0].UDC; - // salvo associazioen parent-child tra UDC! + // salvo associazione parent-child tra UDC! DataProxy.obj.taRelazUDC.Insert(UDC_ParentTrim, answ); } catch @@ -741,7 +751,7 @@ namespace GMW_WS // se NON richiesto di generare movimento a magazzino crea rettifica in tab batch if (!toAS400) { - DataProxy.obj.taCartellini.stp_rettMovAs400(ParticolareTrim, answ, IdxPosizione.ToString(), Quantita); + DataProxy.obj.taCartellini.stp_rettMovAs400(ParticolareTrim, answ, IdxPosizione.ToString(), Quantita, "UDC_NOQTY"); } return answ; } @@ -1059,7 +1069,7 @@ namespace GMW_WS if (fatto) { // devo fare un movimento di compensazioen su mag 84 x non scaricare subito la quantità che ho appena messo in AS400... - DataProxy.obj.taCartellini.stp_rettMovAs400(Particolare, UDC_req, IdxPosizione.ToString(), Quantita); + DataProxy.obj.taCartellini.stp_rettMovAs400(Particolare, UDC_req, IdxPosizione.ToString(), Quantita, "UDC_NOQTY"); } } return answ; @@ -1193,7 +1203,7 @@ namespace GMW_WS // trim fix string searchTxt = particolare.Trim(); //restituisco elenco - gestEl.caricaSpecPart(DataProxy.obj.taSpecPart.getByParticolare(searchTxt)); + gestEl.caricaSpecPart(DataProxy.obj.taSpecPart.getByParticolareRilPro(searchTxt)); return gestEl.elencoSpecPart; } diff --git a/GMW/GMW_WS/bin/GMW.dll b/GMW/GMW_WS/bin/GMW.dll index a86fbb27..3048736a 100644 Binary files a/GMW/GMW_WS/bin/GMW.dll and b/GMW/GMW_WS/bin/GMW.dll differ diff --git a/GMW/GMW_WS/bin/GMW_WS.dll b/GMW/GMW_WS/bin/GMW_WS.dll index 94b9babe..09ad1093 100644 Binary files a/GMW/GMW_WS/bin/GMW_WS.dll and b/GMW/GMW_WS/bin/GMW_WS.dll differ diff --git a/GMW/GMW_WS/bin/GMW_data.dll b/GMW/GMW_WS/bin/GMW_data.dll index 94533cb1..72d234c0 100644 Binary files a/GMW/GMW_WS/bin/GMW_data.dll and b/GMW/GMW_WS/bin/GMW_data.dll differ diff --git a/GMW/GMW_WS/bin/SteamWare.dll b/GMW/GMW_WS/bin/SteamWare.dll index df0450e8..ba92c82c 100644 Binary files a/GMW/GMW_WS/bin/SteamWare.dll and b/GMW/GMW_WS/bin/SteamWare.dll differ diff --git a/GMW/GMW_WS/mazzAppSettings.config b/GMW/GMW_WS/mazzAppSettings.config index f64734e5..fbfb8f71 100644 --- a/GMW/GMW_WS/mazzAppSettings.config +++ b/GMW/GMW_WS/mazzAppSettings.config @@ -6,7 +6,7 @@ - + diff --git a/GMW/GMW_WS/obj/Debug/GMW_WS.dll b/GMW/GMW_WS/obj/Debug/GMW_WS.dll index 511c88f0..09ad1093 100644 Binary files a/GMW/GMW_WS/obj/Debug/GMW_WS.dll and b/GMW/GMW_WS/obj/Debug/GMW_WS.dll differ diff --git a/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache index 2e946de2..c048402d 100644 Binary files a/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_WS/obj/Release/GMW_WS.dll b/GMW/GMW_WS/obj/Release/GMW_WS.dll index 94b9babe..002c77fa 100644 Binary files a/GMW/GMW_WS/obj/Release/GMW_WS.dll and b/GMW/GMW_WS/obj/Release/GMW_WS.dll differ diff --git a/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache index 70adb3a6..25b7487b 100644 Binary files a/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW_WS/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_WS_installer/GMW_WS_installer.vdproj b/GMW/GMW_WS_installer/GMW_WS_installer.vdproj index ce933d31..598bf53e 100644 --- a/GMW/GMW_WS_installer/GMW_WS_installer.vdproj +++ b/GMW/GMW_WS_installer/GMW_WS_installer.vdproj @@ -344,14 +344,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW_WS" - "ProductCode" = "8:{866EE1D4-5C62-4A91-B2EF-39078C4CEE4D}" - "PackageCode" = "8:{726C554D-05A7-4A7A-BACA-CD518CCF1ABF}" + "ProductCode" = "8:{5E864681-CEE3-47ED-A751-87773B4E905A}" + "PackageCode" = "8:{61231336-EFD4-4EA6-8374-6A9EC2EB40B5}" "UpgradeCode" = "8:{BA470335-3D4B-4C20-8152-90A5F0F14FE0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.310" + "ProductVersion" = "8:1.0.315" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" @@ -824,7 +824,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C1E28C0CBEB3498E83D9B97B28568D55" { - "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe" + "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B61BA0CAC3474474B971A8F12A1C93F2" @@ -852,7 +852,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_D67ABEB91C7F428EB3C512E4A505628A" { - "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe" + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_B61BA0CAC3474474B971A8F12A1C93F2" diff --git a/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi b/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi index dee1b1e7..ac64c416 100644 Binary files a/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi and b/GMW/GMW_WS_installer/Release/GMW_WS_installer.msi differ diff --git a/GMW/GMW_data/DS_Applicazione.Designer.cs b/GMW/GMW_data/DS_Applicazione.Designer.cs index 1dd88dd6..40a1ac7f 100644 --- a/GMW/GMW_data/DS_Applicazione.Designer.cs +++ b/GMW/GMW_data/DS_Applicazione.Designer.cs @@ -13999,6 +13999,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodMagAS", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Qta", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 10, 2, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodEvento", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[8] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[8].Connection = this.Connection; this._commandCollection[8].CommandText = "dbo.stp_riattivaUdc"; @@ -15521,7 +15522,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int stp_rettMovAs400(string Particolare, string UDC, string CodMagAS, global::System.Nullable Qta) { + public virtual int stp_rettMovAs400(string Particolare, string UDC, string CodMagAS, global::System.Nullable Qta, string CodEvento) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; if ((Particolare == null)) { command.Parameters[1].Value = global::System.DBNull.Value; @@ -15547,6 +15548,12 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno else { command.Parameters[4].Value = global::System.DBNull.Value; } + if ((CodEvento == null)) { + command.Parameters[5].Value = global::System.DBNull.Value; + } + else { + command.Parameters[5].Value = ((string)(CodEvento)); + } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -18916,7 +18923,7 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT CodCliente, RagSociale, Particolare, DescParticolare, DisegnoGrezzo, Espon" + @@ -18928,6 +18935,12 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = this._commandCollection[1].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Particolare", global::System.Data.SqlDbType.NVarChar, 15, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[2].Connection = this.Connection; + this._commandCollection[2].CommandText = "dbo.stp_anagFullParticolare"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Particolare", global::System.Data.SqlDbType.NVarChar, 15, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -18955,7 +18968,7 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_Applicazione.v_specParticolariDataTable getByParticolare(string Particolare) { + public virtual DS_Applicazione.v_specParticolariDataTable getByParticolareDaCartellini(string Particolare) { this.Adapter.SelectCommand = this.CommandCollection[1]; if ((Particolare == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -18967,6 +18980,22 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = this.Adapter.Fill(dataTable); return dataTable; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] + public virtual DS_Applicazione.v_specParticolariDataTable getByParticolareRilPro(string Particolare) { + this.Adapter.SelectCommand = this.CommandCollection[2]; + if ((Particolare == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(Particolare)); + } + DS_Applicazione.v_specParticolariDataTable dataTable = new DS_Applicazione.v_specParticolariDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } } /// diff --git a/GMW/GMW_data/DS_Applicazione.xsd b/GMW/GMW_data/DS_Applicazione.xsd index 98407eb3..80964313 100644 --- a/GMW/GMW_data/DS_Applicazione.xsd +++ b/GMW/GMW_data/DS_Applicazione.xsd @@ -794,11 +794,12 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno + - + dbo.stp_riattivaUdc @@ -810,7 +811,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno - + dbo.stp_sbloccaUdc @@ -1465,7 +1466,7 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + dbo.stp_SpecParticolare @@ -1476,6 +1477,17 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = + + + + dbo.stp_anagFullParticolare + + + + + + + @@ -1489,8 +1501,8 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - - + + @@ -1503,14 +1515,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + @@ -1523,14 +1535,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + @@ -1543,14 +1555,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + @@ -1563,35 +1575,35 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + - + - + @@ -1604,35 +1616,35 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + - + - + @@ -1645,21 +1657,21 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + @@ -1672,93 +1684,93 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + @@ -1772,28 +1784,28 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - - - - + + + + - - - - - + + + + + - + @@ -1820,96 +1832,96 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - - - + + + - - - - + + + + - + - + - + - + - + - + - + - + - + @@ -1991,14 +2003,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + @@ -2011,157 +2023,157 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - - - - - - + + + + + + - + - + - + - + - + @@ -2174,42 +2186,42 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + - + - + - + @@ -2222,14 +2234,14 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + @@ -2242,21 +2254,21 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + @@ -2269,102 +2281,102 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - - - + + + - + - + - + - - + + - - + + - + - + - + - + - + - + - + - + @@ -2377,56 +2389,56 @@ SELECT CodSoggetto, USER_NAME, DOMINIO FROM Soggetti2Utente WHERE (CodSoggetto = - + - + - + - + - + - + - + - + diff --git a/GMW/GMW_data/DS_Applicazione.xss b/GMW/GMW_data/DS_Applicazione.xss index 83c0242a..ef1dd64c 100644 --- a/GMW/GMW_data/DS_Applicazione.xss +++ b/GMW/GMW_data/DS_Applicazione.xss @@ -23,7 +23,7 @@ - + diff --git a/GMW/GMW_data/DS_magazzino.xss b/GMW/GMW_data/DS_magazzino.xss index dea138f5..57465335 100644 --- a/GMW/GMW_data/DS_magazzino.xss +++ b/GMW/GMW_data/DS_magazzino.xss @@ -6,7 +6,7 @@ --> - + @@ -14,7 +14,7 @@ - + @@ -35,24 +35,24 @@ - 368 - 652 + 329 + 655 409 - 652 + 655 - 368 - 413 + 329 + 416 412 - 413 + 416 @@ -107,11 +107,11 @@ - 197 - 797 + 208 + 782 - 197 + 208 846 @@ -148,11 +148,11 @@ 392 - 350 + 353 - 368 - 350 + 329 + 353 diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs index 22c4253c..18f32b38 100644 --- a/GMW/GMW_data/MagClass.cs +++ b/GMW/GMW_data/MagClass.cs @@ -357,7 +357,7 @@ namespace GMW_data if (rigaUdcPre.IdxPosizione != rigaUdcPost.IdxPosizione) { // faccio movimento compensativo... in segno negativo risp alla posiz POST - DataProxy.obj.taCartellini.stp_rettMovAs400(rigaUdcPost.Particolare, rigaUdcPost.UDC, rigaUdcPost.IdxPosizione.ToString(), rigaUdcPost.Qta); + DataProxy.obj.taCartellini.stp_rettMovAs400(rigaUdcPost.Particolare, rigaUdcPost.UDC, rigaUdcPost.IdxPosizione.ToString(), rigaUdcPost.Qta, "UDC_NOQTY"); } answ = true; } diff --git a/GMW/GMW_data/StateMachine.cs b/GMW/GMW_data/StateMachine.cs index 03d58f69..d453175c 100644 --- a/GMW/GMW_data/StateMachine.cs +++ b/GMW/GMW_data/StateMachine.cs @@ -66,7 +66,7 @@ namespace GMW_data if (fatto) { // devo fare un movimento di compensazioen su mag 84 x non scaricare subito la quantità che ho appena messo in AS400... - DataProxy.obj.taCartellini.stp_rettMovAs400(Particolare, UDC, IdxPosizione.ToString(), Quantita); + DataProxy.obj.taCartellini.stp_rettMovAs400(Particolare, UDC, IdxPosizione.ToString(), Quantita, "UDC_NOQTY"); } } } diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 7e405296..72d234c0 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/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll index eb2b7a68..e6716cbe 100644 Binary files a/GMW/GMW_data/bin/Release/GMW_data.dll and b/GMW/GMW_data/bin/Release/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 7e405296..72d234c0 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_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index a8569aa3..ebbaa753 100644 Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.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 2bed952e..68a4ce9b 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 diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll index eb2b7a68..e6716cbe 100644 Binary files a/GMW/GMW_data/obj/Release/GMW_data.dll and b/GMW/GMW_data/obj/Release/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index ba507413..d622a452 100644 Binary files a/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/GMW/GMW_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ