Egalware/GMW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update x primi bugfix segnalati...

Browse Source 
git-svn-id: https://keyhammer.ath.cx/svn/GMW/trunk@325 365432ac-a1b5-4ffd-bb28-6d3099d32164
This commit is contained in:
samuele
2010-11-19 18:04:59 +00:00
parent 80a874b17e
commit 65507c485c
35 changed files with 791 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW/GMW/GMW.csproj
+1 -10
View File
@@ -269,7 +269,6 @@
</Compile>
<Compile Include="WebUserControls\mod_anagCelle.ascx.cs">
<DependentUpon>mod_anagCelle.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_anagCelle.ascx.designer.cs">
<DependentUpon>mod_anagCelle.ascx</DependentUpon>
@@ -290,14 +289,12 @@
</Compile>
<Compile Include="WebUserControls\mod_chLang.ascx.cs">
<DependentUpon>mod_chLang.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_chLang.ascx.designer.cs">
<DependentUpon>mod_chLang.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_confMag.ascx.cs">
<DependentUpon>mod_confMag.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_confMag.ascx.designer.cs">
<DependentUpon>mod_confMag.ascx</DependentUpon>
@@ -311,7 +308,6 @@
</Compile>
<Compile Include="WebUserControls\mod_delibera.ascx.cs">
<DependentUpon>mod_delibera.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_delibera.ascx.designer.cs">
<DependentUpon>mod_delibera.ascx</DependentUpon>
@@ -339,7 +335,6 @@
</Compile>
<Compile Include="WebUserControls\mod_detailParticolari.ascx.cs">
<DependentUpon>mod_detailParticolari.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_detailParticolari.ascx.designer.cs">
<DependentUpon>mod_detailParticolari.ascx</DependentUpon>
@@ -437,7 +432,6 @@
</Compile>
<Compile Include="WebUserControls\mod_listParticolari.ascx.cs">
<DependentUpon>mod_listParticolari.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_listParticolari.ascx.designer.cs">
<DependentUpon>mod_listParticolari.ascx</DependentUpon>
@@ -507,7 +501,6 @@
</Compile>
<Compile Include="WebUserControls\mod_pageTitleAndSearch.ascx.cs">
<DependentUpon>mod_pageTitleAndSearch.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_pageTitleAndSearch.ascx.designer.cs">
<DependentUpon>mod_pageTitleAndSearch.ascx</DependentUpon>
@@ -654,14 +647,12 @@
</Compile>
<Compile Include="WebUserControls\mod_viewRigheListaPrelievo.ascx.cs">
<DependentUpon>mod_viewRigheListaPrelievo.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_viewRigheListaPrelievo.ascx.designer.cs">
<DependentUpon>mod_viewRigheListaPrelievo.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_vocabolario.ascx.cs">
<DependentUpon>mod_vocabolario.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_vocabolario.ascx.designer.cs">
<DependentUpon>mod_vocabolario.ascx</DependentUpon>
@@ -981,7 +972,7 @@
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>61365</DevelopmentServerPort>
<DevelopmentServerPort>56776</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost/GMW</IISUrl>
<OverrideIISAppRootUrl>True</OverrideIISAppRootUrl>
GMW/GMW/Web.config
+1 -1
View File
@@ -62,7 +62,7 @@
<add key="appName" value="GMW" />
<add key="SiteName" value="Ambivere"/>
<add key="mainRev" value="1.0" />
<add key="minRev" value="315"/>
<add key="minRev" value="320"/>
<add key="copyRight" value="SteamWare © 2010" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx
+2 -1
View File
@@ -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">
<RowStyle CssClass="ctrRowStyle" />
<AlternatingRowStyle CssClass="ctrAltRowStyle" />
<EditRowStyle CssClass="ctrEditRowStyle" />
GMW/GMW/WebUserControls/mod_viewRigheListaPrelievo.ascx.cs
+13 -1
View File
@@ -511,9 +511,21 @@ namespace GMW.WebUserControls
eh_nuovoValore(this, new EventArgs());
}
}
/// <summary>
/// ridisegno x eliminazione...
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void grView_RowDeleted(object sender, GridViewDeletedEventArgs e)
{
// sollevo evento nuovo valore...
if (eh_nuovoValore != null)
{
eh_nuovoValore(this, new EventArgs());
}
}
#endregion
}
}
GMW/GMW/bin/GMW.dll
BIN
View File
Binary file not shown.
GMW/GMW/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW/mazzAppSettings.config
+1 -1
View File
@@ -7,7 +7,7 @@
<add key="appName" value="GMW"/>
<add key="SiteName" value="Ambivere"/>
<add key="mainRev" value="1.0"/>
<add key="minRev" value="315"/>
<add key="minRev" value="320"/>
<add key="copyRight" value="SteamWare © 2010"/>
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx"/>
GMW/GMW/obj/Debug/GMW.dll
BIN
View File
Binary file not shown.
GMW/GMW/obj/Debug/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW_Term/Web.config
+1 -1
View File
@@ -58,7 +58,7 @@
<add key="appName" value="GMW_Term" />
<add key="SiteName" value="Ambivere"/>
<add key="mainRev" value="1.0" />
<add key="minRev" value="315" />
<add key="minRev" value="320" />
<add key="copyRight" value="SteamWare © 2010" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
GMW/GMW_Term/WebUserControls/mod_btnUdc.ascx.cs
+1 -1
View File
@@ -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
{ }
GMW/GMW_Term/bin/GMW_Term.dll
BIN
View File
Binary file not shown.
GMW/GMW_Term/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_Term/mazzAppSettings.config
+1 -1
View File
@@ -7,7 +7,7 @@
<add key="appName" value="GMW_Term"/>
<add key="SiteName" value="Ambivere"/>
<add key="mainRev" value="1.0"/>
<add key="minRev" value="315"/>
<add key="minRev" value="320"/>
<add key="copyRight" value="SteamWare © 2010"/>
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx"/>
GMW/GMW_Term/obj/Debug/GMW_Term.dll
BIN
View File
Binary file not shown.
GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW_Term_installer/GMW_Term_installer.vdproj
+5 -5
View File
@@ -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"
GMW/GMW_WS/Web.config
+1 -1
View File
@@ -88,7 +88,7 @@
<add key="welcomeApp" value="GMW_welcomeApp" />
<add key="appName" value="GMW"/>
<add key="mainRev" value="1.0"/>
<add key="minRev" value="315"/>
<add key="minRev" value="320"/>
<add key="copyRight" value="SteamWare © 2010"/>
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx"/>
GMW/GMW_WS/bilance.asmx.cs
+66 -44
View File
@@ -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;
}
/// <summary>
@@ -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;
}
GMW/GMW_WS/bin/GMW.dll
BIN
View File
Binary file not shown.
GMW/GMW_WS/bin/GMW_WS.dll
BIN
View File
Binary file not shown.
GMW/GMW_WS/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_WS/mazzAppSettings.config
+1 -1
View File
@@ -6,7 +6,7 @@
<add key="welcomeApp" value="GMW_welcomeApp" />
<add key="appName" value="GMW"/>
<add key="mainRev" value="1.0"/>
<add key="minRev" value="315"/>
<add key="minRev" value="320"/>
<add key="copyRight" value="SteamWare © 2010"/>
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx"/>
GMW/GMW_WS/obj/Debug/GMW_WS.dll
BIN
View File
Binary file not shown.
GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW_WS_installer/GMW_WS_installer.vdproj
+3 -3
View File
@@ -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"
GMW/GMW_data/DS_magazzino.Designer.cs
Generated
+39 -10
View File
@@ -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<int> IdxCellaFrom, global::System.Nullable<int> 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<int> 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;
}
GMW/GMW_data/DS_magazzino.xsd
+593 -581
View File
File diff suppressed because it is too large Load Diff
GMW/GMW_data/DS_magazzino.xss
+4 -4
View File
@@ -8,7 +8,7 @@
<Shapes>
<Shape ID="DesignTable:ElencoCartellini" ZOrder="1" X="79" Y="230" Height="552" Width="250" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="368" />
<Shape ID="DesignTable:AnagMag" ZOrder="7" X="1008" Y="389" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:PosizioneUdcCorrente" ZOrder="4" X="409" Y="544" Height="265" Width="252" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:PosizioneUdcCorrente" ZOrder="4" X="409" Y="544" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:PosizioneUdcStorico" ZOrder="34" X="412" Y="310" Height="168" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:Blocchi" ZOrder="29" X="1015" Y="660" Height="325" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="181" />
<Shape ID="DesignTable:Celle" ZOrder="21" X="712" Y="420" Height="438" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
@@ -72,11 +72,11 @@
<RoutePoints>
<Point>
<X>712</X>
<Y>620</Y>
<Y>687</Y>
</Point>
<Point>
<X>661</X>
<Y>620</Y>
<X>709</X>
<Y>687</Y>
</Point>
</RoutePoints>
</Connector>
GMW/GMW_data/GMW_data.csproj
+1
View File
@@ -161,6 +161,7 @@
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<None Include="SqlScripts\GMW_00320.sql" />
<None Include="SqlScripts\GMW_00315.sql" />
<None Include="SqlScripts\GMW_00310.sql" />
<None Include="SqlScripts\GMW_00305.sql" />
GMW/GMW_data/SqlScripts/GMW_00320.sql
+54
View File
@@ -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
GMW/GMW_data/bin/Debug/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Debug/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll
BIN
View File
Binary file not shown.
GMW/GMW_installer/GMW_installer.vdproj
+3 -3
View File
@@ -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"