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

update terminalino da richieste GIAN

Browse Source 
git-svn-id: https://keyhammer.ath.cx/svn/GMW/trunk@443 365432ac-a1b5-4ffd-bb28-6d3099d32164
This commit is contained in:
samuele
2012-03-21 11:15:14 +00:00
parent 14fb0130de
commit a817e80f74
32 changed files with 184 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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/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/Style.css
+1 -5
View File
@@ -526,7 +526,6 @@
background-color: #AAFFAA;
white-space: pre;
font-size: 9pt;
font-weight: bold;
}
.btnLogout
{
@@ -545,7 +544,6 @@
background-color: #FFCCAA;
white-space: pre;
font-size: 9pt;
font-weight: bold;
}
.btnBarcodeSmall
{
@@ -555,18 +553,16 @@
background-color: #AAFFFF;
white-space: pre;
font-size: 9pt;
font-weight: bold;
}
.btnPrendiInCarico
{
width: 140px;
width: 90px;
height: 40px;
border: solid 2px red;
background-color: #FFCCAA;
white-space: pre;
font-size: 9pt;
font-weight: bold;
}
.errore
GMW/GMW_Term/UDC.aspx.cs
+3
View File
@@ -21,6 +21,9 @@ namespace GMW_Term
mod_barcode1.eh_scannedUser += new EventHandler(mod_barcode1_eh_scannedUser);
mod_barcode1.eh_scannedCella += new EventHandler(mod_barcode1_eh_scannedCella);
mod_barcode1.eh_resetUser += new EventHandler(mod_barcode1_eh_resetUser);
// imposto btnHome
mod_barcode1.homeBtnText = "btnTermMenuLDP";
mod_barcode1.homeBtnLink = "~/menuLDP.aspx";
}
void mod_barcode1_eh_scannedCella(object sender, EventArgs e)
GMW/GMW_Term/Web.config
+1 -1
View File
@@ -58,7 +58,7 @@
<add key="appName" value="GMW_Term" />
<add key="SiteName" value="Tekal" />
<add key="mainRev" value="1.2" />
<add key="minRev" value="428" />
<add key="minRev" value="429" />
<add key="copyRight" value="SteamWare © 2010-2012" />
<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_interrMov.ascx
+109 -147
View File
@@ -1,84 +1,67 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_interrMov.ascx.cs"
Inherits="GMW_Term.WebUserControls.mod_interrMov" %>
<div class="quadro_wide">
<asp:Button runat="server" ID="btnResetCtrl" OnClick="btnResetCtrl_Click" />
<asp:LinkButton ID="btnReset" runat="server" OnClick="btnResetCtrl_Click" CssClass="styleBtnComposito"
Height="20" Width="80px">
<img src="images/cancel_m.png" style="border-style: none; margin-right: 0.2em;" width="13px"
height="13px" />
<asp:Label ID="lblReset" runat="server" Text="Reset" />
</asp:LinkButton>
</div>
<asp:Panel runat="server" ID="pnlDetailCella">
<asp:FormView ID="frmViewCella" runat="server" DataSourceID="odsCella" AllowPaging="True">
<ItemTemplate>
<table>
<tr>
<td>
<div class="labelSmall" style="float: left;">
<asp:Label runat="server" ID="lblUDC" Text="UDC" />
</div>
</td>
<td>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="valUDC" Text='<%# Eval("UDC") %>' />
</div>
</td>
</tr>
<tr>
<td>
<div class="labelSmall" style="float: left;">
<asp:Label runat="server" ID="lblPart" Text="Particolare" />
</div>
</td>
<td>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="valPart" Text='<%# Eval("Particolare") %>' />
</div>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label2" Text='<%# Eval("DescParticolare") %>' />
</div>
</td>
</tr>
<tr>
<td>
<div class="labelSmall" style="float: left;">
<asp:Label runat="server" ID="Label4" Text="Data" />
</div>
</td>
<td>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label5" Text='<%# Eval("DataFus") %>' />
</div>
</td>
</tr>
<tr>
<td>
<div class="valoreSmall" style="float: left;">
<asp:Label runat="server" ID="Label1" Text='<%# Eval("DescStato") %>' />
</div>
</td>
<td>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label3" Text='<%# Eval("Qta","{0} pz") %>' />
</div>
</td>
</tr>
<tr>
<td>
<div class="valoreSmall" style="float: left;">
<asp:Label runat="server" ID="Label6" Text='<%# Eval("CodMag","Mag: {0}") %>' />
<asp:Label runat="server" ID="Label8" Text='<%# Eval("CodBlocco",", blocco: {0}") %>' />
</div>
</td>
<td>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label7" Text='<%# Eval("CodCella") %>' />
</div>
</td>
</tr>
<tr>
<td colspan="2">
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label11" Text='<%# Eval("Note") %>' />
</div>
</td>
</tr>
</table>
<div class="clearAll">
<div class="labelSmall" style="float: left;">
<asp:Label runat="server" ID="lblUDC" Text="UDC" />
</div>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="valUDC" Text='<%# Eval("UDC") %>' />
</div>
</div>
<div class="clearAll">
<div class="labelSmall" style="float: left;">
<asp:Label runat="server" ID="lblPart" Text="Particolare" />
</div>
<div style="float: right;">
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="valPart" Text='<%# Eval("Particolare") %>' />
</div>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label2" Text='<%# Eval("DescParticolare") %>' />
</div>
</div>
</div>
<div class="clearAll">
<div class="labelSmall" style="float: left;">
<asp:Label runat="server" ID="Label4" Text="Data" />
</div>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label5" Text='<%# Eval("DataFus") %>' />
</div>
</div>
<div class="clearAll">
<div class="valoreSmall" style="float: left;">
<asp:Label runat="server" ID="Label1" Text='<%# Eval("DescStato") %>' />
</div>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label3" Text='<%# Eval("Qta","{0} pz") %>' />
</div>
</div>
<div class="clearAll">
<div class="valoreSmall" style="float: left;">
<asp:Label runat="server" ID="Label6" Text='<%# Eval("CodMag","Mag: {0}") %>' />
<asp:Label runat="server" ID="Label8" Text='<%# Eval("CodBlocco",", blocco: {0}") %>' />
</div>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label7" Text='<%# Eval("CodCella") %>' />
</div>
</div>
<div class="clearAll">
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label11" Text='<%# Eval("Note") %>' />
</div>
</div>
</ItemTemplate>
</asp:FormView>
<asp:ObjectDataSource ID="odsCella" runat="server" SelectMethod="getByCodCella" TypeName="GMW_data.DS_magazzinoTableAdapters.v_UdcDetailTableAdapter">
@@ -90,79 +73,58 @@
<asp:Panel runat="server" ID="pnlDetailUdc">
<asp:FormView ID="frmViewUdc" runat="server" DataSourceID="odsUdc">
<ItemTemplate>
<table>
<tr>
<td>
<div class="labelSmall" style="float: left;">
<asp:Label runat="server" ID="lblUDC" Text="UDC" />
</div>
</td>
<td>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="valUDC" Text='<%# Eval("UDC") %>' />
</div>
</td>
</tr>
<tr>
<td>
<div class="labelSmall" style="float: left;">
<asp:Label runat="server" ID="lblPart" Text="Particolare" />
</div>
</td>
<td>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="valPart" Text='<%# Eval("Particolare") %>' />
</div>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label2" Text='<%# Eval("DescParticolare") %>' />
</div>
</td>
</tr>
<tr>
<td>
<div class="labelSmall" style="float: left;">
<asp:Label runat="server" ID="Label4" Text="Data" />
</div>
</td>
<td>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label5" Text='<%# Eval("DataFus") %>' />
</div>
</td>
</tr>
<tr>
<td>
<div class="valoreSmall" style="float: left;">
<asp:Label runat="server" ID="Label1" Text='<%# Eval("DescStato") %>' />
</div>
</td>
<td>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label3" Text='<%# Eval("Qta","{0} pz") %>' />
</div>
</td>
</tr>
<tr>
<td>
<div class="valoreSmall" style="float: left;">
<asp:Label runat="server" ID="Label6" Text='<%# Eval("CodMag","Mag: {0}") %>' />
<asp:Label runat="server" ID="Label8" Text='<%# Eval("CodBlocco",", blocco: {0}") %>' />
</div>
</td>
<td>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label7" Text='<%# Eval("CodCella") %>' />
</div>
</td>
</tr>
<tr>
<td colspan="2">
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label11" Text='<%# Eval("Note") %>' />
</div>
</td>
</tr>
</table>
<div class="clearAll">
<div class="labelSmall" style="float: left;">
<asp:Label runat="server" ID="lblUDC" Text="UDC" />
</div>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="valUDC" Text='<%# Eval("UDC") %>' />
</div>
</div>
<div class="clearAll">
<div class="labelSmall" style="float: left;">
<asp:Label runat="server" ID="lblPart" Text="Particolare" />
</div>
<div style="float: right;">
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="valPart" Text='<%# Eval("Particolare") %>' />
</div>
<br />
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label2" Text='<%# Eval("DescParticolare") %>' />
</div>
</div>
</div>
<div class="clearAll">
<div class="labelSmall" style="float: left;">
<asp:Label runat="server" ID="Label4" Text="Data" />
</div>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label5" Text='<%# Eval("DataFus") %>' />
</div>
</div>
<div class="clearAll">
<div class="valoreSmall" style="float: left;">
<asp:Label runat="server" ID="Label1" Text='<%# Eval("DescStato") %>' />
</div>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label3" Text='<%# Eval("Qta","{0} pz") %>' />
</div>
</div>
<div class="clearAll">
<div class="valoreSmall" style="float: left;">
<asp:Label runat="server" ID="Label6" Text='<%# Eval("CodMag","Mag: {0}") %>' />
<asp:Label runat="server" ID="Label8" Text='<%# Eval("CodBlocco",", blocco: {0}") %>' />
</div>
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label7" Text='<%# Eval("CodCella") %>' />
</div>
</div>
<div class="clearAll">
<div class="valoreSmall" style="float: right;">
<asp:Label runat="server" ID="Label11" Text='<%# Eval("Note") %>' />
</div>
</div>
</ItemTemplate>
</asp:FormView>
<asp:ObjectDataSource ID="odsUdc" runat="server" SelectMethod="getByFullUdc" TypeName="GMW_data.DS_magazzinoTableAdapters.v_UdcDetailTableAdapter">
GMW/GMW_Term/WebUserControls/mod_interrMov.ascx.cs
+5 -4
View File
@@ -21,9 +21,10 @@ namespace GMW_Term.WebUserControls
{
pnlDetailCella.Visible = false;
pnlDetailUdc.Visible = false;
btnResetCtrl.Visible = false;
btnReset.Visible = false;
}
btnResetCtrl.Text = traduci("btnResetCtrl");
lblReset.Text = traduci("btnResetCtrl");
btnReset.Text = traduci("btnResetCtrl");
}
/// <summary>
/// wrapper traduzione termini
@@ -43,7 +44,7 @@ namespace GMW_Term.WebUserControls
memLayer.ML.setSessionVal("CodCS", memLayer.ML.confReadString("CodCS"));
pnlDetailCella.Visible = false;
pnlDetailUdc.Visible = true;
btnResetCtrl.Visible = true;
btnReset.Visible = true;
}
/// <summary>
/// mostro i dettagli dell'udc indicato
@@ -53,7 +54,7 @@ namespace GMW_Term.WebUserControls
memLayer.ML.setSessionVal("codCella4det_sel", codCella);
pnlDetailCella.Visible = true;
pnlDetailUdc.Visible = false;
btnResetCtrl.Visible = true;
btnReset.Visible = true;
}
/// <summary>
/// ricarica apgina corrente
GMW/GMW_Term/WebUserControls/mod_interrMov.ascx.designer.cs
Generated
+11 -2
View File
@@ -14,13 +14,22 @@ namespace GMW_Term.WebUserControls {
public partial class mod_interrMov {
/// <summary>
/// btnResetCtrl control.
/// btnReset control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnResetCtrl;
protected global::System.Web.UI.WebControls.LinkButton btnReset;
/// <summary>
/// lblReset control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblReset;
/// <summary>
/// pnlDetailCella control.
GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx
+4 -3
View File
@@ -100,13 +100,15 @@
</div>
</asp:Panel>
<asp:Panel runat="server" ID="pnlDetail" Visible="false">
<div>
<div style="background-color: #ACACAC;">
<asp:Button ID="btnBarcode" runat="server" OnClick="btnBarcode_Click" CssClass="btnBarcodeSmall" />
<asp:Button ID="btnCloseDet" runat="server" OnClick="btnCloseDet_Click" CssClass="btnHome" />
<asp:Button ID="btnCloseDet" runat="server" OnClick="btnCloseDet_Click" CssClass="btnHome"
Visible="false" />
<asp:Button ID="btnPrendiInCarico" runat="server" OnClick="btnPrendiInCarico_Click"
CommandArgument="" CssClass="btnPrendiInCarico" Visible='<%# enabledPrendiInCarico() %>' />
<%--<cc1:ConfirmButtonExtender ID="cbeCambiaStato" runat="server" ConfirmText='<%# traduci(cmdArgStato(Eval("CodStatoLista")))%>'
TargetControlID="btnPrendiInCarico" />--%>
<asp:Button runat="server" ID="btnShowPeriodo" OnClick="btnShowPeriodo_Click" CssClass="btnShowPeriodo" />
</div>
<div id="smallGridDetail">
<asp:GridView ID="grViewDetail" runat="server" AllowPaging="True" AllowSorting="True"
@@ -178,5 +180,4 @@
</asp:ObjectDataSource>
</div>
</asp:Panel>
<asp:Button runat="server" ID="btnShowPeriodo" OnClick="btnShowPeriodo_Click" CssClass="btnShowPeriodo" />
</div>
GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs
+6 -2
View File
@@ -500,7 +500,11 @@ namespace GMW_Term.WebUserControls
else if (esitoCompleta == esitoOperazione.errore_noUdc)
{
GMW_data.MagClass.magazzino.attivaListaPrelievo(memLayer.ML.StringSessionObj("CodCS"), codLista, CodSoggetto);
logger.lg.scriviLog(string.Format("Lista di prelievo {0} rilasciata poiché senza UDC prelevati da aprte dell'opertore {1}", codLista, CodSoggetto), tipoLog.INFO);
logger.lg.scriviLog(string.Format("Lista di prelievo {0} rilasciata poiché senza UDC prelevati da parte dell'opertore {1}", codLista, CodSoggetto), tipoLog.INFO);
// tolgo dalla session la lista prelievo attuale...
memLayer.ML.emptySessionVal("CodLista_sel");
memLayer.ML.emptySessionVal("CodListaAttiva");
memLayer.ML.emptySessionVal("activeTask");
}
}
/// <summary>
@@ -620,7 +624,7 @@ namespace GMW_Term.WebUserControls
}
catch
{ }
btnPrendiInCarico.Text = "[4]-" + traduci(string.Format("txt_{0}", cmdArgStato(codStatoLista)));
btnPrendiInCarico.Text = string.Format("{0}\n[Alt+{1}]", traduci(string.Format("txt_{0}", cmdArgStato(codStatoLista))), 4);
btnPrendiInCarico.AccessKey = "4";
btnPrendiInCarico.ToolTip = traduci(cmdArgStato(codStatoLista));
btnPrendiInCarico.CommandArgument = cmdArgStato(codStatoLista);
GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.designer.cs
Generated
+10 -10
View File
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4959
// Runtime Version:2.0.50727.4963
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -112,6 +112,15 @@ namespace GMW_Term.WebUserControls {
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnPrendiInCarico;
/// <summary>
/// btnShowPeriodo control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnShowPeriodo;
/// <summary>
/// grViewDetail control.
/// </summary>
@@ -129,14 +138,5 @@ namespace GMW_Term.WebUserControls {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsDetail;
/// <summary>
/// btnShowPeriodo control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnShowPeriodo;
}
}
GMW/GMW_Term/WebUserControls/mod_menuLDP.ascx.cs
+1 -1
View File
@@ -68,7 +68,7 @@ namespace GMW_Term.WebUserControls
protected void btn1_Click(object sender, EventArgs e)
{
Response.Redirect("Barcode.aspx");
Response.Redirect("UDC.aspx");
}
protected void btn2_Click(object sender, EventArgs e)
GMW/GMW_Term/WebUserControls/mod_processPackList.ascx
+1 -1
View File
@@ -1,6 +1,6 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_processPackList.ascx.cs"
Inherits="GMW_Term.WebUserControls.mod_processPackList" %>
<div style="font-size: large">
<div style="font-size: normal">
<div>
<div style="float: left;">
<asp:Label runat="server" ID="lblListaAttiva" />
GMW/GMW_Term/WebUserControls/mod_processPackList.ascx.cs
+11 -3
View File
@@ -49,8 +49,7 @@ namespace GMW_Term.WebUserControls
lblErrore.Visible = true;
lblErrore.Text = traduci("BarcodeNonValidoLDP");
}
// svuoto barcode selezionato
memLayer.ML.emptySessionVal("Barcode_sel");
resetMemoriaBarcode();
}
}
else
@@ -58,6 +57,7 @@ namespace GMW_Term.WebUserControls
// indico barcode già caricato
lblErrore.Visible = true;
lblErrore.Text = string.Format("{0}: {1}", barcode, traduci("udcGiaPrelevato"));
resetMemoriaBarcode();
}
//update visualizzazione
lblListaAttiva.Text = traduci("ListaPrel");
@@ -71,11 +71,19 @@ namespace GMW_Term.WebUserControls
DS_magazzino.ElencoListePrelievoRow riga = MagClass.magazzino.taElencoListePrelievo.getByCodLista(MagClass.magazzino.codListaAttivaUtente)[0];
lblDest.Text = riga.Destinatario;
lblProd.Text = riga.Particolare;
lblPezzi.Text = string.Format("<b>{0}</b>/{1} pz", riga.Prelevato, riga.QtaTot);
lblPezzi.Text = string.Format("<b>{0:###}</b>/{1:###} pz", riga.Prelevato, riga.QtaTot);
hlListaAttiva.Text = MagClass.magazzino.codListaAttivaUtente;
}
catch
{ }
}
private static void resetMemoriaBarcode()
{
// svuoto barcode selezionato ed eventuale UDC
memLayer.ML.emptySessionVal("UDC_sel");
memLayer.ML.emptySessionVal("Barcode_sel");
memLayer.ML.emptySessionVal("scannedValue");
}
}
}
GMW/GMW_Term/WebUserControls/mod_processPackList.ascx.designer.cs
Generated
+1 -1
View File
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4959
// Runtime Version:2.0.50727.4963
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
GMW/GMW_Term/WebUserControls/mod_smartList.ascx
+7 -13
View File
@@ -1,7 +1,7 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_smartList.ascx.cs"
Inherits="GMW_Term.WebUserControls.mod_smartList" %>
<div style="font-size: normal">
<div>
<div class="clearAll">
<div style="float: left;">
<asp:Label runat="server" ID="lblTotColli" />
</div>
@@ -11,9 +11,7 @@
</b>
</div>
</div>
<div id="Div1" class="clearAll">
</div>
<div>
<div class="clearAll">
<div style="float: left;">
<asp:Label runat="server" ID="lblParticolari" />
</div>
@@ -21,27 +19,23 @@
<asp:Label runat="server" ID="lblNumPart" />
</div>
</div>
<div id="cl1" class="clearAll">
</div>
<div>
<div class="clearAll">
<div class="errore">
<asp:Label runat="server" ID="lblErrore" />
</div>
</div>
<div id="Div3" class="clearAll">
</div>
<div>
<div class="clearAll">
<div style="float: left;">
<asp:LinkButton ID="btnGeneraListe" runat="server" OnClick="btnGeneraListe_Click"
CssClass="styleBtnComposito" Height="30">
CssClass="styleBtnComposito" Height="20">
<img src="images/new_m.png" style="border-style: none; margin-right: 0.2em;" width="13px"
height="13px" />
<asp:Label ID="lblGeneraListe" runat="server" />
</asp:LinkButton>
</div>
<div style="float: right;">
<asp:LinkButton ID="btnResetListe" runat="server" OnClick="btnResetListe_Click"
CssClass="styleBtnComposito" Height="30">
<asp:LinkButton ID="btnResetListe" runat="server" OnClick="btnResetListe_Click" CssClass="styleBtnComposito"
Height="20">
<img src="images/cancel_m.png" style="border-style: none; margin-right: 0.2em;" width="13px"
height="13px" />
<asp:Label ID="lblResetListe" runat="server" />
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/mazzAppSettingsTK_test.config
+1 -1
View File
@@ -67,7 +67,7 @@
<!--Permette prelievo/deposito da terminalino senza sparare barcode (con img frecce) -->
<add key="PrelDepoTermEnabled" value="true" />
<!--codice per barcode chiusura lista prelievo-->
<add key="closeCodeLdp" value="CLZ" />
<add key="closeCodeLdp" value="CLOSE" />
<!--setup LDP Smart-->
<add key="LdpSmartTipoLDP" value="00-Smart" />
<add key="LdpSmartDest" value="C001" />
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
+3 -3
View File
@@ -344,14 +344,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMWT"
"ProductCode" = "8:{6CD3FC34-539E-41F3-9374-394EF05EAB00}"
"PackageCode" = "8:{00EB130E-692D-454C-9FD3-63A4B5DDC56A}"
"ProductCode" = "8:{CFD2CC0D-5168-49AD-94BD-C9E6BE392983}"
"PackageCode" = "8:{1D4F0A02-7163-4363-AED0-DEE90899086E}"
"UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.1.428"
"ProductVersion" = "8:1.1.429"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
GMW/GMW_Term_installer/Release/GMW_Term_installer.msi
BIN
View File
Binary file not shown.
GMW/GMW_data/MagClass.cs
+9 -4
View File
@@ -1080,7 +1080,6 @@ namespace GMW_data
{
// da chiamare quando clicco e inizio lista prelievo .... vedi sopra
esitoOperazione answ = esitoOperazione.errore;
try
{
// la query recupera la lista in base al CodLista
@@ -1096,7 +1095,13 @@ namespace GMW_data
taElencoListePrelievo.updateStato(CodSoggetto, CodLista, (int)statoLista.generata);
answ = esitoOperazione.ok;
}
// se è già completata o iniziata dà errore
// se è solo iniziata permetto di riportarla a generata...
else if (riga.CodStatoLista == (int)statoLista.iniziata)
{
taElencoListePrelievo.updateStato(CodSoggetto, CodLista, (int)statoLista.generata);
answ = esitoOperazione.ok;
}
// se è già completata dà errore
else
{
answ = esitoOperazione.errore_readOnly;
@@ -1166,8 +1171,6 @@ namespace GMW_data
/// <returns></returns>
public esitoOperazione completaListaPrelievo(string CodCS, string CodLista, string CodSoggetto)
{
memLayer.ML.emptySessionVal("CodListaAttiva");
memLayer.ML.emptySessionVal("activeTask");
// da chiamare quando clicco e inizio lista prelievo .... vedi sopra
esitoOperazione answ = esitoOperazione.errore;
try
@@ -1216,6 +1219,8 @@ namespace GMW_data
// aggiorno stato lista
taElencoListePrelievo.updateStato(CodSoggetto, CodLista, (int)statoLista.completata);
answ = esitoOperazione.ok;
memLayer.ML.emptySessionVal("CodListaAttiva");
memLayer.ML.emptySessionVal("activeTask");
}
else //nessun UDC prelevato
{
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/obj/Debug/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/GMW_data/obj/Release/GMW_data.dll
BIN
View File
Binary file not shown.