diff --git a/GMW/GMW_Term/Style.css b/GMW/GMW_Term/Style.css
index 0c30f0f8..8af36409 100644
--- a/GMW/GMW_Term/Style.css
+++ b/GMW/GMW_Term/Style.css
@@ -415,6 +415,21 @@
}
+/* area formattazione dati ricerca UDC e celle */
+.divSmall
+{
+ width: 240px;
+}
+.labelSmall
+{
+ font-size: 8pt;
+ color: #969696;
+}
+.valoreSmall
+{
+ font-size: 9pt;
+ color: Black;
+}
.btnBarcodeBig
@@ -548,6 +563,12 @@
clear: both;
height: 0px;
}
+.clearAllBottomLine
+{
+ border-bottom: solid 1px #ACACAC;
+ clear: both;
+ height: 0px;
+}
.styleBtnComposito
diff --git a/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx b/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx
index 4b74fcb5..a9a54203 100644
--- a/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx
+++ b/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx
@@ -1 +1,104 @@
-<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_interrMov.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_interrMov" %>
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_interrMov.ascx.cs"
+ Inherits="GMW_Term.WebUserControls.mod_interrMov" %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx.cs
index 321ff18a..f39d66b3 100644
--- a/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx.cs
+++ b/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx.cs
@@ -4,14 +4,48 @@ using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
+using SteamWare;
namespace GMW_Term.WebUserControls
{
public partial class mod_interrMov : System.Web.UI.UserControl
{
+ ///
+ /// azioni setup a creazione controllo
+ ///
+ ///
+ ///
protected void Page_Load(object sender, EventArgs e)
{
-
+ pnlDetailCella.Visible = false;
+ pnlDetailUdc.Visible = false;
+ }
+ ///
+ /// mostro i dettagli dell'udc indicato
+ ///
+ public void showUdcDetail(string UDC)
+ {
+ memLayer.ML.setSessionVal("UDC4det_sel", UDC);
+ memLayer.ML.setSessionVal("CodCS", "TK");
+ pnlDetailCella.Visible = false;
+ pnlDetailUdc.Visible = true;
+ }
+ ///
+ /// mostro i dettagli dell'udc indicato
+ ///
+ public void showCellaDetail(string codCella)
+ {
+ // recupero idxCella da codCella..
+ int idxCella = 0;
+ try
+ {
+ idxCella = 3892;
+ }
+ catch
+ { }
+ memLayer.ML.setSessionVal("IdxCella_sel", idxCella);
+ pnlDetailCella.Visible = true;
+ pnlDetailUdc.Visible = false;
}
}
}
\ No newline at end of file
diff --git a/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx.designer.cs b/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx.designer.cs
index 0fdc3b36..bddcd13b 100644
--- a/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx.designer.cs
+++ b/GMW/GMW_Term/WebUserControls/mod_interrMov.ascx.designer.cs
@@ -1,18 +1,70 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:2.0.50727.42
+// Runtime Version:2.0.50727.4963
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
//
//------------------------------------------------------------------------------
-namespace GMW_Term.WebUserControls
-{
-
-
- public partial class mod_interrMov
- {
+namespace GMW_Term.WebUserControls {
+
+
+ public partial class mod_interrMov {
+
+ ///
+ /// pnlDetailCella control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Panel pnlDetailCella;
+
+ ///
+ /// detViewCella control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.DetailsView detViewCella;
+
+ ///
+ /// odsCella control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.ObjectDataSource odsCella;
+
+ ///
+ /// pnlDetailUdc control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Panel pnlDetailUdc;
+
+ ///
+ /// frmViewUdc control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.FormView frmViewUdc;
+
+ ///
+ /// odsUdc control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.ObjectDataSource odsUdc;
}
}
diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll
index 5f363402..aff42520 100644
Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ
diff --git a/GMW/GMW_Term/interrMov.aspx b/GMW/GMW_Term/interrMov.aspx
index 634d7272..fea00fe9 100644
--- a/GMW/GMW_Term/interrMov.aspx
+++ b/GMW/GMW_Term/interrMov.aspx
@@ -1,7 +1,9 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/CompactBCode.Master" AutoEventWireup="true" CodeBehind="interrMov.aspx.cs" Inherits="GMW_Term.interrMov" %>
<%@ Register src="WebUserControls/mod_interrMov.ascx" tagname="mod_interrMov" tagprefix="uc1" %>
+<%@ Register src="WebUserControls/mod_barcode.ascx" tagname="mod_barcode" tagprefix="uc2" %>
+
diff --git a/GMW/GMW_Term/interrMov.aspx.cs b/GMW/GMW_Term/interrMov.aspx.cs
index 91a848b8..60d40cd3 100644
--- a/GMW/GMW_Term/interrMov.aspx.cs
+++ b/GMW/GMW_Term/interrMov.aspx.cs
@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
-using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
+using SteamWare;
namespace GMW_Term
{
@@ -11,7 +11,36 @@ namespace GMW_Term
{
protected void Page_Load(object sender, EventArgs e)
{
-
+ // imposto valori visibilità barcode specifici (nascondo testo...)
+ mod_barcode1.showHeaderText = true;
+ mod_barcode1.showNoteText = true;
+ // imposto controllo valori scansionati
+ mod_barcode1.eh_scannedUdc += new EventHandler(mod_barcode1_eh_scannedUdc);
+ mod_barcode1.eh_scannedCella += new EventHandler(mod_barcode1_eh_scannedCella);
+ }
+ ///
+ /// mostro dettaglio UDC
+ ///
+ ///
+ ///
+ void mod_barcode1_eh_scannedUdc(object sender, EventArgs e)
+ {
+ //Response.Redirect("~/interrMov.aspx");
+ mod_barcode1.showHeaderText = false;
+ mod_barcode1.showNoteText = false;
+ mod_interrMov1.showUdcDetail(mod_barcode1.valoreScan);
+ }
+ ///
+ /// mostro dettaglio cella
+ ///
+ ///
+ ///
+ void mod_barcode1_eh_scannedCella(object sender, EventArgs e)
+ {
+ //Response.Redirect("~/interrMov.aspx");
+ mod_barcode1.showHeaderText = false;
+ mod_barcode1.showNoteText = false;
+ mod_interrMov1.showCellaDetail(mod_barcode1.valoreScan);
}
}
}
diff --git a/GMW/GMW_Term/interrMov.aspx.designer.cs b/GMW/GMW_Term/interrMov.aspx.designer.cs
index 2162d81f..b5eae56e 100644
--- a/GMW/GMW_Term/interrMov.aspx.designer.cs
+++ b/GMW/GMW_Term/interrMov.aspx.designer.cs
@@ -13,6 +13,15 @@ namespace GMW_Term {
public partial class interrMov {
+ ///
+ /// mod_barcode1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::GMW_Term.WebUserControls.mod_barcode mod_barcode1;
+
///
/// mod_interrMov1 control.
///
diff --git a/GMW/GMW_Term/makeMov.aspx b/GMW/GMW_Term/makeMov.aspx
index 3d0a6bf3..d95cf74a 100644
--- a/GMW/GMW_Term/makeMov.aspx
+++ b/GMW/GMW_Term/makeMov.aspx
@@ -1,7 +1,9 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/CompactBCode.Master" AutoEventWireup="true" CodeBehind="makeMov.aspx.cs" Inherits="GMW_Term.makeMov" %>
<%@ Register src="WebUserControls/mod_makeMov.ascx" tagname="mod_makeMov" tagprefix="uc1" %>
+<%@ Register src="WebUserControls/mod_barcode.ascx" tagname="mod_barcode" tagprefix="uc2" %>
+
diff --git a/GMW/GMW_Term/makeMov.aspx.designer.cs b/GMW/GMW_Term/makeMov.aspx.designer.cs
index 7ae4b1db..2512f5fc 100644
--- a/GMW/GMW_Term/makeMov.aspx.designer.cs
+++ b/GMW/GMW_Term/makeMov.aspx.designer.cs
@@ -13,6 +13,15 @@ namespace GMW_Term {
public partial class makeMov {
+ ///
+ /// mod_barcode1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::GMW_Term.WebUserControls.mod_barcode mod_barcode1;
+
///
/// mod_makeMov1 control.
///
diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll
index 5f363402..aff42520 100644
Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ