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

FIX Controllo cod contenitore (se vuoto NON permette stampa)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-04-17 19:15:21 +02:00
parent 15205731b5
commit c10c1f9b21
3 changed files with 51 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW/GMW.csproj.user
+1 -1
View File
@@ -10,7 +10,7 @@
<Use64BitIISExpress />
<IISExpressSSLPort />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>TK_prod|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
GMW/WebUserControls/mod_post_B48.ascx.cs
+49 -35
View File
@@ -4,7 +4,6 @@ using System;
using System.Data;
using System.Linq;
using System.Web.UI;
namespace GMW.WebUserControls
{
public partial class mod_post_B48 : System.Web.UI.UserControl
@@ -35,8 +34,6 @@ namespace GMW.WebUserControls
return memLayer.ML.cdvi("QtaImballoRXFin");
}
}
/// <summary>
/// stringa UID univoca
/// </summary>
@@ -47,7 +44,6 @@ namespace GMW.WebUserControls
return this.UniqueID.Replace("$", "_").Replace("-", "_");
}
}
/// <summary>
/// flusso associato (hard coded) ad ancestor TT (Trattati)
/// </summary>
@@ -64,7 +60,6 @@ namespace GMW.WebUserControls
/// codice evento dell'UDC temporaneo (IN) che si crea
/// </summary>
protected string codEventoUdcIn = "UDC_TRATT";
protected string cssOk = "stileComandoOk";
protected string cssErr = "stileComandoKo";
protected string cssWait = "stileComandoND";
@@ -72,7 +67,6 @@ namespace GMW.WebUserControls
protected string cssWarn = "stileComandoWarn";
protected string cssAdd = "stileComandoAdd";
public event EventHandler eh_reqUpdate;
/// <summary>
/// ultimo valore barcode letto (x confronto conferme doppio input...)
/// </summary>
@@ -211,6 +205,44 @@ namespace GMW.WebUserControls
}
}
/// <summary>
/// Cod contenitore corrente
/// </summary>
public string codContCurr
{
get
{
return txtCodCont.Text.Trim();
}
set
{
txtCodCont.Text = value.Trim();
}
}
/// <summary>
/// Cod contenitore salvato su DB
/// </summary>
public string codContSaved
{
get
{
string codCont = "";
// cerco attributi UDC
DS_magazzino.Attr2UDCDataTable tabAttributi = MagClass.magazzino.taAtt2UDC.getByUdc(currUDC);
if (tabAttributi.Rows.Count > 0)
{
try
{
var dataRow = tabAttributi.AsEnumerable().Where(x => x.Field<string>("CodAttr") == "CC").FirstOrDefault();
codCont = dataRow.ValAttr;
}
catch
{ }
}
// restituisco codice...
return codCont;
}
}
/// <summary>
/// wrapper traduzione
/// </summary>
/// <param name="lemma"></param>
@@ -366,21 +398,8 @@ namespace GMW.WebUserControls
}
protected void tryFixCodCont()
{
string codCont = "";
// cerco attributi UDC
DS_magazzino.Attr2UDCDataTable tabAttributi = MagClass.magazzino.taAtt2UDC.getByUdc(currUDC);
if (tabAttributi.Rows.Count > 0)
{
try
{
var dataRow = tabAttributi.AsEnumerable().Where(x => x.Field<string>("CodAttr") == "CC").FirstOrDefault();
codCont = dataRow.ValAttr;
}
catch
{ }
}
// imposto codice...
txtCodCont.Text = codCont;
// imposto codice da quello salvato (SE C'E')...
codContCurr = codContSaved;
lbtUpdateCodCont.Visible = false;
}
/// <summary>
@@ -421,7 +440,6 @@ namespace GMW.WebUserControls
Postazione.warningText = traduci("ErroreAlNonTtAttivo");
Postazione.CssClass = "stileComandoKo";
}
return answ;
}
/// <summary>
@@ -642,7 +660,6 @@ namespace GMW.WebUserControls
}
else // PROCEDO!!!
{
// controllo formato datamatrix sia impostato sulla linea (altrimenti errore linea "non battezzata")
if (FormatoDtmxLinea == "")
{
@@ -708,7 +725,6 @@ namespace GMW.WebUserControls
}
doUpdate();
}
/// <summary>
/// crea eventualmente UDC per particolare
/// </summary>
@@ -754,7 +770,6 @@ namespace GMW.WebUserControls
newUdcChild = MagClass.magazzino.creaUdc(flusso, "", currParticolare, "", "", "", "", "", 0, memLayer.ML.cdv("CodImballoRX"), "U", MagClass.magazzino.CodSoggCurrUser, qta, 0, 0, adesso, 0, statoUdcOut, memLayer.ML.cdvi("IdxPosizioneRxFinTemp"), "IdxPosizioneRxFinTemp", codEventoUdcOut, noteTrim, "", adesso.Year, Request.UserHostName);
// lo associo all'AL...
MagClass.magazzino.taAL2UDC.Insert(destAL, newUdcChild, adesso, MagClass.magazzino.CodSoggCurrUser);
}
catch (Exception exc)
{
@@ -777,9 +792,7 @@ namespace GMW.WebUserControls
doUpdate();
}
}
#region metodi processing DataMatrix letto da BarCode
/// <summary>
/// processa aggiunta datamatrix (SE POSSIBILE)
/// </summary>
@@ -845,9 +858,7 @@ namespace GMW.WebUserControls
DataMatrix_mgr.taAtt2Dtx.insertAndProc(barcodeIn, true, "XQ", "Rim. UDC B48", DateTime.Now, MagClass.magazzino.CodSoggCurrUser);
}
}
#endregion
/// <summary>
/// aggiorna tabella + focus a barcode
/// </summary>
@@ -966,9 +977,9 @@ namespace GMW.WebUserControls
DateTime adesso = DateTime.Now;
// elimino eventuale PRECEDENTE valore...
MagClass.magazzino.taAtt2UDC.deleteByPar(currUDC, "CC");
MagClass.magazzino.taAtt2UDC.upsertVal(currUDC, "CC", txtCodCont.Text.Trim(), adesso, MagClass.magazzino.CodSoggCurrUser);
MagClass.magazzino.taAtt2UDC.upsertVal(currUDC, "CC", codContCurr, adesso, MagClass.magazzino.CodSoggCurrUser);
lbtUpdateCodCont.Visible = false;
verificaBtnStampa();
}
/// <summary>
/// richiesta (ri)stampa UDC
@@ -1007,10 +1018,14 @@ namespace GMW.WebUserControls
{ }
if (qtaUDC > 0 && (qtaUDC <= QtaImballoRXFin))
{
// se le qta voluta e dtx sono uguali...
if (qtaUDC == qtaDtx)
// se il cod contenitore != ""
if (codContCurr != "" && codContSaved != "")
{
showBtnStampa = true;
// se le qta voluta e dtx sono uguali...
if (qtaUDC == qtaDtx)
{
showBtnStampa = true;
}
}
}
}
@@ -1133,7 +1148,6 @@ namespace GMW.WebUserControls
catch
{ }
}
protected void txtCodCont_TextChanged(object sender, EventArgs e)
{
lbtUpdateCodCont.Visible = true;
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=2102']) {
withEnv(['NEXT_BUILD_NUMBER=2105']) {
// impiego numero di build del SINGOLO RAMO
// env.versionNumber = VersionNumber(versionNumberString : '4.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
// forzo numero di build x tutti rami uguali