Inizio vers 657 x fix controlli in postazione liquidi

- serve SEMPRE un assieme per proseguire
- non forzare DTX se non c'è un UDC di pezzi dello stesso particolare in destinazione
This commit is contained in:
Samuele Locatelli
2014-04-04 17:14:21 +02:00
parent 282b3a36b2
commit ff754d10fd
23 changed files with 403 additions and 441 deletions
+2
View File
@@ -93,10 +93,12 @@ Global
{61B87B96-39D3-4BB4-82BF-EE4B96095C1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61B87B96-39D3-4BB4-82BF-EE4B96095C1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{61B87B96-39D3-4BB4-82BF-EE4B96095C1C}.Release|Any CPU.Build.0 = Release|Any CPU
{61B87B96-39D3-4BB4-82BF-EE4B96095C1C}.Release|Any CPU.Deploy.0 = Release|Any CPU
{61B87B96-39D3-4BB4-82BF-EE4B96095C1C}.SP_prod|Any CPU.ActiveCfg = Release|Any CPU
{61B87B96-39D3-4BB4-82BF-EE4B96095C1C}.SP_prod|Any CPU.Build.0 = Release|Any CPU
{61B87B96-39D3-4BB4-82BF-EE4B96095C1C}.SP_test|Any CPU.ActiveCfg = Release|Any CPU
{61B87B96-39D3-4BB4-82BF-EE4B96095C1C}.SP_test|Any CPU.Build.0 = Release|Any CPU
{61B87B96-39D3-4BB4-82BF-EE4B96095C1C}.SP_test|Any CPU.Deploy.0 = Release|Any CPU
{61B87B96-39D3-4BB4-82BF-EE4B96095C1C}.TK_prod|Any CPU.ActiveCfg = Release|Any CPU
{61B87B96-39D3-4BB4-82BF-EE4B96095C1C}.TK_prod|Any CPU.Build.0 = Release|Any CPU
{61B87B96-39D3-4BB4-82BF-EE4B96095C1C}.TK_test|Any CPU.ActiveCfg = Release|Any CPU
+7 -8
View File
@@ -2,17 +2,16 @@
<%@ Register Src="~/WebUserControls/mod_testata.ascx" TagPrefix="uc1" TagName="mod_testata" %>
<!DOCTYPE html>
<html lang="en">
<html xmlns="http://www.w3.org/1999/xhtml">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<head runat="server">
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="GMW site">
<meta name="author" content="Steamware">
<link rel="shortcut icon" href="~/favicon.ico">
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="description" content="GMW site" />
<meta name="author" content="Steamware" />
<link rel="shortcut icon" href="~/favicon.ico" />
<link href="~/favicon.ico" rel="shortcut icon" type="image/x-icon" />
<title><%: Page.Title %> - GMW</title>
+2 -1
View File
@@ -1,5 +1,6 @@
html {
background-color: #e2e2e2;
background-color: #dcdcdc;
min-height:100%;
margin: 0;
padding: 0;
}
+2 -2
View File
@@ -8,9 +8,9 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("GMW")]
[assembly: AssemblyDescription("Gestione Magazzino Web")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Steamware")]
//[assembly: AssemblyCompany("Steamware")]
[assembly: AssemblyProduct("GMW")]
[assembly: AssemblyCopyright("Steamware © 2010-2014")]
//[assembly: AssemblyCopyright("Steamware © 2010+")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
+5 -3
View File
@@ -112,6 +112,7 @@
background-image: url(images/empty.png);
}
.btnRosso {
border: solid 2px red;
background-color: #FFAAAA;
@@ -601,7 +602,7 @@
background-repeat: repeat-x;
background-position: 0% 0%;
background-attachment: scroll;
background-image: url(images/orangeGrad32.png);
background-image: url(images/bluGrad32.png);
}
.ShadowText {
@@ -692,7 +693,7 @@
}
.barraTitolo {
background-color: #FF904C;
background-color: #4C90FF;
vertical-align: middle;
height: 20pt;
text-align: center;
@@ -1021,6 +1022,7 @@ A:hover {
.fontPiccolo {
font-size: 8pt;
}
@@ -1030,7 +1032,7 @@ A:hover {
}
.fontGrande {
font-size: 14pt;
font-size: 12pt;
}
.divCenter {
+4 -7
View File
@@ -261,7 +261,10 @@ namespace GMW.WebUserControls
/// </summary>
private void setDefaultVal()
{
sourceAL = currAL;
if (currAL != "")
{
sourceAL = currAL;
}
destAL = AlByCella;
}
/// <summary>
@@ -713,12 +716,6 @@ namespace GMW.WebUserControls
{
// chiamo stored x sistemazione AL:
MagClass.magazzino.eliminaEmptyAL(sourceAL, MagClass.magazzino.CodSoggCurrUser);
// NON SVUOTO l'AL
#if false
forceDelete = false;
sourceAL = "";
currAL = "";
#endif
Postazione.warningText = "";
Postazione.messaggiText = "";
Postazione.CssClass = "stileAttesa";
@@ -1,115 +1,102 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_sanpos_controlloLiquidi.ascx.cs" Inherits="GMW.WebUserControls.mod_sanpos_controlloLiquidi" %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
<%@ Register Src="mod_storicoAzioniOperatore.ascx" TagName="mod_storicoAzioniOperatore" TagPrefix="uc1" %>
<% if (false)
{ %>
<link href="../Style.css" rel="stylesheet" type="text/css" />
<% } %>
<asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa" Height="100%">
<div style="height: 100%;">
<div style="float: none; text-align: center; margin: auto;">
<div class="fullPageHeader">
<div style="float: left; text-align: left;">
<asp:Label runat="server" ID="lblPostazione" />
<br />
<asp:Button runat="server" ID="btnRefresh" Text="" />
<asp:Button runat="server" ID="btnShowHideStorico" OnClick="btnShowHideStorico_Click" Width="242px" />
<%--<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>--%>
<%if (false)
{ %>
<webopt:BundleReference ID="BundleReference1" runat="server" Path="~/Content/css" />
<webopt:BundleReference ID="BundleReference2" runat="server" Path="~/Content/themes/base/css" />
<%} %>
<div class="row" style="padding-top: 2px; padding-bottom: 2px;">
<div class="col-sm-4 col-lg-3">
<div id="divNumTratt" runat="server" class="panel panel-warning panel-sm">
<div class="panel-heading">
<b><%: traduci("Trattamenti") %></b>
</div>
<div class="panel-body">
<div class="row">
<div class="col-sm-9">
<div class="bg-primary">
<%: traduci("lblNumTratt") %>
</div>
</div>
</div>
<div style="float: right;">
<asp:Label runat="server" ID="lblPrinter" />
<br />
&nbsp;
</div>
<div>
<asp:Label runat="server" ID="lblCurrentPage" Text="Pag Corrente" Font-Size="16pt" ForeColor="White" />
<br />
<asp:HyperLink runat="server" ID="hlMenu" NavigateUrl="~/menu.aspx" Text="Main Menu" />
<div class="row">
<div class="col-sm-9">
<asp:TextBox runat="server" ID="txtTratt" Height="56px" Width="100%" Font-Size="32pt" TabIndex="6" />
<asp:RegularExpressionValidator ID="revNumTratt" runat="server" ErrorMessage="!!! [1...999999] !!!" ValidationExpression="\d{1,6}" ControlToValidate="txtTratt" Display="Dynamic" />
<asp:ListBox ID="lbTrattamenti" runat="server" Height="160px" Width="100%" Font-Size="20pt" TabIndex="10" />
<div class="bg-primary">
<%: traduci("lblAnnoTratt") %>
</div>
<asp:TextBox runat="server" ID="txtAnno" Height="56px" Width="100%" Font-Size="32pt" TabIndex="9" Style="text-align: center" />
</div>
<div class="col-sm-3 text-center">
<div>
<asp:Button runat="server" CssClass="btn btn-default" ID="btnAdd" Height="56px" Width="40px" Font-Size="20pt" Text="+" OnClick="btnAdd_Click" TabIndex="7" />
</div>
<div>
<asp:Button runat="server" CssClass="btn btn-default" ID="btnSvuota" Height="56px" Width="40px" Font-Size="20pt" Text="-" OnClick="btnSvuota_Click" TabIndex="8" />
</div>
</div>
</div>
</div>
</div>
<asp:Panel ID="pnlSAO" runat="server" ScrollBars="None">
<div style="float: left; height: 100%; min-height: 600px; min-width: 240px; border-right: 1px solid #333333; border-bottom: 1px solid #333333; background-color: #6C90FF;">
<div style="background-color: #6C90FF; margin: 4px;">
<uc1:mod_storicoAzioniOperatore ID="mod_storicoAzioniOperatore1" runat="server" canSelPost="false" />
</div>
</div>
</asp:Panel>
<div style="float: none; text-align: center; margin: auto;">
<div>
<asp:Label runat="server" ID="lblParticolareAttivo" Font-Size="36pt" Text="- no data -" />
</div>
<div>
<asp:Label runat="server" ID="lblDescrAttivo" Font-Size="28pt" Text="- no data -" ToolTip="particolare" />
&nbsp
<asp:Label runat="server" ID="lblDisegno" Font-Size="28pt" Text="" ForeColor="#FFFFFF" Font-Bold="true" ToolTip="disegno" />
</div>
<div class="msgBoxBarcode">
<asp:Label runat="server" ID="lblMessaggi" Text="attesa input utente" Font-Size="18pt" />
<br />
<asp:Label runat="server" ID="lblWarning" Visible="false" Text="ATTENZIONE!!! Postazione non configurata!" Font-Size="XX-Large" ForeColor="Red" />
</div>
</div>
<div class="col-sm-4 col-lg-6">
<div>
<asp:Label runat="server" ID="lblParticolareAttivo" Font-Size="24pt" Text="- no data -" />
</div>
<div>
<div style="float: left; padding: 4px; text-align: left; width: 220px; height: 300px;">
<asp:Label runat="server" ID="lblDescrAttivo" Font-Size="20pt" Text="- no data -" ToolTip="particolare" />
&nbsp
<asp:Label runat="server" ID="lblDisegno" Font-Size="20pt" Text="" ForeColor="#FFFFFF" Font-Bold="true" ToolTip="disegno" />
</div>
<div>
<div id="divBarcode" runat="server">
<div>
<asp:Label runat="server" ID="lblNumTratt" />
</div>
<div class="clearDiv">
</div>
<div style="padding: 2px;">
<div style="float: left;">
<asp:TextBox runat="server" ID="txtTratt" Height="56px" Width="160px" Font-Size="32pt" TabIndex="6" />
<asp:RegularExpressionValidator ID="revNumTratt" runat="server" ErrorMessage="!!! [1...999999] !!!" ValidationExpression="\d{1,6}" ControlToValidate="txtTratt" Display="Dynamic" />
<div>
<asp:Label runat="server" ID="lblBarcode" Text="Barcode" />
</div>
<div style="float: right;">
<asp:Button runat="server" ID="btnAdd" Height="56px" Width="40px" Font-Size="20pt" Text="+" OnClick="btnAdd_Click" TabIndex="7" />
</div>
</div>
<div style="clear: both;">
</div>
<div style="padding: 2px;">
<div style="float: left;">
<asp:ListBox ID="lbTrattamenti" runat="server" Height="160px" Width="166px" Font-Size="20pt" TabIndex="10" />
</div>
<div style="float: right;">
<asp:Button runat="server" ID="btnSvuota" Height="56px" Width="40px" Font-Size="20pt" Text="-" OnClick="btnSvuota_Click" TabIndex="8" />
</div>
</div>
<div style="clear: both;">
</div>
<div style="padding: 2px;">
<asp:Label runat="server" ID="lblAnnoTratt" />
<br />
<asp:TextBox runat="server" ID="txtAnno" Height="56px" Width="166px" Font-Size="32pt" TabIndex="9" Style="text-align: center" />
</div>
</div>
<div style="float: right; padding: 4px; text-align: right; width: 180px; height: 300px;">
<div style="float: right; text-align: center;">
<asp:Label runat="server" ID="lblQta" />
<br />
<asp:TextBox runat="server" ID="txtQta" Height="56px" Width="160px" Font-Size="32pt" Style="text-align: center" TabIndex="4" />
</div>
<div style="clear: both;">
<br />
</div>
<asp:Button runat="server" ID="btnStampa" Height="120px" Width="166px" Font-Size="20pt" OnClick="btnStampa_Click" TabIndex="5" />
</div>
<div style="float: none; padding: 4px; text-align: center; margin: auto;">
<div>
<asp:Label runat="server" ID="lblBarcode" Text="Barcode" />
<br />
<asp:TextBox runat="server" ID="txtBarcode" Height="56px" Width="400px" Font-Size="32pt" AutoPostBack="True" Style="text-align: center" TabIndex="1" />
<asp:AutoCompleteExtender ID="aceParticolare" runat="server" TargetControlID="txtBarcode" ServicePath="~/WS/AutoCompletamento.asmx" MinimumPrefixLength="2" CompletionInterval="20" ServiceMethod="elencoParticolari" />
</div>
</div>
<%--<asp:AutoCompleteExtender ID="aceParticolare" runat="server" TargetControlID="txtBarcode" ServicePath="~/WS/AutoCompletamento.asmx" MinimumPrefixLength="2" CompletionInterval="20" ServiceMethod="elencoParticolari" />--%>
<div id="divNote" runat="server">
<div>
<%: traduci("Note") %>
</div>
<div>
<asp:Label runat="server" ID="lblNote" />
<br />
<asp:TextBox runat="server" ID="txtNote" Height="120px" Width="400px" Font-Size="24pt" TextMode="MultiLine" TabIndex="2" />
<br />
<br />
</div>
<div>
<asp:Button runat="server" ID="btnEmptyNote" Height="30px" Width="180px" OnClick="btnEmptyNote_Click" TabIndex="3" />
</div>
</div>
</div>
</div>
</asp:Panel>
<div class="col-sm-4 col-lg-3">
<div id="divQta" runat="server" class="panel panel-primary panel-sm">
<div class="panel-heading">
<b><%: traduci("lbtGeneraUDC") %></b>
</div>
<div class="panel-body">
<div class="row">
<div class="col-sm-12">
<div class="bg-primary">
<%: traduci("lblQuantita") %>
</div>
<asp:TextBox runat="server" ID="txtQta" Height="56px" Width="100%" Font-Size="32pt" Style="text-align: center" TabIndex="4" />
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<asp:Button runat="server" ID="btnStampa" CssClass="btn btn-warning" Height="120px" Width="100%" Font-Size="20pt" OnClick="btnStampa_Click" TabIndex="5" />
</div>
</div>
</div>
</div>
@@ -39,12 +39,7 @@ namespace GMW.WebUserControls
{
if (!Page.IsPostBack)
{
calcolaPostazione();
traduciObj();
storicoVisibile = false;
fixStorico();
// imposto pos abilitata x cancellazione
mod_storicoAzioniOperatore1.IdxPosizione2del = memLayer.ML.confReadInt("IdxPosizioneLiquidi");
}
doChecks();
if (currParticolare != "")
@@ -70,7 +65,6 @@ namespace GMW.WebUserControls
lblDescrAttivo.Text = "";
lblDisegno.Text = "";
}
mod_storicoAzioniOperatore1.eh_stampa += new EventHandler(mod_storicoAzioniOperatore1_eh_stampa);
}
/// <summary>
/// richiesta (ri)stampa UDC
@@ -107,9 +101,9 @@ namespace GMW.WebUserControls
logger.lg.scriviLog(string.Format("Errore recupero particolare UDC Controllo Liquidi {0}", udcReq), tipoLog.EXCEPTION);
}
// stampo
MagClass.magazzino.stampaUdc(udcReq, postazione_printer, cart, Request.UserHostName);
MagClass.magazzino.stampaUdc(udcReq, Postazione.printer, cart, Request.UserHostName);
// registro azione
MagClass.magazzino.taSAO.insertQuery(adesso, MagClass.magazzino.CodSoggCurrUser, postazione_name, postazione_IP, udcReq, particolare, "stampaUDC", "Ri-Stampato UDC F10");
MagClass.magazzino.taSAO.insertQuery(adesso, MagClass.magazzino.CodSoggCurrUser, Postazione.name, Postazione.IP, udcReq, particolare, "stampaUDC", "Ri-Stampato UDC F10");
}
/// <summary>
/// udc da stampare
@@ -134,14 +128,6 @@ namespace GMW.WebUserControls
/// </summary>
private void traduciObj()
{
// labels
lblPostazione.Text = string.Format("{2}: {0} ({1})", postazione_name, postazione_IP, traduci("postazione"));
lblPrinter.Text = string.Format("{1}: {0}", postazione_printer, traduci("stampante"));
lblNumTratt.Text = traduci("lblNumTratt");
lblQta.Text = traduci("lblQuantita");
lblNote.Text = traduci("lblNote");
lblAnnoTratt.Text = traduci("lblAnnoTratt");
lblCurrentPage.Text = traduci(PagCorrente);
//txtBox
txtQta.Text = memLayer.ML.confReadString("QtaImballoLiquidi");
txtAnno.Text = DateTime.Now.Year.ToString();
@@ -150,8 +136,6 @@ namespace GMW.WebUserControls
btnAdd.ToolTip = traduci("btnAdd");
btnSvuota.ToolTip = traduci("btnSvuota");
btnEmptyNote.Text = traduci("btnEmptyNote");
// fix storico
fixStorico();
}
/// <summary>
/// restituisce il nome della pagina corrente
@@ -182,76 +166,6 @@ namespace GMW.WebUserControls
return user_std.UtSn.Traduci(lemma.ToString());
}
/// <summary>
/// calcola postazione corrente (ip, name, printer)
/// </summary>
private void calcolaPostazione()
{
postazione_IP = Request.UserHostName;
postazione_name = dnsUtils.DetermineCompName(postazione_IP);
// cerco stampante x postazione
postazione_printer = "n.d.";
try
{
DS_Applicazione.ElencoPostazioniDataTable tabPost = DataProxy.obj.taElPost.getByCod(postazione_name);
if (tabPost.Rows.Count > 0)
{
postazione_printer = tabPost[0].stampante;
}
//else
//{
// tabPost = DataProxy.obj.taElPost.getByCod("default");
// postazione_printer = tabPost[0].stampante;
//}
}
catch
{ }
// mostro warning se postazione non configurata...
lblWarning.Visible = (postazione_printer == "n.d.");
}
/// <summary>
/// indica name della postazione corrente
/// </summary>
protected string postazione_name
{
get
{
return memLayer.ML.StringSessionObj("postazione_name");
}
set
{
memLayer.ML.setSessionVal("postazione_name", value);
}
}
/// <summary>
/// indica ip della postazione corrente
/// </summary>
protected string postazione_IP
{
get
{
return memLayer.ML.StringSessionObj("postazione_IP");
}
set
{
memLayer.ML.setSessionVal("postazione_IP", value);
}
}
/// <summary>
/// indica stampante associata alla postazione corrente
/// </summary>
protected string postazione_printer
{
get
{
return memLayer.ML.StringSessionObj("postazione_printer");
}
set
{
memLayer.ML.setSessionVal("postazione_printer", value);
}
}
/// <summary>
/// indica il codice articolo correntemente selezionato
/// </summary>
protected string currParticolare
@@ -372,7 +286,7 @@ namespace GMW.WebUserControls
{
if (barcodeIn != "")
{
lblMessaggi.Text = string.Format("Barcode digitato: {0}", barcodeIn);
Postazione.messaggiText = string.Format("Barcode digitato: {0}", barcodeIn);
switch (tipoBCode)
{
case tipoCodiceBarcode.Particolare:
@@ -382,13 +296,13 @@ namespace GMW.WebUserControls
if (DataProxy.obj.taAnagParticolari.getByParticolare(currParticolare).Rows.Count == 0)
{
currParticolare = "";
lblMessaggi.Text += " - codice particolare non valido / non trovato in RILPRO.";
pnlAll.CssClass = "stileComandoKo";
Postazione.messaggiText += " - codice particolare non valido / non trovato in RILPRO.";
Postazione.CssClass = "stileComandoKo";
}
else
{
lblMessaggi.Text += " - impostato particolare!";
pnlAll.CssClass = "stileComandoOk";
Postazione.messaggiText += " - impostato particolare!";
Postazione.CssClass = "stileComandoOk";
}
// default: qta a zero
decimal qtaPart = 0;
@@ -418,28 +332,28 @@ namespace GMW.WebUserControls
if (DataProxy.obj.taAnagParticolari.getByParticolare(currParticolare).Rows.Count == 0)
{
currParticolare = "";
lblMessaggi.Text += " - codice particolare da UDC non valido / non trovato in RILPRO.";
pnlAll.CssClass = "stileComandoKo";
Postazione.messaggiText += " - codice particolare da UDC non valido / non trovato in RILPRO.";
Postazione.CssClass = "stileComandoKo";
}
else
{
lblMessaggi.Text += " - impostato particolare!";
pnlAll.CssClass = "stileComandoOk";
Postazione.messaggiText += " - impostato particolare!";
Postazione.CssClass = "stileComandoOk";
}
}
break;
default:
lblMessaggi.Text += " - codice <b>non riconosciuto</b>!";
pnlAll.CssClass = "stileComandoND";
Postazione.messaggiText += " - codice <b>non riconosciuto</b>!";
Postazione.CssClass = "stileComandoND";
break;
}
barcodeIn = "";
}
else
{
lblMessaggi.Text = traduci("AttesaBCode");
pnlAll.CssClass = "stileAttesa";
Postazione.messaggiText = traduci("AttesaBCode");
Postazione.CssClass = "stileAttesa";
}
//grView.DataBind();
txtBarcode.Focus();
@@ -506,7 +420,6 @@ namespace GMW.WebUserControls
txtTratt.Text = "";
updateListBoxTrattamenti();
}
fixStorico();
doChecks();
}
/// <summary>
@@ -527,7 +440,6 @@ namespace GMW.WebUserControls
protected void btnSvuota_Click(object sender, EventArgs e)
{
resetTrattamenti();
fixStorico();
doChecks();
}
/// <summary>
@@ -550,10 +462,8 @@ namespace GMW.WebUserControls
/// <param name="e"></param>
protected void btnStampa_Click(object sender, EventArgs e)
{
// calcolo postazione
calcolaPostazione();
// verifico postazione x procedere...
if (postazione_printer != "n.d.")
if (Postazione.printer != "n.d.")
{
string newUdcChild = "";
string newUdcParent = "";
@@ -587,7 +497,7 @@ namespace GMW.WebUserControls
// creo nuovo UDC del trattamento liquidi
newUdcChild = MagClass.magazzino.creaUdc(flusso, "", particolare, "", "", "", "", "", 0, memLayer.ML.confReadString("CodImballoLiquidi"), "U", codSogg, qta, 0, 0, adesso, 0, statoUDC, memLayer.ML.confReadInt("IdxPosizioneLiquidi"), "IdxPosizioneLiquidi", memLayer.ML.confReadString("nuovoUdcLiquidiF10"), noteTrim, "", adesso.Year, Request.UserHostName);
// registro creazione nuovo UDC
MagClass.magazzino.taSAO.insertQuery(adesso, codSogg, postazione_name, postazione_IP, newUdcChild, particolare, "creaUDC", string.Format("Creato nuovo UDC Liquidi F10 - qta:{0} {1}", qta, noteTrim));
MagClass.magazzino.taSAO.insertQuery(adesso, codSogg, Postazione.name, Postazione.IP, newUdcChild, particolare, "creaUDC", string.Format("Creato nuovo UDC Liquidi F10 - qta:{0} {1}", qta, noteTrim));
}
catch (Exception exc)
{
@@ -627,12 +537,12 @@ namespace GMW.WebUserControls
UdcExists = false;
}
// ora stampo il nuovo cartellino!!!
MagClass.magazzino.stampaUdc(newUdcChild, postazione_printer, tipoCartellino.cartLiquidiF10, Request.UserHostName);
MagClass.magazzino.stampaUdc(newUdcChild, Postazione.printer, tipoCartellino.cartLiquidiF10, Request.UserHostName);
// incremento timing...
adesso = DateTime.Now;
adesso = adesso.AddSeconds(1);
// registro stampa nuovo UDC
MagClass.magazzino.taSAO.insertQuery(adesso, codSogg, postazione_name, postazione_IP, newUdcChild, particolare, "stampaUDC", "Stampato UDC Liquidi F10");
MagClass.magazzino.taSAO.insertQuery(adesso, codSogg, Postazione.name, Postazione.IP, newUdcChild, particolare, "stampaUDC", "Stampato UDC Liquidi F10");
}
}
else
@@ -640,7 +550,6 @@ namespace GMW.WebUserControls
httpLog(string.Format("Errore persi utente/particolare, ricarico!"), tipoLog.ERROR);
Response.Redirect("~/login.aspx");
}
mod_storicoAzioniOperatore1.doUpdate();
}
else
{
@@ -655,14 +564,7 @@ namespace GMW.WebUserControls
public bool httpLog(string _testoPre)
{
bool answ = false;
string postazione_IP = "";
try
{
postazione_IP = string.Format(" | {0} | ", Request.UserHostName);
}
catch
{ }
logger.lg.scriviLog(postazione_IP + _testoPre);
logger.lg.scriviLog(Postazione.IP + _testoPre);
return answ;
}
/// <summary>
@@ -673,14 +575,7 @@ namespace GMW.WebUserControls
public bool httpLog(string testoLog, tipoLog tipo)
{
bool answ = false;
string postazione_IP = "";
try
{
postazione_IP = string.Format(" | {0} | ", Request.UserHostName);
}
catch
{ }
logger.lg.scriviLog(postazione_IP + testoLog, tipo);
logger.lg.scriviLog(Postazione.IP + testoLog, tipo);
return answ;
}
/// <summary>
@@ -692,44 +587,6 @@ namespace GMW.WebUserControls
{
txtNote.Text = "";
}
/// <summary>
/// toggle controllo storico
/// </summary>
private void fixStorico()
{
pnlSAO.Visible = storicoVisibile;
if (storicoVisibile)
{
btnShowHideStorico.Text = traduci("btnHideStorico");
}
else
{
btnShowHideStorico.Text = traduci("btnShowStorico");
}
}
/// <summary>
/// imposto visibilità pannelo storico
/// </summary>
protected bool storicoVisibile
{
get
{
return memLayer.ML.BoolSessionObj(string.Format("showHist_{0}", this.ID));
}
set
{
memLayer.ML.setSessionVal(string.Format("showHist_{0}", this.ID), value);
}
}
/// <summary>
/// gestisco evento show/hide storico
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnShowHideStorico_Click(object sender, EventArgs e)
{
storicoVisibile = !storicoVisibile;
fixStorico();
}
}
}
+49 -139
View File
@@ -13,85 +13,85 @@ namespace GMW.WebUserControls {
public partial class mod_sanpos_controlloLiquidi {
/// <summary>
/// pnlAll control.
/// BundleReference1 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.Panel pnlAll;
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// lblPostazione control.
/// BundleReference2 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 lblPostazione;
protected global::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// btnRefresh control.
/// divNumTratt 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 btnRefresh;
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divNumTratt;
/// <summary>
/// btnShowHideStorico control.
/// txtTratt 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 btnShowHideStorico;
protected global::System.Web.UI.WebControls.TextBox txtTratt;
/// <summary>
/// lblPrinter control.
/// revNumTratt 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 lblPrinter;
protected global::System.Web.UI.WebControls.RegularExpressionValidator revNumTratt;
/// <summary>
/// lblCurrentPage control.
/// lbTrattamenti 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 lblCurrentPage;
protected global::System.Web.UI.WebControls.ListBox lbTrattamenti;
/// <summary>
/// hlMenu control.
/// txtAnno 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.HyperLink hlMenu;
protected global::System.Web.UI.WebControls.TextBox txtAnno;
/// <summary>
/// pnlSAO control.
/// btnAdd 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.Panel pnlSAO;
protected global::System.Web.UI.WebControls.Button btnAdd;
/// <summary>
/// mod_storicoAzioniOperatore1 control.
/// btnSvuota control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::GMW.WebUserControls.mod_storicoAzioniOperatore mod_storicoAzioniOperatore1;
protected global::System.Web.UI.WebControls.Button btnSvuota;
/// <summary>
/// lblParticolareAttivo control.
@@ -121,121 +121,13 @@ namespace GMW.WebUserControls {
protected global::System.Web.UI.WebControls.Label lblDisegno;
/// <summary>
/// lblMessaggi control.
/// divBarcode 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 lblMessaggi;
/// <summary>
/// lblWarning 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 lblWarning;
/// <summary>
/// lblNumTratt 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 lblNumTratt;
/// <summary>
/// txtTratt 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.TextBox txtTratt;
/// <summary>
/// revNumTratt 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.RegularExpressionValidator revNumTratt;
/// <summary>
/// btnAdd 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 btnAdd;
/// <summary>
/// lbTrattamenti 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.ListBox lbTrattamenti;
/// <summary>
/// btnSvuota 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 btnSvuota;
/// <summary>
/// lblAnnoTratt 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 lblAnnoTratt;
/// <summary>
/// txtAnno 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.TextBox txtAnno;
/// <summary>
/// lblQta 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 lblQta;
/// <summary>
/// txtQta 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.TextBox txtQta;
/// <summary>
/// btnStampa 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 btnStampa;
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divBarcode;
/// <summary>
/// lblBarcode control.
@@ -256,22 +148,13 @@ namespace GMW.WebUserControls {
protected global::System.Web.UI.WebControls.TextBox txtBarcode;
/// <summary>
/// aceParticolare control.
/// divNote control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::AjaxControlToolkit.AutoCompleteExtender aceParticolare;
/// <summary>
/// lblNote 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 lblNote;
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divNote;
/// <summary>
/// txtNote control.
@@ -290,5 +173,32 @@ namespace GMW.WebUserControls {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnEmptyNote;
/// <summary>
/// divQta control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divQta;
/// <summary>
/// txtQta 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.TextBox txtQta;
/// <summary>
/// btnStampa 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 btnStampa;
}
}
+1 -1
View File
@@ -70,7 +70,7 @@
<!--/.nav-collapse -->
<div class="subnavbar" style="color: #999;">
<div class="navbar-left">
postazione: postazione: <%: SteamWare.memLayer.ML.StringSessionObj("postazione_name") %>
postazione: <%: SteamWare.memLayer.ML.StringSessionObj("postazione_name") %>
</div>
<div class="navbar-right">
stampante: <%: SteamWare.memLayer.ML.StringSessionObj("postazione_printer") %>
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1 -1
View File
@@ -3,7 +3,7 @@
<%@ Register Src="~/WebUserControls/mod_chLang.ascx" TagName="mod_chLang" TagPrefix="uc1" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<table class="bodyCenter">
lo<table class="bodyCenter">
<tr>
<td>
<uc1:mod_chLang ID="Mod_chLang1" runat="server" />
+37 -5
View File
@@ -1,6 +1,38 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSimpleFull.master" AutoEventWireup="true" CodeBehind="sanpos_controlloLiquidi.aspx.cs" Inherits="GMW.sanpos_controlloLiquidi" %>
<%@ Register src="WebUserControls/mod_sanpos_controlloLiquidi.ascx" tagname="mod_sanpos_controlloLiquidi" tagprefix="uc1" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<uc1:mod_sanpos_controlloLiquidi ID="mod_sanpos_controlloLiquidi1"
runat="server" />
<%@ Page Title="" Language="C#" MasterPageFile="~/FullPage.master" AutoEventWireup="true" CodeBehind="sanpos_controlloLiquidi.aspx.cs" Inherits="GMW.sanpos_controlloLiquidi" %>
<%@ Register Src="WebUserControls/mod_selLineaNtDt.ascx" TagName="mod_selLineaNtDt" TagPrefix="uc1" %>
<%@ Register Src="WebUserControls/mod_storicoAzioniOperatore.ascx" TagName="mod_storicoAzioniOperatore" TagPrefix="uc2" %>
<%@ Register Src="WebUserControls/mod_sanpos_controlloLiquidi.ascx" TagName="mod_sanpos_controlloLiquidi" TagPrefix="uc3" %>
<asp:Content ID="Content1" ContentPlaceHolderID="HeadContent" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MCon" runat="server">
<uc1:mod_selLineaNtDt ID="mod_selLineaNtDt1" runat="server" showSelNtDt="false" showSelPostazione="false" cssNormal="btn btn-inverse btn-lg" cssSelected="btn btn-primary btn-lg active" />
<asp:Panel runat="server" ID="pnlAll" CssClass="stileAttesa">
<div class="container-fluid">
<asp:Panel ID="pnlSAO" runat="server" ScrollBars="None" CssClass="nav sidebar ombra" BackColor="#696969">
<div style="float: left; height: 100%; min-height: 300px; min-width: 240px; margin: -15px;">
<div style="background-color: #696969; margin: 4px;">
<uc2:mod_storicoAzioniOperatore ID="mod_storicoAzioniOperatore1" runat="server" showDelete="false" />
</div>
</div>
</asp:Panel>
<div class="row">
<div class="col-xs-12">
<div class="msgBoxBarcode">
<div>
<asp:Label runat="server" ID="lblMessaggi" Text=".." Font-Size="18pt" />
</div>
<div>
<asp:Label runat="server" ID="lblWarning" Text="" Font-Size="XX-Large" ForeColor="Red" />
</div>
</div>
</div>
<div class="col-xs-12">
<uc3:mod_sanpos_controlloLiquidi ID="mod_sanpos_controlloLiquidi1" runat="server" />
</div>
</div>
</div>
</asp:Panel>
</asp:Content>
+122
View File
@@ -4,6 +4,8 @@ using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using SteamWare;
using GMW_data;
namespace GMW
{
@@ -13,6 +15,126 @@ namespace GMW
{
// pulisco dir temp dai file dei cartellini stampati
reportPrinter.obj.pulisciDir();
if (!Page.IsPostBack)
{
updatePrinterPostazione();
// fix css...
Postazione.CssClass = "stileAttesa";
// imposto pos abilitata x cancellazione
mod_storicoAzioniOperatore1.IdxPosizione2del = memLayer.ML.confReadInt("IdxPosizioneRX");
}
// update vari...
doUpdate();
mod_storicoAzioniOperatore1.eh_stampa += new EventHandler(mod_storicoAzioniOperatore1_eh_stampa);
#if false
mod_PostRX_DT1.doUpdate();
mod_PostRX_DT1.eh_reqUpdate += mod_PostRX_DT1_eh_reqUpdate;
#endif
mod_selLineaNtDt1.eh_lineSelected += mod_selLineaNtDt1_eh_doRefresh;
mod_selLineaNtDt1.eh_showHideStorico += mod_selLineaNtDt1_eh_showHideStorico;
}
/// <summary>
/// Handles the showHideStorico event of the mod_selLineaNtDt1_eh control.
/// </summary>
/// <param name="sender">The source of the event.</param>
/// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
private void mod_selLineaNtDt1_eh_showHideStorico(object sender, EventArgs e)
{
fixStorico();
}
/// <summary>
/// Handles the doRefresh event of the mod_selLineaNtDt1_eh control.
/// </summary>
/// <param name="sender">The source of the event.</param>
/// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
private void mod_selLineaNtDt1_eh_doRefresh(object sender, EventArgs e)
{
doUpdate();
#if false
mod_PostRX_DT1.doUpdate();
#endif
}
/// <summary>
/// richiesta update del controllo SAO
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void mod_PostRX_DT1_eh_reqUpdate(object sender, EventArgs e)
{
doUpdate();
}
/// <summary>
/// aggiorna messaggi e css
/// </summary>
private void updateMessCss()
{
lblWarning.Text = Postazione.warningText;
lblMessaggi.Text = Postazione.messaggiText;
pnlAll.CssClass = Postazione.CssClass;
}
/// <summary>
/// richiesta (ri)stampa UDC
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void mod_storicoAzioniOperatore1_eh_stampa(object sender, EventArgs e)
{
#if false
mod_PostRX_DT1.ristampa();
#endif
}
/// <summary>
/// sistemo visualizzazione pannelli
/// </summary>
private void fixPanels()
{
// default: moduli NON visibili SE non ho linea indicata..
bool enableBtn = false;
if (Postazione.currCodCella != "") enableBtn = true;
#if false
mod_PostRX_DT1.Visible = enableBtn;
#endif
fixStorico();
}
/// <summary>
/// wrapper traduzione
/// </summary>
/// <param name="lemma"></param>
/// <returns></returns>
public string traduci(object lemma)
{
return user_std.UtSn.Traduci(lemma.ToString());
}
/// <summary>
/// toggle controllo storico
/// </summary>
private void fixStorico()
{
pnlSAO.Visible = Postazione.showStorico;
}
/// <summary>
/// update generale controlli
/// </summary>
private void doUpdate()
{
updateMessCss();
fixPanels();
mod_storicoAzioniOperatore1.doUpdate();
}
/// <summary>
/// calcola postazione corrente (ip, name, printer)
/// </summary>
private void updatePrinterPostazione()
{
Postazione.IP = Request.UserHostName;
Postazione.setupPrinter();
// mostro warning se postazione non configurata...
if (Postazione.printer == "n.d.")
{
lblWarning.Text = traduci("lblWarnPostNonConf");
}
}
}
}
+55 -2
View File
@@ -1,10 +1,9 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.4963
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -13,6 +12,60 @@ namespace GMW {
public partial class sanpos_controlloLiquidi {
/// <summary>
/// mod_selLineaNtDt1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::GMW.WebUserControls.mod_selLineaNtDt mod_selLineaNtDt1;
/// <summary>
/// pnlAll 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.Panel pnlAll;
/// <summary>
/// pnlSAO 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.Panel pnlSAO;
/// <summary>
/// mod_storicoAzioniOperatore1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::GMW.WebUserControls.mod_storicoAzioniOperatore mod_storicoAzioniOperatore1;
/// <summary>
/// lblMessaggi 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 lblMessaggi;
/// <summary>
/// lblWarning 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 lblWarning;
/// <summary>
/// mod_sanpos_controlloLiquidi1 control.
/// </summary>
Binary file not shown.
Binary file not shown.
+4 -4
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("2.5.654.1553")]
[assembly: AssemblyFileVersion("2.5.654.1553")]
//[assembly: AssemblyCopyright("© Steamware 2007-2014")]
//[assembly: AssemblyCompany("Steamware")]
[assembly: AssemblyVersion("2.5.657.1554")]
[assembly: AssemblyFileVersion("2.5.657.1554")]
[assembly: AssemblyCopyright("Steamware © 2007-2014")]
[assembly: AssemblyCompany("Steamware")]
+4 -4
View File
@@ -6,10 +6,10 @@
using System.Reflection;
[assembly: AssemblyVersion("2.5.654.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.5.654.<#= this.RevisionNumber #>")]
//[assembly: AssemblyCopyright("© Steamware 2007-<#= DateTime.Now.Year #>")]
//[assembly: AssemblyCompany("Steamware")]
[assembly: AssemblyVersion("2.5.657.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.5.657.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
// int Major = 2;
// int Minor = 4;
+2 -2
View File
@@ -8,9 +8,9 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("VersGen")]
[assembly: AssemblyDescription("Generatore numero versione progetto")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Steamware")]
//[assembly: AssemblyCompany("Steamware")]
[assembly: AssemblyProduct("VersGen")]
[assembly: AssemblyCopyright("Steamware © 2014")]
//[assembly: AssemblyCopyright("Steamware © 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]