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

Fix errori visualizzazione in ricerca generica x selezione UDc che si "trascina" selezione particolare

Browse Source 
git-svn-id: https://keyhammer.ath.cx/svn/GMW/trunk@163 365432ac-a1b5-4ffd-bb28-6d3099d32164
This commit is contained in:
samuele
2010-07-28 13:03:04 +00:00
parent 958a5d5ca8
commit b007767b96
47 changed files with 815 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW/GMW.suo
BIN
View File
Binary file not shown.
GMW/GMW/GMW.csproj
+13 -1
View File
@@ -836,6 +836,18 @@
<Content Include="images\circle_s_2.png" />
<Content Include="images\circle_s_3.png" />
<Content Include="images\circle_s_4.png" />
<Content Include="images\lista_01-PreFus_l.png" />
<Content Include="images\lista_01-PreFus_m.png" />
<Content Include="images\lista_01-PreFus_s.png" />
<Content Include="images\lista_02-TerFus_l.png" />
<Content Include="images\lista_02-TerFus_m.png" />
<Content Include="images\lista_02-TerFus_s.png" />
<Content Include="images\lista_03-TerWip_l.png" />
<Content Include="images\lista_03-TerWip_m.png" />
<Content Include="images\lista_03-TerWip_s.png" />
<Content Include="images\lista_04-PreCli_l.png" />
<Content Include="images\lista_04-PreCli_m.png" />
<Content Include="images\lista_04-PreCli_s.png" />
<Content Include="images\lista_preFus_l.png" />
<Content Include="images\lista_PreFus_m.png" />
<Content Include="images\lista_PreFus_s.png" />
@@ -892,7 +904,7 @@
<WebProjectProperties>
<UseIIS>False</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>53919</DevelopmentServerPort>
<DevelopmentServerPort>53622</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="140" />
<add key="minRev" value="145" />
<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_SearchProvParticolari.ascx.cs
+41 -5
View File
@@ -10,19 +10,37 @@ namespace GMW.WebUserControls
{
public partial class mod_SearchProvParticolari : System.Web.UI.UserControl
{
/// <summary>
/// evento selezione valore
/// </summary>
public event EventHandler eh_selValore;
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
doTraduci();
//mod_detailParticolari1.Visible = false;
mod_execParticolari1.Visible = false;
}
mod_detailParticolari1.eh_selValore += new EventHandler(mod_detailParticolari1_eh_selValore);
mod_detailParticolari1.eh_resetSelezione += new EventHandler(mod_detailParticolari1_eh_resetSelezione);
mod_listParticolari1.eh_selValore += new EventHandler(mod_listParticolari1_eh_selValore);
mod_listParticolari1.eh_resetSelezione += new EventHandler(mod_listParticolari1_eh_resetSelezione);
mod_execParticolari1.eh_btnGoToMagPressed += new EventHandler(mod_execParticolari1_eh_btnGoToMagPressed);
mod_execParticolari1.eh_btnListaPrelievoPressed += new EventHandler(mod_execParticolari1_eh_btnListaPrelievoPressed);
}
void mod_detailParticolari1_eh_resetSelezione(object sender, EventArgs e)
{
mod_execParticolari1.Visible = false;
}
void mod_detailParticolari1_eh_selValore(object sender, EventArgs e)
{
mod_execParticolari1.Visible = true;
}
/// <summary>
/// evento crea lista di prelievo chiamato
/// </summary>
@@ -45,15 +63,25 @@ namespace GMW.WebUserControls
void mod_listParticolari1_eh_resetSelezione(object sender, EventArgs e)
{
//mod_detailParticolari1.Visible = false;
mod_detailParticolari1.resetSelezione();
mod_execParticolari1.Visible = false;
memLayer.ML.emptySessionVal("Particolare_sel");
// sollevo evento nuovo valore...
if (eh_selValore != null)
{
eh_selValore(this, new EventArgs());
}
}
void mod_listParticolari1_eh_selValore(object sender, EventArgs e)
{
//mod_detailParticolari1.Visible = true;
//mod_detailParticolari1.doUpdate();
mod_execParticolari1.Visible = true;
mod_detailParticolari1.resetSelezione();
mod_execParticolari1.Visible = false;
// sollevo evento nuovo valore...
if (eh_selValore != null)
{
eh_selValore(this, new EventArgs());
}
}
@@ -80,6 +108,14 @@ namespace GMW.WebUserControls
{
return user_std.UtSn.Traduci(lemma);
}
/// <summary>
/// effettua update della visualizzazione
/// </summary>
public void doRefresh()
{
mod_execParticolari1.Visible = false;
mod_listParticolari1.doRefresh();
}
}
}
GMW/GMW/WebUserControls/mod_SearchProvUDC.ascx.cs
+30
View File
@@ -10,6 +10,12 @@ namespace GMW.WebUserControls
{
public partial class mod_SearchProvUDC : System.Web.UI.UserControl
{
/// <summary>
/// evento selezione valore
/// </summary>
public event EventHandler eh_selValore;
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
@@ -47,6 +53,18 @@ namespace GMW.WebUserControls
{
mod_detailUDC1.Visible = false;
mod_execUDC1.Visible = false;
// svuoto in session
memLayer.ML.emptySessionVal("Particolare_sel");
memLayer.ML.emptySessionVal("Esponente_sel");
memLayer.ML.emptySessionVal("CodMag_sel");
memLayer.ML.emptySessionVal("CodCellaMag");
memLayer.ML.emptySessionVal("IdxCellaMag");
memLayer.ML.emptySessionVal("IdxBlocco_sel");
// sollevo evento nuovo valore...
if (eh_selValore != null)
{
eh_selValore(this, new EventArgs());
}
}
void mod_listUDC1_eh_selValore(object sender, EventArgs e)
@@ -71,6 +89,11 @@ namespace GMW.WebUserControls
memLayer.ML.setSessionVal("CodCellaMag", codCellaMag, false);
memLayer.ML.setSessionVal("IdxCellaMag", idxCellaMag, false);
memLayer.ML.setSessionVal("IdxBlocco_sel", idxBlocco, false);
// sollevo evento nuovo valore...
if (eh_selValore != null)
{
eh_selValore(this, new EventArgs());
}
}
@@ -97,5 +120,12 @@ namespace GMW.WebUserControls
{
return user_std.UtSn.Traduci(lemma);
}
/// <summary>
/// effettua refresh della visualizzazione
/// </summary>
public void doRefresh()
{
mod_listUDC1.doRefresh();
}
}
}
GMW/GMW/WebUserControls/mod_listParticolari.ascx
+1 -1
View File
@@ -4,7 +4,7 @@
<asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
OnSelectedIndexChanged="grView_SelectedIndexChanged" OnDataBound="grView_DataBound"
DataKeyNames="Particolare" DataSourceID="ods" OnPageIndexChanged="grView_PageIndexChanged"
OnSorting="grView_Sorting">
OnSorting="grView_Sorting" OnRowDataBound="grView_RowDataBound">
<RowStyle CssClass="ctrRowStyle" />
<AlternatingRowStyle CssClass="ctrAltRowStyle" />
<EditRowStyle CssClass="ctrEditRowStyle" />
GMW/GMW/WebUserControls/mod_listParticolari.ascx.cs
+26
View File
@@ -211,7 +211,33 @@ namespace GMW.WebUserControls
// fix dell'ODS
checkFixOds();
}
protected void grView_RowDataBound(object sender, GridViewRowEventArgs e)
{
// se riga di dati...
if (e.Row.RowType == DataControlRowType.DataRow)
{
// ottengo la riga tipizzata...
System.Data.DataRowView _drv = (System.Data.DataRowView)e.Row.DataItem;
DS_magazzino.V_ParticolariOverviewRow riga = (DS_magazzino.V_ParticolariOverviewRow)_drv.Row;
bool cond1 = SteamWare.memLayer.ML.StringSessionObj("Particolare_sel") == riga.Particolare.ToString();
if (cond1)
{
grView.SelectedIndex = e.Row.RowIndex;
}
}
}
/// <summary>
/// effettua refresh 8senza reset) del modulo
/// </summary>
public void doRefresh()
{
checkFixOds();
grView.SelectedIndex = -1;
DataBind();
}
#endregion
}
}
GMW/GMW/WebUserControls/mod_listUDC.ascx
+2 -2
View File
@@ -3,8 +3,8 @@
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
<asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
OnSelectedIndexChanged="grView_SelectedIndexChanged" OnDataBound="grView_DataBound"
DataKeyNames="UDC" DataSourceID="ods"
onpageindexchanged="grView_PageIndexChanged" onsorting="grView_Sorting">
DataKeyNames="UDC" DataSourceID="ods" OnPageIndexChanged="grView_PageIndexChanged"
OnSorting="grView_Sorting" OnRowDataBound="grView_RowDataBound">
<RowStyle CssClass="ctrRowStyle" />
<AlternatingRowStyle CssClass="ctrAltRowStyle" />
<EditRowStyle CssClass="ctrEditRowStyle" />
GMW/GMW/WebUserControls/mod_listUDC.ascx.cs
+31
View File
@@ -213,7 +213,38 @@ namespace GMW.WebUserControls
// fix dell'ODS
checkFixOds();
}
/// <summary>
/// effettua refresh 8senza reset) del modulo
/// </summary>
public void doRefresh()
{
checkFixOds();
//grView.SelectedIndex = -1;
DataBind();
}
/// <summary>
/// aggiorna visualizzaizone selezione
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void grView_RowDataBound(object sender, GridViewRowEventArgs e)
{
// se riga di dati...
if (e.Row.RowType == DataControlRowType.DataRow)
{
// ottengo la riga tipizzata...
System.Data.DataRowView _drv = (System.Data.DataRowView)e.Row.DataItem;
DS_magazzino.v_UdcDetailRow riga = (DS_magazzino.v_UdcDetailRow)_drv.Row;
bool cond1 = SteamWare.memLayer.ML.StringSessionObj("UDC_sel") == riga.UDC.ToString();
if (cond1)
{
grView.SelectedIndex = e.Row.RowIndex;
}
}
}
#endregion
}
}
GMW/GMW/WebUserControls/mod_searchMag.ascx
+2 -2
View File
@@ -52,9 +52,9 @@
<uc5:mod_SearchProvParticolari ID="mod_SearchProvParticolari1" runat="server" />
<br />
<uc1:mod_SearchProvUDC ID="mod_SearchProvUDC1" runat="server" />
<br />
<uc4:mod_SearchProvCelle ID="mod_SearchProvCelle1" runat="server" />
<%--<br />
<uc4:mod_SearchProvCelle ID="mod_SearchProvCelle1" runat="server" />
<br />
<uc6:Mod_SearchProvImballi ID="Mod_SearchProvImballi1" runat="server" />--%>
</asp:Panel>
<asp:Panel runat="server" ID="pnlEmpty" Height="100px">
GMW/GMW/WebUserControls/mod_searchMag.ascx.cs
+24 -10
View File
@@ -18,6 +18,18 @@ namespace GMW.WebUserControls
pnlEmpty.Visible = true;
pnlResults.Visible = false;
}
mod_SearchProvUDC1.eh_selValore += new EventHandler(mod_SearchProvUDC1_eh_selValore);
mod_SearchProvParticolari1.eh_selValore += new EventHandler(mod_SearchProvParticolari1_eh_selValore);
}
void mod_SearchProvParticolari1_eh_selValore(object sender, EventArgs e)
{
mod_SearchProvUDC1.doRefresh();
}
void mod_SearchProvUDC1_eh_selValore(object sender, EventArgs e)
{
mod_SearchProvParticolari1.doRefresh();
}
@@ -53,8 +65,8 @@ namespace GMW.WebUserControls
// è generica, mostro tutto!
mod_SearchProvUDC1.Visible = true;
mod_SearchProvUDC1.doSearch();
mod_SearchProvCelle1.Visible = true;
mod_SearchProvCelle1.doSearch();
//mod_SearchProvCelle1.Visible = true;
//mod_SearchProvCelle1.doSearch();
mod_SearchProvParticolari1.Visible = true;
mod_SearchProvParticolari1.doSearch();
//Mod_SearchProvImballi1.Visible = true;
@@ -68,21 +80,23 @@ namespace GMW.WebUserControls
{
case "I":
mod_SearchProvUDC1.Visible = false;
mod_SearchProvCelle1.Visible = false;
//mod_SearchProvCelle1.Visible = false;
mod_SearchProvParticolari1.Visible = false;
//Mod_SearchProvImballi1.Visible = true;
//Mod_SearchProvImballi1.doSearch();
break;
#if false
case "C":
mod_SearchProvUDC1.Visible = false;
mod_SearchProvCelle1.Visible = true;
mod_SearchProvCelle1.doSearch();
//mod_SearchProvCelle1.Visible = true;
//mod_SearchProvCelle1.doSearch();
mod_SearchProvParticolari1.Visible = false;
//Mod_SearchProvImballi1.Visible = false;
break;
break;
#endif
case "P":
mod_SearchProvUDC1.Visible = false;
mod_SearchProvCelle1.Visible = false;
//mod_SearchProvCelle1.Visible = false;
mod_SearchProvParticolari1.Visible = true;
mod_SearchProvParticolari1.doSearch();
//Mod_SearchProvImballi1.Visible = false;
@@ -90,15 +104,15 @@ namespace GMW.WebUserControls
case "U":
mod_SearchProvUDC1.Visible = true;
mod_SearchProvUDC1.doSearch();
mod_SearchProvCelle1.Visible = false;
//mod_SearchProvCelle1.Visible = false;
mod_SearchProvParticolari1.Visible = false;
//Mod_SearchProvImballi1.Visible = false;
break;
default:
mod_SearchProvUDC1.Visible = true;
mod_SearchProvUDC1.doSearch();
mod_SearchProvCelle1.Visible = true;
mod_SearchProvCelle1.doSearch();
//mod_SearchProvCelle1.Visible = true;
//mod_SearchProvCelle1.doSearch();
mod_SearchProvParticolari1.Visible = true;
mod_SearchProvParticolari1.doSearch();
//Mod_SearchProvImballi1.Visible = true;
GMW/GMW/WebUserControls/mod_searchMag.ascx.designer.cs
Generated
-9
View File
@@ -85,15 +85,6 @@ namespace GMW.WebUserControls {
/// </remarks>
protected global::GMW.WebUserControls.mod_SearchProvUDC mod_SearchProvUDC1;
/// <summary>
/// mod_SearchProvCelle1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::GMW.WebUserControls.mod_SearchProvCelle mod_SearchProvCelle1;
/// <summary>
/// pnlEmpty control.
/// </summary>
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/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW/GMW/images/lista_01-PreFus_l.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

GMW/GMW/images/lista_01-PreFus_m.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

GMW/GMW/images/lista_01-PreFus_s.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 784 B

GMW/GMW/images/lista_02-TerFus_l.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

GMW/GMW/images/lista_02-TerFus_m.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 984 B

GMW/GMW/images/lista_02-TerFus_s.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 670 B

GMW/GMW/images/lista_03-TerWip_l.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

GMW/GMW/images/lista_03-TerWip_m.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

GMW/GMW/images/lista_03-TerWip_s.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 699 B

GMW/GMW/images/lista_04-PreCli_l.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

GMW/GMW/images/lista_04-PreCli_m.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

GMW/GMW/images/lista_04-PreCli_s.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 797 B

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="140" />
<add key="minRev" value="145" />
<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/obj/Release/GMW.dll
BIN
View File
Binary file not shown.
GMW/GMW/obj/Release/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW_data/DS_magazzino.Designer.cs
Generated
+36 -29
View File
@@ -18846,6 +18846,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co
this._commandCollection[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Anno", global::System.Data.SqlDbType.NVarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Mese", global::System.Data.SqlDbType.NVarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodTipoLista", global::System.Data.SqlDbType.NVarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].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[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCS", global::System.Data.SqlDbType.NChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCliente", global::System.Data.SqlDbType.NVarChar, 6, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -18937,7 +18938,7 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co
[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.ElencoListePrelievoDataTable InsertQuery(string Anno, string Mese, global::System.Nullable<int> IdxPosizione, string CodCS, string CodCliente, string RagSociale, string CodSoggetto, string Particolare, string DescParticolare, string DisegnoGrezzo, string Esponente, string Figura, string CodImballo, global::System.Nullable<decimal> QtaTot) {
public virtual DS_magazzino.ElencoListePrelievoDataTable InsertQuery(string Anno, string Mese, string CodTipoLista, global::System.Nullable<int> IdxPosizione, string CodCS, string CodCliente, string RagSociale, string CodSoggetto, string Particolare, string DescParticolare, string DisegnoGrezzo, string Esponente, string Figura, string CodImballo, global::System.Nullable<decimal> QtaTot) {
this.Adapter.SelectCommand = this.CommandCollection[4];
if ((Anno == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
@@ -18951,77 +18952,83 @@ SELECT CodLista, UDC, Qta, Proposto, Prelevato FROM RigheListePrelievo WHERE (Co
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(Mese));
}
if ((IdxPosizione.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[3].Value = ((int)(IdxPosizione.Value));
}
else {
if ((CodTipoLista == null)) {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
if ((CodCS == null)) {
this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
else {
this.Adapter.SelectCommand.Parameters[3].Value = ((string)(CodTipoLista));
}
if ((IdxPosizione.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[4].Value = ((int)(IdxPosizione.Value));
}
else {
this.Adapter.SelectCommand.Parameters[4].Value = ((string)(CodCS));
this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
}
if ((CodCliente == null)) {
if ((CodCS == null)) {
this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[5].Value = ((string)(CodCliente));
this.Adapter.SelectCommand.Parameters[5].Value = ((string)(CodCS));
}
if ((RagSociale == null)) {
if ((CodCliente == null)) {
this.Adapter.SelectCommand.Parameters[6].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[6].Value = ((string)(RagSociale));
this.Adapter.SelectCommand.Parameters[6].Value = ((string)(CodCliente));
}
if ((CodSoggetto == null)) {
if ((RagSociale == null)) {
this.Adapter.SelectCommand.Parameters[7].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[7].Value = ((string)(CodSoggetto));
this.Adapter.SelectCommand.Parameters[7].Value = ((string)(RagSociale));
}
if ((Particolare == null)) {
if ((CodSoggetto == null)) {
this.Adapter.SelectCommand.Parameters[8].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[8].Value = ((string)(Particolare));
this.Adapter.SelectCommand.Parameters[8].Value = ((string)(CodSoggetto));
}
if ((DescParticolare == null)) {
if ((Particolare == null)) {
this.Adapter.SelectCommand.Parameters[9].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[9].Value = ((string)(DescParticolare));
this.Adapter.SelectCommand.Parameters[9].Value = ((string)(Particolare));
}
if ((DisegnoGrezzo == null)) {
if ((DescParticolare == null)) {
this.Adapter.SelectCommand.Parameters[10].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[10].Value = ((string)(DisegnoGrezzo));
this.Adapter.SelectCommand.Parameters[10].Value = ((string)(DescParticolare));
}
if ((Esponente == null)) {
if ((DisegnoGrezzo == null)) {
this.Adapter.SelectCommand.Parameters[11].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[11].Value = ((string)(Esponente));
this.Adapter.SelectCommand.Parameters[11].Value = ((string)(DisegnoGrezzo));
}
if ((Figura == null)) {
if ((Esponente == null)) {
this.Adapter.SelectCommand.Parameters[12].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[12].Value = ((string)(Figura));
this.Adapter.SelectCommand.Parameters[12].Value = ((string)(Esponente));
}
if ((CodImballo == null)) {
if ((Figura == null)) {
this.Adapter.SelectCommand.Parameters[13].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[13].Value = ((string)(CodImballo));
this.Adapter.SelectCommand.Parameters[13].Value = ((string)(Figura));
}
if ((QtaTot.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[14].Value = ((decimal)(QtaTot.Value));
if ((CodImballo == null)) {
this.Adapter.SelectCommand.Parameters[14].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[14].Value = global::System.DBNull.Value;
this.Adapter.SelectCommand.Parameters[14].Value = ((string)(CodImballo));
}
if ((QtaTot.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[15].Value = ((decimal)(QtaTot.Value));
}
else {
this.Adapter.SelectCommand.Parameters[15].Value = global::System.DBNull.Value;
}
DS_magazzino.ElencoListePrelievoDataTable dataTable = new DS_magazzino.ElencoListePrelievoDataTable();
this.Adapter.Fill(dataTable);
GMW/GMW_data/DS_magazzino.xsd
+549 -548
View File
File diff suppressed because it is too large Load Diff
GMW/GMW_data/DS_magazzino.xss
+6 -6
View File
@@ -4,23 +4,23 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="58" ViewPortY="9" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="58" ViewPortY="392" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:ElencoCartellini" ZOrder="13" X="68" Y="333" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:AnagMag" ZOrder="26" X="1014" Y="372" Height="190" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="75" />
<Shape ID="DesignTable:PosizioneUdcCorrente" ZOrder="3" 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="265" Width="252" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:PosizioneUdcStorico" ZOrder="24" X="387" Y="322" Height="156" Width="257" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="109" />
<Shape ID="DesignTable:Blocchi" ZOrder="19" X="1014" Y="652" Height="325" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="181" />
<Shape ID="DesignTable:Celle" ZOrder="1" X="712" Y="420" Height="438" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:Celle" ZOrder="2" X="712" Y="420" Height="438" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:TipoCella" ZOrder="6" X="1008" Y="-2" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:v_UdcDetail" ZOrder="2" X="693" Y="9" Height="381" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:v_UdcDetail" ZOrder="3" X="693" Y="9" Height="381" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:AnagImballi" ZOrder="18" X="93" Y="43" Height="156" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="75" />
<Shape ID="DesignTable:V_ParticolariOverview" ZOrder="17" X="95" Y="1131" Height="265" Width="272" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="138" />
<Shape ID="DesignTable:V_MagazziniOverview" ZOrder="8" X="733" Y="1102" Height="286" Width="232" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:V_DettMagPart" ZOrder="16" X="993" Y="985" Height="326" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="228" />
<Shape ID="DesignTable:TipoListaPrelievo" ZOrder="4" X="724" Y="906" Height="191" Width="244" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:TipoListaPrelievo" ZOrder="5" X="724" Y="906" Height="191" Width="244" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:RigheListePrelievo" ZOrder="15" X="83" Y="846" Height="257" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="130" />
<Shape ID="DesignTable:ElencoListePrelievo" ZOrder="5" X="393" Y="879" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:ElencoListePrelievo" ZOrder="1" X="393" Y="879" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:v_righeListePrelievoPosizione" ZOrder="10" X="406" Y="1283" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:v_particolariEsponenteFigura" ZOrder="9" X="829" Y="1437" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
</Shapes>
GMW/GMW_data/GMW_data.csproj
+5
View File
@@ -152,6 +152,11 @@
<None Include="SqlScripts\GMW_00083.sql" />
<None Include="SqlScripts\GMW_00084.sql" />
<None Include="SqlScripts\GMW_00085.sql" />
<None Include="SqlScripts\GMW_00090.sql" />
<None Include="SqlScripts\GMW_00095.sql" />
<None Include="SqlScripts\GMW_00100.sql" />
<None Include="SqlScripts\GMW_00105.sql" />
<None Include="SqlScripts\GMW_00110.sql" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
GMW/GMW_data/MagClass.cs
+15 -7
View File
@@ -269,7 +269,13 @@ namespace GMW_data
DateTime adesso = DateTime.Now;
// dati che mi servono...
int idxPosizione = 20; // !!! Verificare parametrico - me lo faccio passare... // !!!FARE!!!
int idxPosizione = 0;
try
{
idxPosizione = magazzino.taTipoListaPrelievo.getByCodTipoLista(TipoListaPrelievo)[0].IdxPosizione;
}
catch
{ }
// non la valorizzo qui ma calcolo ... se non fa verificare
string RagioneSociale = "";
@@ -317,7 +323,7 @@ namespace GMW_data
try
{
// eseguo soltanto la query (meglio con try catch così se non c'è non dà errore...)
DS_magazzino.ElencoListePrelievoDataTable tabellaElencoListe = taElencoListePrelievo.InsertQuery(string.Format("{0:yy}", adesso), string.Format("{0:MM}", adesso), idxPosizione, memLayer.ML.confReadString("CodCS"), codCliente, RagioneSociale, codSoggetto, Particolare, descParticolare, disegnoGrezzo, Esponente, Figura, CodImballo, QtaTot);
DS_magazzino.ElencoListePrelievoDataTable tabellaElencoListe = taElencoListePrelievo.InsertQuery(string.Format("{0:yy}", adesso), string.Format("{0:MM}", adesso), TipoListaPrelievo, idxPosizione, memLayer.ML.confReadString("CodCS"), codCliente, RagioneSociale, codSoggetto, Particolare, descParticolare, disegnoGrezzo, Esponente, Figura, CodImballo, QtaTot);
// ricavo prima (e unica) riga dalla select
DS_magazzino.ElencoListePrelievoRow rigaElencoListe = tabellaElencoListe[0];
@@ -325,8 +331,10 @@ namespace GMW_data
// ricavo valore del CodLista attuale appena inserito
codListaAttuale = rigaElencoListe.CodLista;
}
catch
{ }
catch (Exception e)
{
logger.lg.scriviLog(string.Format("Eccezione creazione lista prelievo: {0}{1}", Environment.NewLine, e), tipoLog.ERROR);
}
if (codListaAttuale != "")
{
answ = codListaAttuale;
@@ -612,8 +620,8 @@ namespace GMW_data
//stessi dati da UDC
string particolareUDC = rigaUDC.Particolare;
string esponenteUDC = rigaUDC.Esponente;
string figuraUDC= rigaUDC.Figura;
string codImballoUDC= rigaUDC.CodImballo;
string figuraUDC = rigaUDC.Figura;
string codImballoUDC = rigaUDC.CodImballo;
// condizioni di uguaglianza...
bool particolareOk = false;
@@ -646,7 +654,7 @@ namespace GMW_data
{
codImballoOk = (codImballoLista == codImballoUDC);
}
// verifica finale del risultato uguaglianza...
answ = (particolareOk && esponenteOk && figuraOk && codImballoOk);
}
GMW/GMW_data/bin/Debug/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/bin/Release/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/bin/Release/SteamWare.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_data/obj/Release/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Release/ResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
GMW/GMW_deploy/GMW_deploy.wdproj
+1 -2
View File
@@ -34,6 +34,7 @@
<DeleteAppCodeCompiledFiles>true</DeleteAppCodeCompiledFiles>
<UseWebConfigReplacement>true</UseWebConfigReplacement>
<DeleteAppDataFolder>true</DeleteAppDataFolder>
<ValidateWebConfigReplacement>true</ValidateWebConfigReplacement>
</PropertyGroup>
<ItemGroup>
</ItemGroup>
@@ -54,7 +55,6 @@
</WebConfigReplacementFiles>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WebDeployment\v9.0\Microsoft.WebDeployment.targets" />
<!--Config Steamware-->
<ItemGroup>
<ExcludeFromBuild Include="$(SourceWebPhysicalPath)\*.txt" />
@@ -62,7 +62,6 @@
<ExcludeFromBuild Include="$(SourceWebPhysicalPath)\logs\*.zip" />
<ExcludeFromBuild Include="$(SourceWebPhysicalPath)\**\*.pdb" />
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.WebDeployment.targets.
<Target Name="BeforeBuild">
GMW/GMW_installer/GMW_installer.vdproj
+31 -3
View File
@@ -349,14 +349,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW"
"ProductCode" = "8:{44EF12AC-C76E-4C7D-BED1-43F08AB636E4}"
"PackageCode" = "8:{94CD7F4C-97FF-4212-A4E1-E600A5C7858B}"
"ProductCode" = "8:{1CFBE864-33A2-4BC6-ACD6-DE24EBD8749C}"
"PackageCode" = "8:{B28EF48D-BB27-4B65-9C02-AD78BC657D8D}"
"UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.0.140"
"ProductVersion" = "8:1.0.145"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
@@ -855,6 +855,34 @@
{
}
}
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9345EC6AE230417781B21B0C35DD3375"
{
"SourcePath" = "8:"
"TargetName" = "8:"
"Tag" = "8:"
"Folder" = "8:_5606017201AE45B480A8ABD8B8D68264"
"Condition" = "8:"
"Transitive" = "11:FALSE"
"Vital" = "11:TRUE"
"ReadOnly" = "11:FALSE"
"Hidden" = "11:FALSE"
"System" = "11:FALSE"
"Permanent" = "11:FALSE"
"SharedLegacy" = "11:FALSE"
"PackageAs" = "3:1"
"Register" = "3:1"
"Exclude" = "11:FALSE"
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
"ProjectOutputGroupRegister" = "3:1"
"OutputConfiguration" = "8:"
"OutputGroupCanonicalName" = "8:Built"
"OutputProjectGuid" = "8:{28E4C4DF-7F24-4D23-A44C-F10F8168FC7D}"
"ShowKeyOutput" = "11:TRUE"
"ExcludeFilters"
{
}
}
}
}
}
GMW/GMW_installer/Release/GMW_installer.msi
BIN
View File
Binary file not shown.