diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj index 7afb670f..7f5e0c1d 100644 --- a/GMW/GMW/GMW.csproj +++ b/GMW/GMW/GMW.csproj @@ -269,7 +269,6 @@ mod_anagCelle.ascx - ASPXCodeBehind mod_anagCelle.ascx @@ -290,14 +289,12 @@ mod_chLang.ascx - ASPXCodeBehind mod_chLang.ascx mod_confMag.ascx - ASPXCodeBehind mod_confMag.ascx @@ -311,7 +308,6 @@ mod_delibera.ascx - ASPXCodeBehind mod_delibera.ascx @@ -339,7 +335,6 @@ mod_detailParticolari.ascx - ASPXCodeBehind mod_detailParticolari.ascx @@ -437,7 +432,6 @@ mod_listParticolari.ascx - ASPXCodeBehind mod_listParticolari.ascx @@ -507,7 +501,6 @@ mod_pageTitleAndSearch.ascx - ASPXCodeBehind mod_pageTitleAndSearch.ascx @@ -654,14 +647,12 @@ mod_viewRigheListaPrelievo.ascx - ASPXCodeBehind mod_viewRigheListaPrelievo.ascx mod_vocabolario.ascx - ASPXCodeBehind mod_vocabolario.ascx @@ -981,7 +972,7 @@ False True - 61365 + 56776 / http://localhost/GMW True diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index 0b2b5f4c..c8eeea5f 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -62,7 +62,7 @@ - + diff --git a/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx b/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx index e44ef14b..ea1cf18f 100644 --- a/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx +++ b/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx @@ -6,7 +6,8 @@ OnSelectedIndexChanged="grView_SelectedIndexChanged" OnDataBound="grView_DataBound" DataKeyNames="CodLista,UDC" DataSourceID="ods" OnPageIndexChanged="grView_PageIndexChanged" OnSorted="grView_Sorted" OnRowUpdating="grView_RowUpdating" - OnRowEditing="grView_RowEditing" onrowcancelingedit="grView_RowCancelingEdit"> + OnRowEditing="grView_RowEditing" + OnRowCancelingEdit="grView_RowCancelingEdit" onrowdeleted="grView_RowDeleted"> diff --git a/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx.cs b/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx.cs index 615fdcb1..64b6f268 100644 --- a/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx.cs @@ -511,9 +511,21 @@ namespace GMW.WebUserControls eh_nuovoValore(this, new EventArgs()); } } + /// + /// ridisegno x eliminazione... + /// + /// + /// + protected void grView_RowDeleted(object sender, GridViewDeletedEventArgs e) + { + // sollevo evento nuovo valore... + if (eh_nuovoValore != null) + { + eh_nuovoValore(this, new EventArgs()); + } + } #endregion - } } \ No newline at end of file diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index 04092691..d75e02a8 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 ba76d6c9..0e20668b 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 93016763..0673012e 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 1ea21557..d75e02a8 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 11cc85f4..89e6e49b 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config index 53aa7d7f..cd31fb77 100644 --- a/GMW/GMW_Term/Web.config +++ b/GMW/GMW_Term/Web.config @@ -58,7 +58,7 @@ - + diff --git a/GMW/GMW_Term/WebUserControls/mod_btnUdc.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_btnUdc.ascx.cs index c2004846..fedeb069 100644 --- a/GMW/GMW_Term/WebUserControls/mod_btnUdc.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_btnUdc.ascx.cs @@ -315,7 +315,7 @@ namespace GMW_Term.WebUserControls bool isInOvas = false; try { - isInOvas = (MagClass.magazzino.taPosUdcCorr.getByUDC(_UDC).Rows.Count > 0); + isInOvas = (MagClass.magazzino.taPosUdcCorr.getByUdcCodMag(_UDC, "OVAS").Rows.Count > 0); } catch { } diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 0bb96be7..c593fa28 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 9402bd72..6dd2368d 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 643f65b6..a20cb2f2 100644 --- a/GMW/GMW_Term/mazzAppSettings.config +++ b/GMW/GMW_Term/mazzAppSettings.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index a38ab583..c593fa28 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 09851787..44e219de 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_installer/GMW_Term_installer.vdproj b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj index c37f2173..46bf654e 100644 --- a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj +++ b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj @@ -330,14 +330,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW_Term" - "ProductCode" = "8:{0002F6D7-B175-44CF-BBAB-48486502FF8E}" - "PackageCode" = "8:{4A2DF545-DF27-4C28-B9B1-332F564AB543}" + "ProductCode" = "8:{1BBDACA5-8892-414E-8C79-B4A1C7EFA3BF}" + "PackageCode" = "8:{99D2A97D-586D-4099-8CA9-FCC8ED002D86}" "UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.315" + "ProductVersion" = "8:1.0.320" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" @@ -810,7 +810,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9C1BA08A590A44EC9515C0F91AD50A1D" { - "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe" + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF" @@ -838,7 +838,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B0271B832DBE45F0B50639E61DAE3CF4" { - "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe" + "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF" diff --git a/GMW/GMW_WS/Web.config b/GMW/GMW_WS/Web.config index deb463fc..b24e1c9e 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 98dd0fd9..760abe4a 100644 --- a/GMW/GMW_WS/bilance.asmx.cs +++ b/GMW/GMW_WS/bilance.asmx.cs @@ -1039,37 +1039,43 @@ namespace GMW_WS // init bool answ = false; - // loggo tutto! - if (logLevel > 5) + // controllo se posizione = 88 (altrimenti non processo...) + bool posizOk = false; + // prendo i dati PRIMA che scarichi l'UDC... e con qta negativa xché qui devo "rimetterlo a posto"... + DS_magazzino.ElencoCartelliniRow rigaUdc = MagClass.magazzino.taElencoCartellini.getDetailsUdcByUdc(UDC_req)[0]; + posizOk = (rigaUdc.IdxPosizione == 88); + if (posizOk) { + // loggo tutto! + if (logLevel > 5) + { + try + { + logger.lg.scriviLog(string.Format("UdcCall_rientroInWip: {0} | {1}", UDC_reqTrim, CodSoggettoTrim), tipoLog.INFO); + } + catch + { } + } try { - logger.lg.scriviLog(string.Format("UdcCall_rientroInWip: {0} | {1}", UDC_reqTrim, CodSoggettoTrim), tipoLog.INFO); + answ = MagClass.magazzino.spostaUDC(CodCs, UDC_reqTrim, idxCellaTo); } catch { } - } - try - { - answ = MagClass.magazzino.spostaUDC(CodCs, UDC_reqTrim, idxCellaTo); - } - catch - { } - // se richiesto faccio consumo immediato... - if (memLayer.ML.confReadBool("Cosumo84PostDelibera")) - { - // prendo i dati PRIMA che scarichi l'UDC... e con qta negativa xché qui devo "rimetterlo a posto"... - DS_magazzino.ElencoCartelliniRow rigaUdc = MagClass.magazzino.taElencoCartellini.getDetailsUdcByUdc(UDC_req)[0]; - string Particolare = rigaUdc.Particolare; - int IdxPosizione = rigaUdc.IdxPosizione; - decimal Quantita = -rigaUdc.Qta; - // faccio spostamento! - bool fatto = MagClass.magazzino.scaricaUdcMpWip(UDC_req); - // calcolo l'eventuale rettifica x AS - if (fatto) + // se richiesto faccio consumo immediato... + if (memLayer.ML.confReadBool("Cosumo84PostDelibera")) { - // 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, "UDC_NOQTY"); + string Particolare = rigaUdc.Particolare; + int IdxPosizione = rigaUdc.IdxPosizione; + decimal Quantita = -rigaUdc.Qta; + // faccio spostamento! + bool fatto = MagClass.magazzino.scaricaUdcMpWip(UDC_req); + // calcolo l'eventuale rettifica x AS + 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, "UDC_NOQTY"); + } } } return answ; @@ -1091,22 +1097,30 @@ namespace GMW_WS // init bool answ = false; - // loggo tutto! - if (logLevel > 5) + // controllo se posizione = 88 (altrimenti non processo...) + bool posizOk = false; + // prendo i dati PRIMA che scarichi l'UDC... e con qta negativa xché qui devo "rimetterlo a posto"... + DS_magazzino.ElencoCartelliniRow rigaUdc = MagClass.magazzino.taElencoCartellini.getDetailsUdcByUdc(UDC_req)[0]; + posizOk = (rigaUdc.IdxPosizione == 88); + if (posizOk) { + // loggo tutto! + if (logLevel > 5) + { + try + { + logger.lg.scriviLog(string.Format("UdcCall_rientroInWip: {0} | {1}", UDC_reqTrim, CodSoggettoTrim), tipoLog.INFO); + } + catch + { } + } try { - logger.lg.scriviLog(string.Format("UdcCall_rientroInWip: {0} | {1}", UDC_reqTrim, CodSoggettoTrim), tipoLog.INFO); + answ = MagClass.magazzino.spostaUDC(CodCs, UDC_reqTrim, idxCellaTo); } catch { } } - try - { - answ = MagClass.magazzino.spostaUDC(CodCs, UDC_reqTrim, idxCellaTo); - } - catch - { } return answ; } /// @@ -1126,24 +1140,32 @@ namespace GMW_WS // init bool answ = false; - // loggo tutto! - if (logLevel > 5) + // controllo se posizione = 88 (altrimenti non processo...) + bool posizOk = false; + // prendo i dati PRIMA che scarichi l'UDC... e con qta negativa xché qui devo "rimetterlo a posto"... + DS_magazzino.ElencoCartelliniRow rigaUdc = MagClass.magazzino.taElencoCartellini.getDetailsUdcByUdc(UDC_req)[0]; + posizOk = (rigaUdc.IdxPosizione == 88); + if (posizOk) { + // loggo tutto! + if (logLevel > 5) + { + try + { + logger.lg.scriviLog(string.Format("UdcCall_rientroInFiniti: {0} | {1}", UDC_reqTrim, CodSoggettoTrim), tipoLog.INFO); + } + catch + { } + } try { - logger.lg.scriviLog(string.Format("UdcCall_rientroInFiniti: {0} | {1}", UDC_reqTrim, CodSoggettoTrim), tipoLog.INFO); + + MagClass.magazzino.spostaUDC(CodCs, UDC_reqTrim, idxCellaTo); + answ = true; } catch { } } - try - { - - MagClass.magazzino.spostaUDC(CodCs, UDC_reqTrim, idxCellaTo); - answ = true; - } - catch - { } return answ; } diff --git a/GMW/GMW_WS/bin/GMW.dll b/GMW/GMW_WS/bin/GMW.dll index 1976d8c5..6a16da91 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 aeccb971..693a8804 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 0aba7035..f2f9f946 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/mazzAppSettings.config b/GMW/GMW_WS/mazzAppSettings.config index fbfb8f71..8ce1afef 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 bf4118da..693a8804 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 838febfd..02cb2f8c 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_installer/GMW_WS_installer.vdproj b/GMW/GMW_WS_installer/GMW_WS_installer.vdproj index 598bf53e..54715cc2 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:{5E864681-CEE3-47ED-A751-87773B4E905A}" - "PackageCode" = "8:{61231336-EFD4-4EA6-8374-6A9EC2EB40B5}" + "ProductCode" = "8:{D47542AF-9DC7-4DCD-ABDC-E934AF3F4615}" + "PackageCode" = "8:{DB53EECF-9AAA-4B6E-BFE5-3F75FF04127F}" "UpgradeCode" = "8:{BA470335-3D4B-4C20-8152-90A5F0F14FE0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.315" + "ProductVersion" = "8:1.0.320" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" diff --git a/GMW/GMW_data/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs index 7914bc74..72f4413a 100644 --- a/GMW/GMW_data/DS_magazzino.Designer.cs +++ b/GMW/GMW_data/DS_magazzino.Designer.cs @@ -16863,7 +16863,7 @@ SELECT UDC, IdxCella, CodCS, DataRif FROM PosizioneUdcCorrente WHERE (IdxCella = [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[7]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[8]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT UDC, IdxCella, CodCS, DataRif FROM dbo.PosizioneUdcCorrente"; @@ -16895,20 +16895,27 @@ SELECT UDC, IdxCella, CodCS, DataRif FROM PosizioneUdcCorrente WHERE (IdxCella = this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = "dbo.stp_scaricaUdc"; + this._commandCollection[5].CommandText = "dbo.stp_getPosizioneByUdcCodMag"; this._commandCollection[5].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[5].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[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxCellaFrom", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizione", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodMag", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[6].Connection = this.Connection; - this._commandCollection[6].CommandText = "dbo.stp_spostaUdc"; + this._commandCollection[6].CommandText = "dbo.stp_scaricaUdc"; this._commandCollection[6].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[6].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[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCS", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxCellaTo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxCellaFrom", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxPosizione", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[7].Connection = this.Connection; + this._commandCollection[7].CommandText = "dbo.stp_spostaUdc"; + this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[7].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[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCS", global::System.Data.SqlDbType.VarChar, 2, 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("@UDC", global::System.Data.SqlDbType.VarChar, 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("@IdxCellaTo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -17003,6 +17010,28 @@ SELECT UDC, IdxCella, CodCS, DataRif FROM PosizioneUdcCorrente WHERE (IdxCella = 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_magazzino.PosizioneUdcCorrenteDataTable getByUdcCodMag(string UDC, string CodMag) { + this.Adapter.SelectCommand = this.CommandCollection[5]; + if ((UDC == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(UDC)); + } + if ((CodMag == null)) { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(CodMag)); + } + DS_magazzino.PosizioneUdcCorrenteDataTable dataTable = new DS_magazzino.PosizioneUdcCorrenteDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int Update(DS_magazzino.PosizioneUdcCorrenteDataTable dataTable) { @@ -17178,7 +17207,7 @@ SELECT UDC, IdxCella, CodCS, DataRif FROM PosizioneUdcCorrente WHERE (IdxCella = [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_scaricaUdc(string UDC, global::System.Nullable IdxCellaFrom, global::System.Nullable IdxPosizione) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[5]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; if ((UDC == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } @@ -17217,7 +17246,7 @@ SELECT UDC, IdxCella, CodCS, DataRif FROM PosizioneUdcCorrente WHERE (IdxCella = [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] public virtual int stp_spostaUdc(string CodCS, string UDC, global::System.Nullable IdxCellaTo) { - global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[6]; + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; if ((CodCS == null)) { command.Parameters[1].Value = global::System.DBNull.Value; } diff --git a/GMW/GMW_data/DS_magazzino.xsd b/GMW/GMW_data/DS_magazzino.xsd index c239aec6..73e6edd7 100644 --- a/GMW/GMW_data/DS_magazzino.xsd +++ b/GMW/GMW_data/DS_magazzino.xsd @@ -527,6 +527,18 @@ SELECT UDC, IdxCella, CodCS, DataRif FROM PosizioneUdcCorrente WHERE (IdxCella = + + + + dbo.stp_getPosizioneByUdcCodMag + + + + + + + + @@ -2524,274 +2536,127 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2806,18 +2671,18 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - - - - - - - - + + + + + + + + - + @@ -2827,7 +2692,154 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2841,99 +2853,99 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - + - + - + - + - - - + + + - - + + - - + + - + - + - - - - - + + + + + - + - + - + @@ -2944,6 +2956,336 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2960,351 +3302,21 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -3317,131 +3329,131 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - - + + - + - - + + - - - + + + - + - - + + - - + + - + - - - + + + - - - + + + - + - + - + - - + + - - + + - + - + @@ -3461,8 +3473,8 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - - + + @@ -3475,74 +3487,74 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - - - + + + - + - - + + - - + + - + - + - + - + - + - + diff --git a/GMW/GMW_data/DS_magazzino.xss b/GMW/GMW_data/DS_magazzino.xss index 57465335..e6f9f61c 100644 --- a/GMW/GMW_data/DS_magazzino.xss +++ b/GMW/GMW_data/DS_magazzino.xss @@ -8,7 +8,7 @@ - + @@ -72,11 +72,11 @@ 712 - 620 + 687 - 661 - 620 + 709 + 687 diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj index a8e87771..6c642435 100644 --- a/GMW/GMW_data/GMW_data.csproj +++ b/GMW/GMW_data/GMW_data.csproj @@ -161,6 +161,7 @@ SettingsSingleFileGenerator Settings.Designer.cs + diff --git a/GMW/GMW_data/SqlScripts/GMW_00320.sql b/GMW/GMW_data/SqlScripts/GMW_00320.sql new file mode 100644 index 00000000..642e496b --- /dev/null +++ b/GMW/GMW_data/SqlScripts/GMW_00320.sql @@ -0,0 +1,54 @@ +set xact_abort on +go + +begin transaction +go + +DELETE FROM dbo.TabTranPosizEventi WHERE CodEvento=N'MagPreFus' and IdxPosizione=54 +go + +commit transaction +go + + +set xact_abort on +go + +begin transaction +go + +set ANSI_NULLS on +go + +/*************************************** +* STORED stp_getPosizioneByUdcIdxPosizione +* +* restituisce la posizione dell'udc dato codice udc e CodMag desiderato +* +* Steamware, S.E.L +* mod: 2010.11.19 +* +************************************/ +create PROCEDURE stp_getPosizioneByUdcCodMag +( + @UDC NVARCHAR(50), + @CodMag NVARCHAR(50) +) +AS + +SELECT puc.* +FROM PosizioneUdcCorrente puc INNER JOIN Celle c ON puc.IdxCella=c.IdxCella INNER JOIN Blocchi b ON c.IdxBlocco=b.IdxBlocco +where puc.UDC = @UDC AND b.CodMag = @CodMag +go + +commit +go + + + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(320, GETDATE()) +GO diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 2e98f5c5..6dd2368d 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 2e98f5c5..6dd2368d 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_magazzino.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll index 68a4ce9b..293a956d 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_installer/GMW_installer.vdproj b/GMW/GMW_installer/GMW_installer.vdproj index a42ae869..d5657264 100644 --- a/GMW/GMW_installer/GMW_installer.vdproj +++ b/GMW/GMW_installer/GMW_installer.vdproj @@ -349,14 +349,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW" - "ProductCode" = "8:{0BC86CA6-1D66-461C-8CD9-94EA06E4E481}" - "PackageCode" = "8:{DDC9067A-E16C-4AC2-BD3B-D0B642461A29}" + "ProductCode" = "8:{B84DEEED-6DFF-4A43-8208-F594A30A60C7}" + "PackageCode" = "8:{8C0873E4-295E-4D96-BD3C-2F3C8AF04AF3}" "UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.0.315" + "ProductVersion" = "8:1.0.320" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net"