diff --git a/GMW/GMW/GMW.csproj b/GMW/GMW/GMW.csproj
index bd87a514..8c85fa8c 100644
--- a/GMW/GMW/GMW.csproj
+++ b/GMW/GMW/GMW.csproj
@@ -176,6 +176,20 @@
odette.aspx
+
+ sanpos_associaz_F10_F18.aspx
+ ASPXCodeBehind
+
+
+ sanpos_associaz_F10_F18.aspx
+
+
+ sanpos_consumoF10.aspx
+ ASPXCodeBehind
+
+
+ sanpos_consumoF10.aspx
+
sanpos_controlloLiquidi.aspx
ASPXCodeBehind
@@ -183,6 +197,13 @@
sanpos_controlloLiquidi.aspx
+
+ sanpos_creazioneF18.aspx
+ ASPXCodeBehind
+
+
+ sanpos_creazioneF18.aspx
+
SearchMag.aspx
ASPXCodeBehind
@@ -204,13 +225,6 @@
StatoMag.aspx
-
- travasaContenitori.aspx
- ASPXCodeBehind
-
-
- travasaContenitori.aspx
-
unauthorized.aspx
ASPXCodeBehind
@@ -603,6 +617,20 @@
mod_listImballi.ascx
+
+ mod_sanpos_associaz_F10_F18.ascx
+ ASPXCodeBehind
+
+
+ mod_sanpos_associaz_F10_F18.ascx
+
+
+ mod_sanpos_consumoF10.ascx
+ ASPXCodeBehind
+
+
+ mod_sanpos_consumoF10.ascx
+
mod_sanpos_controlloLiquidi.ascx
ASPXCodeBehind
@@ -610,6 +638,13 @@
mod_sanpos_controlloLiquidi.ascx
+
+ mod_sanpos_creazioneF18.ascx
+ ASPXCodeBehind
+
+
+ mod_sanpos_creazioneF18.ascx
+
mod_searchMag.ascx
ASPXCodeBehind
@@ -701,13 +736,6 @@
mod_tipoCella.ascx
-
- mod_travasaContenitori.ascx
- ASPXCodeBehind
-
-
- mod_travasaContenitori.ascx
-
mod_UdcCella.ascx
ASPXCodeBehind
@@ -969,8 +997,10 @@
+
+
-
+
@@ -1042,10 +1072,12 @@
+
+
+
-
diff --git a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx
index d9e1bb57..89e68442 100644
--- a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx
+++ b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx
@@ -59,7 +59,7 @@
diff --git a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs
index 751ea015..10b03f54 100644
--- a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs
@@ -53,7 +53,7 @@ namespace GMW.WebUserControls
lblNumTratt.Text = traduci("lblNumTratt");
lblQta.Text = traduci("lblQuantita");
lblNote.Text = traduci("lblNote");
- lblAnno.Text = traduci("lblAnno");
+ lblAnnoTratt.Text = traduci("lblAnnoTratt");
//txtBox
txtQta.Text = memLayer.ML.confReadString("QtaImballoLiquidi");
txtAnno.Text = DateTime.Now.Year.ToString();
@@ -172,7 +172,7 @@ namespace GMW.WebUserControls
int answ = 0;
try
{
- answ = (int)MagClass.magazzino.taElencoCartellini.getLastByParticolare(memLayer.ML.StringSessionObj("CodCS"), currParticolare)[0].Qta;
+ answ = (int)MagClass.magazzino.taCartellini.getLastByParticolare(memLayer.ML.StringSessionObj("CodCS"), currParticolare)[0].Qta;
}
catch
{ }
@@ -204,21 +204,11 @@ namespace GMW.WebUserControls
try
{
// cerco tra gitterbox (UDC)...
- trovati = MagClass.magazzino.taElencoCartellini.getByUdc(barcodeIn).Rows.Count;
+ trovati = MagClass.magazzino.taCartellini.getByUdc(barcodeIn).Rows.Count;
if (trovati > 0)
{
- answ = tipoCodiceBarcode.Gitterbox;
+ answ = tipoCodiceBarcode.UDC;
}
- // cerco tra datamatrix
- else
- {
- trovati = DataMatrix.mgr.taElencoDM.getByCode(Convert.ToDecimal(barcodeIn)).Rows.Count;
- if (trovati > 0)
- {
- answ = tipoCodiceBarcode.DataMatrix;
- }
- }
-
}
catch
{
@@ -411,16 +401,19 @@ namespace GMW.WebUserControls
}
catch
{ }
+ // non inserisco + i trattamenti nelle note, saranno aggiunti a parte dalla stored di recupero dati...
+#if false
// costruisco stringa x note, inserendo i trattamenti associati
foreach (KeyValuePair kvp in elencoTrattamenti)
{
noteTrim += string.Format("{0}{1}: {2}", Environment.NewLine, traduci("lblNumTratt"), kvp.Key);
- }
+ }
+#endif
// genero cartellino liquidi
try
{
// creo nuovo UDC del trattamento liquidi
- newUdcChild = MagClass.magazzino.creaUdc("LI", "", currParticolare, "", "", "", "", "", 0, memLayer.ML.confReadString("CodImballoLiquidi"), "U", "", qta, 0, 0, DateTime.Now, 0, "Fin", memLayer.ML.confReadInt("IdxPosizioneLiquidi"), true, "IdxPosizioneLiquidi", "UDC_FINITO", noteTrim, "", anno); // !!! "LI" HARD CODED x indicare flusso liquidi
+ newUdcChild = MagClass.magazzino.creaUdc("LI", "", currParticolare, "", "", "", "", "", 0, memLayer.ML.confReadString("CodImballoLiquidi"), "U", "", qta, 0, 0, DateTime.Now, 0, "Fin", memLayer.ML.confReadInt("IdxPosizioneLiquidi"), true, "IdxPosizioneLiquidi", "UDC_FINITO", noteTrim, "", DateTime.Now.Year); // !!! "LI" HARD CODED x indicare flusso liquidi
}
catch
{ }
@@ -454,6 +447,5 @@ namespace GMW.WebUserControls
MagClass.magazzino.stampaUdc(newUdcChild, postazione_printer, tipoCartellino.cartFin);
}
}
-
}
}
\ No newline at end of file
diff --git a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs
index 6516a4bd..5e4f351f 100644
--- a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs
+++ b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs
@@ -140,13 +140,13 @@ namespace GMW.WebUserControls {
protected global::System.Web.UI.WebControls.TextBox txtQta;
///
- /// lblAnno control.
+ /// lblAnnoTratt control.
///
///
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.Label lblAnno;
+ protected global::System.Web.UI.WebControls.Label lblAnnoTratt;
///
/// txtAnno control.
diff --git a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx
new file mode 100644
index 00000000..eab2b01d
--- /dev/null
+++ b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx
@@ -0,0 +1,59 @@
+<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_sanpos_creazioneF18.ascx.cs" Inherits="GMW.WebUserControls.mod_sanpos_creazioneF18" %>
+<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="asp" %>
+
+
+
diff --git a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs
new file mode 100644
index 00000000..6cca3e26
--- /dev/null
+++ b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs
@@ -0,0 +1,370 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using SteamWare;
+using GMW_data;
+
+namespace GMW.WebUserControls
+{
+ public partial class mod_sanpos_creazioneF18 : System.Web.UI.UserControl
+ {
+ ///
+ /// caricamento pagina
+ ///
+ ///
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!Page.IsPostBack)
+ {
+ calcolaPostazione();
+ traduciObj();
+ }
+ doChecks();
+ if (currParticolare != "")
+ {
+ lblGitterBoxAttivo.Text = string.Format("Particolare selezionato {0}", currParticolare);
+ }
+ else
+ {
+ lblGitterBoxAttivo.Text = "...";
+ }
+ }
+ ///
+ /// effettua controlli visibilità
+ ///
+ private void doChecks()
+ {
+ checkStampa();
+ checkBarcode();
+ }
+ ///
+ /// sistemo labels oggetti
+ ///
+ 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"));
+ lblQta.Text = traduci("lblQuantita");
+ lblNote.Text = traduci("lblNote");
+ //txtBox
+ txtQta.Text = memLayer.ML.confReadString("QtaImballoLiquidiDaSpedire");
+ // buttons
+ btnStampa.Text = traduci("btnStampa");
+ }
+ ///
+ /// wrapper traduzione
+ ///
+ ///
+ ///
+ public string traduci(object lemma)
+ {
+ return user_std.UtSn.Traduci(lemma.ToString());
+ }
+ ///
+ /// calcola postazione corrente (ip, name, printer)
+ ///
+ 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
+ { }
+ }
+ ///
+ /// indica name della postazione corrente
+ ///
+ protected string postazione_name
+ {
+ get
+ {
+ return memLayer.ML.StringSessionObj("postazione_name");
+ }
+ set
+ {
+ memLayer.ML.setSessionVal("postazione_name", value);
+ }
+ }
+ ///
+ /// indica ip della postazione corrente
+ ///
+ protected string postazione_IP
+ {
+ get
+ {
+ return memLayer.ML.StringSessionObj("postazione_IP");
+ }
+ set
+ {
+ memLayer.ML.setSessionVal("postazione_IP", value);
+ }
+ }
+ ///
+ /// indica stampante associata alla postazione corrente
+ ///
+ protected string postazione_printer
+ {
+ get
+ {
+ return memLayer.ML.StringSessionObj("postazione_printer");
+ }
+ set
+ {
+ memLayer.ML.setSessionVal("postazione_printer", value);
+ }
+ }
+ ///
+ /// indica il codice articolo correntemente selezionato
+ ///
+ protected string currParticolare
+ {
+ get
+ {
+ return memLayer.ML.StringSessionObj("currParticolare");
+ }
+ set
+ {
+ memLayer.ML.setSessionVal("currParticolare", value, memLayer.ML.confReadBool("keepParticolareSel"));
+ }
+ }
+ ///
+ /// indica se i caratteri vadano forzati a maiuscoli
+ ///
+ public bool forceUppercase
+ {
+ get
+ {
+ return memLayer.ML.confReadBool("forceUppercase");
+ }
+ }
+ ///
+ /// num pezzi dell'ultimo UDC del particolare generato
+ ///
+ public int pezziUdc
+ {
+ get
+ {
+ int answ = 0;
+ try
+ {
+ answ = (int)MagClass.magazzino.taCartellini.getLastByParticolare(memLayer.ML.StringSessionObj("CodCS"), currParticolare)[0].Qta;
+ }
+ catch
+ { }
+ return answ;
+ }
+ }
+ ///
+ /// decodifica il tipo barcode acquisito
+ ///
+ public tipoCodiceBarcode tipoBCode
+ {
+ get
+ {
+ tipoCodiceBarcode answ = tipoCodiceBarcode.ND;
+ int trovati = 0;
+ // controllo non si tratti di un comando...
+ string preCmd = memLayer.ML.confReadString("prefComandi");
+ if (barcodeIn.StartsWith(preCmd))
+ {
+ answ = tipoCodiceBarcode.Comando;
+ }
+ // controllo se sia un particolare "P"
+ else if (barcodeIn.StartsWith("P"))
+ {
+ answ = tipoCodiceBarcode.Particolare;
+ }
+ else
+ {
+ try
+ {
+ // cerco tra gitterbox (UDC)...
+ trovati = MagClass.magazzino.taCartellini.getByUdc(barcodeIn).Rows.Count;
+ if (trovati > 0)
+ {
+ answ = tipoCodiceBarcode.UDC;
+ }
+ }
+ catch
+ {
+ }
+ }
+ return answ;
+ }
+ }
+ ///
+ /// valore barcode
+ ///
+ public string barcodeIn
+ {
+ get
+ {
+ return txtBarcode.Text.Trim();
+ }
+ set
+ {
+ txtBarcode.Text = value;
+ }
+ }
+ ///
+ /// qta pezzi x UDC
+ ///
+ public int qta
+ {
+ get
+ {
+ int qta = 0;
+ try
+ {
+ qta = Convert.ToInt32(txtQta.Text.Trim());
+ }
+ catch
+ { }
+ return qta;
+ }
+ set
+ {
+ txtQta.Text = value.ToString();
+ }
+ }
+ ///
+ /// controlla se ci sia un barcode
+ ///
+ private void checkBarcode()
+ {
+ if (barcodeIn != "")
+ {
+ lblMessaggi.Text = string.Format("Barcode digitato: {0}", barcodeIn);
+ switch (tipoBCode)
+ {
+ case tipoCodiceBarcode.Particolare:
+ // imposto il particolare corrente
+ currParticolare = barcodeIn;
+ // controllo esista il particolare scansionato
+ if (DataProxy.obj.taAnagParticolari.getByParticolare(currParticolare).Rows.Count == 0)
+ {
+ currParticolare = "";
+ lblMessaggi.Text += " - codice particolare non valido / non trovato in RILPRO.";
+ pnlAll.CssClass = "stileComandoKo";
+ }
+ else
+ {
+ lblMessaggi.Text += " - impostato particolare!";
+ pnlAll.CssClass = "stileComandoOk";
+ }
+ break;
+ case tipoCodiceBarcode.UDC:
+ // procedo solo se UDC esistente
+ if (MagClass.magazzino.checkUDC(barcodeIn))
+ {
+ // recupero il particolare dai dati del cartellino preesistente
+ currParticolare = DataProxy.obj.taCartellini.stp_getByUdc(barcodeIn)[0].Particolare;
+ // controllo esista il particolare
+ 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";
+ }
+ else
+ {
+ lblMessaggi.Text += " - impostato particolare!";
+ pnlAll.CssClass = "stileComandoOk";
+ }
+ }
+
+ break;
+ default:
+ lblMessaggi.Text += " - codice non riconosciuto!";
+ pnlAll.CssClass = "stileComandoND";
+ break;
+ }
+ barcodeIn = "";
+ }
+ else
+ {
+ lblMessaggi.Text = "...attesa barcode...";
+ }
+ //grView.DataBind();
+ txtBarcode.Focus();
+ }
+ ///
+ /// controllo l'abilitazioen alla stampa UDC:
+ /// - particolare ok
+ /// - qta > 0
+ /// - almeno 1 trattamento
+ /// altrimenti disabilito btn stampa
+ ///
+ private void checkStampa()
+ {
+ bool stampaOk = false;
+ if (currParticolare != "" && qta > 0)
+ {
+ stampaOk = true;
+ }
+ btnStampa.Enabled = stampaOk;
+ }
+ ///
+ /// genera i barcode di
+ /// - trattamenti
+ /// - nuovo x pezzi liquidi
+ /// e lancia la relativa stampa
+ ///
+ ///
+ ///
+ protected void btnStampa_Click(object sender, EventArgs e)
+ {
+ string newUdcChild = "";
+ int qta = memLayer.ML.confReadInt("QtaImballoLiquidiDaSpedire");
+ string noteTrim = txtNote.Text.Trim();
+ try
+ {
+ qta = Convert.ToInt32(txtQta.Text);
+ }
+ catch
+ { }
+ // genero cartellino liquidi
+ try
+ {
+ // creo nuovo UDC del trattamento liquidi
+ newUdcChild = MagClass.magazzino.creaUdc("LI", "", currParticolare, "", "", "", "", "", 0, memLayer.ML.confReadString("CodImballoLiquidiDaSpedire"), "U", "", qta, 0, 0, DateTime.Now, 0, "Fin", memLayer.ML.confReadInt("IdxPosizioneLiquidi"), true, "IdxPosizioneLiquidi", "UDC_FINITO", noteTrim, "", DateTime.Now.Year); // !!! "LI" HARD CODED x indicare flusso liquidi
+ }
+ catch
+ { }
+ // se ho cart liquidi genero (se non ci sono) cart trattamenti
+ if (newUdcChild != "")
+ {
+ // ora stampo il nuovo cartellino!!!
+ MagClass.magazzino.stampaUdc(newUdcChild, postazione_printer, tipoCartellino.cartFin);
+ }
+ }
+ ///
+ /// controllo campo barcode
+ ///
+ ///
+ ///
+ protected void txtBarcode_TextChanged(object sender, EventArgs e)
+ {
+ //doChecks();
+ }
+ }
+}
\ No newline at end of file
diff --git a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.designer.cs
new file mode 100644
index 00000000..60236896
--- /dev/null
+++ b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.designer.cs
@@ -0,0 +1,142 @@
+//------------------------------------------------------------------------------
+//
+// 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.
+//
+//------------------------------------------------------------------------------
+
+namespace GMW.WebUserControls {
+
+
+ public partial class mod_sanpos_creazioneF18 {
+
+ ///
+ /// pnlAll control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Panel pnlAll;
+
+ ///
+ /// lblPostazione control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblPostazione;
+
+ ///
+ /// lblPrinter control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblPrinter;
+
+ ///
+ /// hlMenu control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.HyperLink hlMenu;
+
+ ///
+ /// lblGitterBoxAttivo control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblGitterBoxAttivo;
+
+ ///
+ /// lblMessaggi control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblMessaggi;
+
+ ///
+ /// lblQta control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblQta;
+
+ ///
+ /// txtQta control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox txtQta;
+
+ ///
+ /// btnStampa control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Button btnStampa;
+
+ ///
+ /// lblBarcode control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblBarcode;
+
+ ///
+ /// txtBarcode control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox txtBarcode;
+
+ ///
+ /// aceParticolare control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::AjaxControlToolkit.AutoCompleteExtender aceParticolare;
+
+ ///
+ /// lblNote control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblNote;
+
+ ///
+ /// txtNote control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox txtNote;
+ }
+}
diff --git a/GMW/GMW/WebUserControls/mod_spostaDataMatrix.ascx.cs b/GMW/GMW/WebUserControls/mod_spostaDataMatrix.ascx.cs
index cbc98690..0e8367a1 100644
--- a/GMW/GMW/WebUserControls/mod_spostaDataMatrix.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_spostaDataMatrix.ascx.cs
@@ -45,7 +45,7 @@ namespace GMW.WebUserControls
int answ = 0;
try
{
- answ = (int)MagClass.magazzino.taElencoCartellini.getByUdc(currGitterBox)[0].Qta;
+ answ = (int)MagClass.magazzino.taCartellini.getByUdc(currGitterBox)[0].Qta;
}
catch
{ }
@@ -78,7 +78,7 @@ namespace GMW.WebUserControls
int numPezzi = maxPezzi;
try
{
- numPezzi = (int)MagClass.magazzino.taElencoCartellini.getByUdc(currGitterBox)[0].Qta;
+ numPezzi = (int)MagClass.magazzino.taCartellini.getByUdc(currGitterBox)[0].Qta;
}
catch
{
@@ -235,7 +235,7 @@ namespace GMW.WebUserControls
try
{
// cerco tra gitterbox (UDC)...
- trovati = MagClass.magazzino.taElencoCartellini.getByUdc(barcodeIn).Rows.Count;
+ trovati = MagClass.magazzino.taCartellini.getByUdc(barcodeIn).Rows.Count;
// cerco tra datamatrix
if (trovati > 0)
{
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index 16c726ca..cbd78cd2 100644
Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ
diff --git a/GMW/GMW/bin/GMW_data.dll b/GMW/GMW/bin/GMW_data.dll
index cf450f5d..64549659 100644
Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ
diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll
index 16c726ca..cbd78cd2 100644
Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ
diff --git a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache
index 3fa09daf..3ea04271 100644
Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW/sanpos_creazioneF18.aspx b/GMW/GMW/sanpos_creazioneF18.aspx
new file mode 100644
index 00000000..c1cad5da
--- /dev/null
+++ b/GMW/GMW/sanpos_creazioneF18.aspx
@@ -0,0 +1,5 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/AjaxSimpleFull.Master" AutoEventWireup="true" CodeBehind="sanpos_creazioneF18.aspx.cs" Inherits="GMW.sanpos_creazioneF18" %>
+<%@ Register src="WebUserControls/mod_sanpos_creazioneF18.ascx" tagname="mod_sanpos_creazioneF18" tagprefix="uc1" %>
+
+
+
diff --git a/GMW/GMW/sanpos_creazioneF18.aspx.cs b/GMW/GMW/sanpos_creazioneF18.aspx.cs
new file mode 100644
index 00000000..25b3f112
--- /dev/null
+++ b/GMW/GMW/sanpos_creazioneF18.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace GMW
+{
+ public partial class sanpos_creazioneF18 : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
diff --git a/GMW/GMW/sanpos_creazioneF18.aspx.designer.cs b/GMW/GMW/sanpos_creazioneF18.aspx.designer.cs
new file mode 100644
index 00000000..80a93337
--- /dev/null
+++ b/GMW/GMW/sanpos_creazioneF18.aspx.designer.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+//
+// 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.
+//
+//------------------------------------------------------------------------------
+
+namespace GMW {
+
+
+ public partial class sanpos_creazioneF18 {
+
+ ///
+ /// mod_sanpos_creazioneF181 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::GMW.WebUserControls.mod_sanpos_creazioneF18 mod_sanpos_creazioneF181;
+ }
+}
diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs
index e6dee44f..7431afeb 100644
--- a/GMW/GMW_data/MagClass.cs
+++ b/GMW/GMW_data/MagClass.cs
@@ -25,7 +25,6 @@ namespace GMW_data
public DS_magazzinoTableAdapters.V_DettMagPartTableAdapter taDettMagPart;
public DS_magazzinoTableAdapters.v_UdcDetailTableAdapter taDettUDC;
public DS_magazzinoTableAdapters.ElencoListePrelievoTableAdapter taElencoListePrelievo;
- public DS_magazzinoTableAdapters.ElencoCartelliniTableAdapter taElencoCartellini;
public DS_magazzinoTableAdapters.RigheListePrelievoTableAdapter taRigheListePrelievo;
public DS_magazzinoTableAdapters.TipoListaPrelievoTableAdapter taTipoListaPrelievo;
public DS_magazzinoTableAdapters.V_ParticolariOverviewTableAdapter taVParticolariOverwiew;
@@ -56,7 +55,6 @@ namespace GMW_data
taDettMagPart = new GMW_data.DS_magazzinoTableAdapters.V_DettMagPartTableAdapter();
taDettUDC = new GMW_data.DS_magazzinoTableAdapters.v_UdcDetailTableAdapter();
taElencoListePrelievo = new GMW_data.DS_magazzinoTableAdapters.ElencoListePrelievoTableAdapter();
- taElencoCartellini = new GMW_data.DS_magazzinoTableAdapters.ElencoCartelliniTableAdapter();
taRigheListePrelievo = new GMW_data.DS_magazzinoTableAdapters.RigheListePrelievoTableAdapter();
taTipoListaPrelievo = new GMW_data.DS_magazzinoTableAdapters.TipoListaPrelievoTableAdapter();
taVParticolariOverwiew = new GMW_data.DS_magazzinoTableAdapters.V_ParticolariOverviewTableAdapter();
@@ -86,7 +84,6 @@ namespace GMW_data
taDettMagPart.Connection.ConnectionString = connString;
taDettUDC.Connection.ConnectionString = connString;
taElencoListePrelievo.Connection.ConnectionString = connString;
- taElencoCartellini.Connection.ConnectionString = connString;
taRigheListePrelievo.Connection.ConnectionString = connString;
taTipoListaPrelievo.Connection.ConnectionString = connString;
taVParticolariOverwiew.Connection.ConnectionString = connString;
@@ -280,7 +277,7 @@ namespace GMW_data
bool answ = false;
try
{
- answ = (taElencoCartellini.getDetailsUdcByUdc(UDC).Rows.Count > 0);
+ answ = (taCartellini.getDetailsUdcByUdc(UDC).Rows.Count > 0);
}
catch
{ }
@@ -314,7 +311,7 @@ namespace GMW_data
try
{
// calcolo posizione destinazione da state machine...
- idxPosizUdcCorr = taElencoCartellini.getDetailsUdcByUdc(UDC)[0].IdxPosizione;
+ idxPosizUdcCorr = taCartellini.getDetailsUdcByUdc(UDC)[0].IdxPosizione;
idxPosizUdcDest = StateMachine.SM.getIdxPostizioneTo("UDC_CONS", idxPosizUdcCorr);
}
catch (Exception e)
@@ -586,7 +583,7 @@ namespace GMW_data
DS_magazzino.ElencoListePrelievoDataTable tabellaElenco = taElencoListePrelievo.getByCodLista(CodLista);
DS_magazzino.ElencoListePrelievoRow rigaElenco = tabellaElenco[0];
- DS_magazzino.ElencoCartelliniDataTable tabellaUDC = taElencoCartellini.getDetailsUdcByUdc(UDC);
+ DS_magazzino.ElencoCartelliniDataTable tabellaUDC = taCartellini.getDetailsUdcByUdc(UDC);
DS_magazzino.ElencoCartelliniRow rigaUDC = tabellaUDC[0];
// ricavo dati da confrontare - da Lista ricavo particolare/esponente/figura
@@ -804,7 +801,7 @@ namespace GMW_data
try
{
// recupero posizione attuale
- int idxPosizione = taElencoCartellini.getDetailsUdcByUdc(UDC)[0].IdxPosizione;
+ int idxPosizione = taCartellini.getDetailsUdcByUdc(UDC)[0].IdxPosizione;
// verifico se riattivabile
answ = taAnagPos.getByIdxPosizione(idxPosizione)[0].IsRiattivaEnabled;
}
@@ -922,7 +919,7 @@ namespace GMW_data
if (codListaAttuale != "")
{
answ = codListaAttuale;
- DS_magazzino.ElencoCartelliniDataTable tabellaElencoCartellini = taElencoCartellini.getUdcUnusedOlder(codListaAttuale);
+ DS_magazzino.ElencoCartelliniDataTable tabellaElencoCartellini = taCartellini.getUdcUnusedOlder(codListaAttuale);
allocaRigheListaPrelievo(QtaTot, codListaAttuale, tabellaElencoCartellini);
}
}
@@ -1170,7 +1167,7 @@ namespace GMW_data
// il secondo idx che mi serve
idxCellaFrom = rigaUdcCorrente.IdxCella;
// calcolo posizione destinazione da state machine...
- idxPosizUdcCorr = taElencoCartellini.getDetailsUdcByUdc(UDC)[0].IdxPosizione;
+ idxPosizUdcCorr = taCartellini.getDetailsUdcByUdc(UDC)[0].IdxPosizione;
idxPosizUdcDest = StateMachine.SM.getIdxPostizioneTo(CodEvento, idxPosizUdcCorr);
// a questo punto mi calcolo se c'è una cella di destinazione associata
try
@@ -1376,7 +1373,7 @@ namespace GMW_data
// svuoto PRIMA gli UDC non prelevati
taRigheListePrelievo.stp_RigheListePrelievo_eliminaNonPrelevate(CodLista);
// rigenero righe UDC da prelevare
- DS_magazzino.ElencoCartelliniDataTable tabellaElencoCartellini = taElencoCartellini.getUdcUnusedOlder(CodLista);
+ DS_magazzino.ElencoCartelliniDataTable tabellaElencoCartellini = taCartellini.getUdcUnusedOlder(CodLista);
allocaRigheListaPrelievo(riga.QtaTot, CodLista, tabellaElencoCartellini);
}
catch
@@ -1400,7 +1397,7 @@ namespace GMW_data
// aggiungo l'UDC + vecchio (se c'è)
try
{
- tabellaElencoCartellini.ImportRow(taElencoCartellini.getUdcUnusedOlder(CodLista)[0]);
+ tabellaElencoCartellini.ImportRow(taCartellini.getUdcUnusedOlder(CodLista)[0]);
}
catch (Exception e)
{
diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll
index cf450f5d..64549659 100644
Binary files a/GMW/GMW_data/bin/Debug/GMW_data.dll and b/GMW/GMW_data/bin/Debug/GMW_data.dll differ
diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll
index cf450f5d..64549659 100644
Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ