Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MAG' into ADM

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-02-01 13:28:09 +01:00
parent d31559f1ec d0c27f8e3f
commit cedc18bb04
24 changed files with 290 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-MAG/MP-MAG.csproj
+8
View File
@@ -352,6 +352,13 @@
<Compile Include="SMART\printCartOdl.aspx.designer.cs">
<DependentUpon>printCartOdl.aspx</DependentUpon>
</Compile>
<Compile Include="SMART\Reset.aspx.cs">
<DependentUpon>Reset.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="SMART\Reset.aspx.designer.cs">
<DependentUpon>Reset.aspx</DependentUpon>
</Compile>
<Compile Include="SMART\SmartStarter.aspx.cs">
<DependentUpon>SmartStarter.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -802,6 +809,7 @@
<Content Include="SMART\packList.aspx" />
<Content Include="SMART\PLScanner.aspx" />
<Content Include="SMART\printCartOdl.aspx" />
<Content Include="SMART\Reset.aspx" />
<Content Include="SMART\SmartStarter.aspx" />
<Content Include="SMART\tryLogin.aspx" />
<Content Include="WebUserControls\cmp_activeParams.ascx" />
MP-MAG/SMART/Reset.aspx
+16
View File
@@ -0,0 +1,16 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Reset.aspx.cs" Inherits="MP_MAG.SMART.Reset" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title></title>
</head>
<body>
<form id="form1" runat="server">
<div>
</div>
</form>
</body>
</html>
MP-MAG/SMART/Reset.aspx.cs
+22
View File
@@ -0,0 +1,22 @@
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MP_MAG.SMART
{
public partial class Reset : System.Web.UI.Page
{
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
DataWrap.DW.resetVocabolario();
}
#endregion Protected Methods
}
}
MP-MAG/SMART/Reset.aspx.designer.cs
Generated
+25
View File
@@ -0,0 +1,25 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MP_MAG.SMART
{
public partial class Reset
{
/// <summary>
/// Controllo form1.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
}
}
MP-MAG/SMART/gestPedane.aspx
+2 -1
View File
@@ -22,6 +22,7 @@
<uc1:cmp_OrderList runat="server" ID="cmp_OrderList" EnableEdit="false" />
</div>
<div class="col-12 col-md-2">
<asp:LinkButton runat="server" ID="lbtRefresh" CssClass="btn btn-block btn-primary" OnClick="lbtRefresh_Click"><i class="fas fa-sync-alt"></i> Aggiorna</asp:LinkButton>
<asp:Image runat="server" ID="imgQrMain" CssClass="img-fluid" />
</div>
</div>
@@ -38,6 +39,6 @@
</div>
</div>
</div>
<asp:Timer runat="server" ID="timerGestPed" Interval="10000" OnTick="timerGestPed_Tick" />
</div>
<asp:Timer runat="server" ID="timerGestPed" Interval="2000" OnTick="timerGestPed_Tick" />
</asp:Content>
MP-MAG/SMART/gestPedane.aspx.cs
+14 -2
View File
@@ -56,6 +56,13 @@ namespace MP_MAG.SMART
refreshQrCode();
}
private void refreshStatus()
{
cmp_OrderList.doUpdate();
cmp_elencoPedane.doUpdate();
cmp_elencoUDC.doUpdate();
}
private void resetSelezione()
{
cmp_elencoPedane.resetSelezione();
@@ -88,10 +95,16 @@ namespace MP_MAG.SMART
return answ;
}
protected void lbtRefresh_Click(object sender, EventArgs e)
{
refreshStatus();
}
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((Site)this.Master).showSearch = false;
resetSelezione();
}
cmp_elencoPedane.eh_doRefresh += Cmp_elencoPedane_eh_doRefresh;
@@ -108,8 +121,7 @@ namespace MP_MAG.SMART
protected void timerGestPed_Tick(object sender, EventArgs e)
{
cmp_elencoPedane.doUpdate();
cmp_elencoUDC.doUpdate();
refreshStatus();
}
#endregion Protected Methods
MP-MAG/SMART/gestPedane.aspx.designer.cs
Generated
+9
View File
@@ -41,6 +41,15 @@ namespace MP_MAG.SMART
/// </remarks>
protected global::MP_MAG.WebUserControls.cmp_OrderList cmp_OrderList;
/// <summary>
/// Controllo lbtRefresh.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtRefresh;
/// <summary>
/// Controllo imgQrMain.
/// </summary>
MP-MAG/SMART/packList.aspx.cs
+1
View File
@@ -15,6 +15,7 @@ namespace MP_MAG.SMART
{
if (!Page.IsPostBack)
{
((Site)this.Master).showSearch = false;
cmp_packListMgmt.showAdd = true;
}
}
MP-MAG/SMART/printCartOdl.aspx
+10 -4
View File
@@ -5,16 +5,22 @@
<%@ Register Src="~/WebUserControls/cmp_printODL.ascx" TagPrefix="uc1" TagName="cmp_printODL" %>
<%@ Register Src="~/WebUserControls/cmp_listODL.ascx" TagPrefix="uc1" TagName="cmp_listODL" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<div class="card m-2">
<div class="card-header table-info">
<h3>Stampa ODL</h3>
<div class="row">
<div class="col-9">
<h3>Stampa ODL</h3>
</div>
<div class="col-3 text-right">
<asp:LinkButton runat="server" ID="lbtResetOdl" ToolTip="Reset ODL" CssClass="btn btn-dark" OnClick="lbtResetOdl_Click"><i class="fas fa-sync-alt"></i> Reset ODL</asp:LinkButton>
</div>
</div>
</div>
<div class="card-body">
<div class="row">
<div runat="server" id="divOdl" class="col-12">
<uc1:cmp_listODL runat="server" id="cmp_listODL" />
<uc1:cmp_listODL runat="server" ID="cmp_listODL" />
</div>
</div>
<div runat="server" id="divPrint" class="row">
@@ -30,4 +36,4 @@
</div>
</div>
</div>
</asp:Content>
</asp:Content>
MP-MAG/SMART/printCartOdl.aspx.cs
+18 -5
View File
@@ -11,6 +11,15 @@ namespace MP_MAG.SMART
{
#region Private Methods
private void checkVisibility()
{
// verifico ci sia ODL
bool missingOdl = MagData.MagDataLayer.man.currProdPrintData.IdxOdl <= 0;
// di conseguenza mostro stampa oppure selezione ODL...
divOdl.Visible = missingOdl;
divPrint.Visible = !missingOdl;
}
private void Cmp_printODL_eh_addNew(object sender, EventArgs e)
{
cmp_UdcODL.doUpdate();
@@ -20,16 +29,20 @@ namespace MP_MAG.SMART
#region Protected Methods
protected void lbtResetOdl_Click(object sender, EventArgs e)
{
var printData = MagData.MagDataLayer.man.currProdPrintData;
printData.IdxOdl = -2;
MagData.MagDataLayer.man.currProdPrintData = printData;
checkVisibility();
}
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((Site)this.Master).showSearch = false;
// verifico ci sia ODL
bool missingOdl = MagData.MagDataLayer.man.currProdPrintData.IdxOdl <= 0;
// di conseguenza mostro stampa oppure selezione ODL...
divOdl.Visible = missingOdl;
divPrint.Visible = !missingOdl;
checkVisibility();
}
cmp_printODL.eh_addNew += Cmp_printODL_eh_addNew;
}
MP-MAG/SMART/printCartOdl.aspx.designer.cs
Generated
+9
View File
@@ -14,6 +14,15 @@ namespace MP_MAG.SMART
public partial class printCartOdl
{
/// <summary>
/// Controllo lbtResetOdl.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtResetOdl;
/// <summary>
/// Controllo divOdl.
/// </summary>
MP-MAG/WebUserControls/cmp_OrderList.ascx
+25 -2
View File
@@ -3,8 +3,17 @@
<div class="card">
<div class="card-header bg-info text-light">
<h5>Dettaglio Richiesta</h5>
<uc1:cmp_OrderListAdd runat="server" ID="cmp_OrderListAdd" />
<div class="row">
<div class="col-8">
<h5>Dettaglio Richiesta</h5>
</div>
<div class="col-4">
<asp:LinkButton runat="server" ID="lbtPrintReport" CssClass="btn btn-block btn-primary" OnClick="lbtPrintReport_Click" Visible="true" ToolTip="Stampa report dettagliato pedane (A4)" OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmPrintPackDetail") %>'>REPORT Dettaglio <i class="fas fa-print"></i></asp:LinkButton>
</div>
<div class="col-12">
<uc1:cmp_OrderListAdd runat="server" ID="cmp_OrderListAdd" />
</div>
</div>
</div>
<div class="card-body p-0">
<asp:GridView runat="server" ID="grView" AutoGenerateColumns="False" DataKeyNames="OrderListID" DataSourceID="ods" CssClass="table table-striped table-sm border border-info">
@@ -122,4 +131,18 @@
<asp:HiddenField runat="server" ID="hfCodCli" />
<asp:HiddenField runat="server" ID="hfEnableEdit" />
</div>
<div class="card-footer py-1">
<div class="row small">
<div class="col-12 text-right">
<i class="fa fa-print" aria-hidden="true"></i>Report <i class="fa fa-arrow-right" aria-hidden="true"></i>
<asp:DropDownList runat="server" ID="ddlPost" DataSourceID="odsPedaneList" DataTextField="label" DataValueField="valString">
</asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="odsPedaneList" OldValuesParameterFormatString="original_{0}" SelectMethod="getFilt" TypeName="MagData.DS_UtilityTableAdapters.selAKVTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="PRT_CART_PED_LIST" Name="TabField" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
</div>
</div>
</div>
MP-MAG/WebUserControls/cmp_OrderList.ascx.cs
+12
View File
@@ -74,6 +74,17 @@ namespace MP_MAG.WebUserControls
cmp_OrderListAdd.Visible = !cmp_OrderListAdd.Visible;
}
/// <summary>
/// Avvia stampa report pedana
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbtPrintReport_Click(object sender, EventArgs e)
{
// lancio il report x l'elenco pedane + contenuto
MagDataLayerObj.taPJQ.insertQuery($"{tipoDocumento.docPackList}", $"{PackListID}", ddlPost.SelectedValue);
}
/// <summary>
/// comando reset
/// </summary>
@@ -89,6 +100,7 @@ namespace MP_MAG.WebUserControls
if (!Page.IsPostBack)
{
cmp_OrderListAdd.Visible = false;
lbtPrintReport.DataBind();
}
cmp_OrderListAdd.eh_addNew += Cmp_OrderListAdd_eh_addNew;
}
MP-MAG/WebUserControls/cmp_OrderList.ascx.designer.cs
Generated
+27
View File
@@ -14,6 +14,15 @@ namespace MP_MAG.WebUserControls
public partial class cmp_OrderList
{
/// <summary>
/// Controllo lbtPrintReport.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtPrintReport;
/// <summary>
/// Controllo cmp_OrderListAdd.
/// </summary>
@@ -67,5 +76,23 @@ namespace MP_MAG.WebUserControls
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfEnableEdit;
/// <summary>
/// Controllo ddlPost.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlPost;
/// <summary>
/// Controllo odsPedaneList.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsPedaneList;
}
}
MP-MAG/WebUserControls/cmp_elencoPedane.ascx
+3 -3
View File
@@ -17,7 +17,7 @@
<asp:LinkButton runat="server" ID="lbtSetCompleted" CssClass="btn btn-block btn-success" OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmCompleted") %>' OnClick="lbtSetCompleted_Click" ToolTip="Preparazione PackList COMPLETATA">COMPLETA <i class="fa fa-hourglass-end" aria-hidden="true"></i></asp:LinkButton>
</div>
<div class="col-3">
<asp:LinkButton runat="server" ID="lbtPrintReport" CssClass="btn btn-block btn-primary" OnClick="lbtPrintReport_Click" Visible="true" ToolTip="Stampa report dettagliato pedane (A4)">REPORT Dettaglio <i class="fas fa-print"></i></asp:LinkButton>
<%--<asp:LinkButton runat="server" ID="lbtPrintReport" CssClass="btn btn-block btn-primary" OnClick="lbtPrintReport_Click" ToolTip="Stampa report dettagliato pedane (A4)">REPORT Dettaglio <i class="fas fa-print"></i></asp:LinkButton>--%>
</div>
</div>
<div runat="server" id="divAddNew" class="row table-secondary py-1">
@@ -115,14 +115,14 @@
</asp:ObjectDataSource>
</div>
<div class="col-4">
<i class="fa fa-print" aria-hidden="true"></i>Report <i class="fa fa-arrow-right" aria-hidden="true"></i>
<%--<i class="fa fa-print" aria-hidden="true"></i>Report <i class="fa fa-arrow-right" aria-hidden="true"></i>
<asp:DropDownList runat="server" ID="ddlPost" DataSourceID="odsPedaneList" DataTextField="label" DataValueField="valString">
</asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="odsPedaneList" OldValuesParameterFormatString="original_{0}" SelectMethod="getFilt" TypeName="MagData.DS_UtilityTableAdapters.selAKVTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="PRT_CART_PED_LIST" Name="TabField" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</asp:ObjectDataSource>--%>
</div>
<div class="col-4 text-right">
<uc1:cmp_numRow runat="server" ID="cmp_numRow" />
MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs
+4
View File
@@ -160,6 +160,7 @@ namespace MP_MAG.WebUserControls
grView.DataBind();
}
#if false
/// <summary>
/// Avvia stampa report pedana
/// </summary>
@@ -170,6 +171,7 @@ namespace MP_MAG.WebUserControls
// lancio il report x l'elenco pedane + contenuto
MagDataLayerObj.taPJQ.insertQuery($"{tipoDocumento.docPackList}", $"{PackListID}", ddlPost.SelectedValue);
}
#endif
/// <summary>
/// comando reset
@@ -213,6 +215,8 @@ namespace MP_MAG.WebUserControls
grView.PageSize = cmp_numRow.numRow;
divAddNew.Visible = false;
lastCmd = "";
lbtSetStarted.DataBind();
lbtSetCompleted.DataBind();
}
cmp_numRow.eh_doRefresh += Cmp_numRow_eh_doRefresh;
checkBtn();
MP-MAG/WebUserControls/cmp_elencoPedane.ascx.designer.cs
Generated
-27
View File
@@ -41,15 +41,6 @@ namespace MP_MAG.WebUserControls
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtSetCompleted;
/// <summary>
/// Controllo lbtPrintReport.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtPrintReport;
/// <summary>
/// Controllo divAddNew.
/// </summary>
@@ -131,24 +122,6 @@ namespace MP_MAG.WebUserControls
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsPedaneSingle;
/// <summary>
/// Controllo ddlPost.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlPost;
/// <summary>
/// Controllo odsPedaneList.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsPedaneList;
/// <summary>
/// Controllo cmp_numRow.
/// </summary>
MP-MAG/WebUserControls/cmp_listODL.ascx.cs
+43 -11
View File
@@ -10,14 +10,19 @@ namespace MP_MAG.WebUserControls
{
public partial class cmp_listODL : BaseUserControl
{
protected void Page_Load(object sender, EventArgs e)
#region Private Methods
private void resetSelezione()
{
if (!Page.IsPostBack)
{
grView.PageSize = 5;
}
grView.SelectedIndex = -1;
grView.DataBind();
raiseReset();
}
#endregion Private Methods
#region Protected Methods
protected void grView_SelectedIndexChanged(object sender, EventArgs e)
{
// recupero ODL
@@ -28,7 +33,11 @@ namespace MP_MAG.WebUserControls
// salvo in cookie i dati idxODL, idxMacchina e QtaUdc x successivo impiego
string IdxMacchina = ddlMacchina.SelectedValue;
int QtaUdc = 1; // default...
int QtaUdc = QtaUdcByOdl(IdxODL);
if (QtaUdc <= 0)
{
QtaUdc = 100;
}
bool isFinito = false;
string ArtCod = "";
string ArtDesc = "";
@@ -76,8 +85,8 @@ namespace MP_MAG.WebUserControls
string tgtPage = "printCartOdl";
Response.Redirect($"~/SMART/{tgtPage}");
}
}
/// <summary>
/// comando reset
/// </summary>
@@ -87,11 +96,34 @@ namespace MP_MAG.WebUserControls
{
resetSelezione();
}
private void resetSelezione()
protected void Page_Load(object sender, EventArgs e)
{
grView.SelectedIndex = -1;
grView.DataBind();
raiseReset();
if (!Page.IsPostBack)
{
grView.PageSize = 5;
}
}
protected int QtaUdcByOdl(int idxOdl)
{
int answ = 1;
string codGrp = "IMB";
string codVal = "NUM_PZ_CONT";
// recupero dato da scheda tecnica della quantità per UDC
var tabSTAR = DataLayerObj.taSTAR.getByGrpOdlLbl(codGrp, codVal, idxOdl);
if (tabSTAR.Rows.Count > 0)
{
try
{
int.TryParse(tabSTAR[0].Value, out answ);
}
catch
{ }
}
return answ;
}
#endregion Protected Methods
}
}
MP-MAG/WebUserControls/cmp_packList.ascx
+1 -1
View File
@@ -3,7 +3,7 @@
<%@ Register Src="~/WebUserControls/cmp_OrderList.ascx" TagPrefix="uc1" TagName="cmp_OrderList" %>
<div class="row">
<div class="col-12" runat="server" id="divAction">
<div class="col-12">
<div class="row textCondens">
<div class="col-3">
<asp:LinkButton runat="server" ID="lbtSetDraft" CssClass="btn btn-block btn-info" OnClick="lbtSetDraft_Click" OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmSetDraft") %>'><i class="fas fa-reply" aria-hidden="true"></i> BOZZA</asp:LinkButton>
MP-MAG/WebUserControls/cmp_packList.ascx.cs
+21 -19
View File
@@ -43,32 +43,34 @@ namespace MP_MAG.WebUserControls
private void showAction(bool showAction)
{
divAction.Visible = showAction;
// calcolo cosa mostro da status corrente
var tabPackList = MagData.MagDataLayer.man.taPList.getByKey(PackListID);
lbtSetDraft.Visible = false;
lbtSetRequest.Visible = false;
lbtSendPack.Visible = false;
if (tabPackList != null && tabPackList.Count > 0)
lbtSendPack.CssClass = "btn btn-block btn-outline-secondary disabled";
lbtSetDraft.CssClass = "btn btn-block btn-outline-secondary disabled";
lbtSetRequest.CssClass = "btn btn-block btn-outline-secondary disabled";
if (showAction)
{
int currStatus = tabPackList[0].PackStatus;
switch (currStatus)
if (tabPackList != null && tabPackList.Count > 0)
{
case 0:
lbtSetRequest.Visible = true;
break;
int currStatus = tabPackList[0].PackStatus;
switch (currStatus)
{
case 0:
lbtSetRequest.CssClass = "btn btn-block btn-success";
break;
case 1:
lbtSetDraft.Visible = true;
break;
case 1:
lbtSetDraft.CssClass = "btn btn-block btn-info";
break;
case 3:
lbtSetRequest.Visible = true;
lbtSendPack.Visible = true;
break;
case 3:
lbtSetDraft.CssClass = "btn btn-block btn-info";
lbtSendPack.CssClass = "btn btn-block btn-warning";
break;
default:
break;
default:
break;
}
}
}
}
MP-MAG/WebUserControls/cmp_packList.ascx.designer.cs
Generated
-9
View File
@@ -14,15 +14,6 @@ namespace MP_MAG.WebUserControls
public partial class cmp_packList
{
/// <summary>
/// Controllo divAction.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divAction;
/// <summary>
/// Controllo lbtSetDraft.
/// </summary>
MP-MAG/WebUserControls/cmp_packListMgmt.ascx.cs
+2
View File
@@ -63,6 +63,8 @@ namespace MP_MAG.WebUserControls
{
cmp_packListNew.CodCliente = ddlElencoCli.SelectedValue;
cmp_packList.CodCliente = ddlElencoCli.SelectedValue;
cmp_packList.resetSelezione();
cmp_OrderList.Visible = false;
}
protected void lbtAddNew_Click(object sender, EventArgs e)
MP-MAG/WebUserControls/cmp_packListNew.ascx
+3 -3
View File
@@ -5,10 +5,10 @@
<b>Creazione Packing List</b>
</div>
<div class="card-body table-info">
<div class="row">
<div class="row mb-1">
<asp:HiddenField runat="server" ID="hfCodCli" />
<div class="col-8">
<div class="input-group mb-3">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">Note</span>
</div>
@@ -16,7 +16,7 @@
</div>
</div>
<div class="col-4">
<div class="input-group mb-3">
<div class="input-group">
<asp:LinkButton runat="server" ID="lbtAddNew" CssClass="btn btn-block btn-success" OnClick="lbtAddNew_Click">
<asp:Label runat="server" ID="lblBtn">Crea PackList</asp:Label>
<i class="fa fa-plus" aria-hidden="true"></i>
MP-MAG/WebUserControls/cmp_printODL.ascx.cs
+15 -5
View File
@@ -78,6 +78,15 @@ namespace MP_MAG.WebUserControls
lbtPrint.Visible = numPz2print > 0;
}
private void checkQtaRemUdc()
{
int numPz2print = calcPzRem;
if (numPz2print > 0)
{
numPzUdc = numPz2print > currData.QtaUdc ? currData.QtaUdc : numPz2print;
}
}
#endregion Private Methods
#region Protected Methods
@@ -86,6 +95,11 @@ namespace MP_MAG.WebUserControls
{
string flusso = currData.isProdFinito ? "MFI" : "MSL";
tipoDocumento tipoDoc = currData.isProdFinito ? tipoDocumento.docFinito : tipoDocumento.docSemilavorato;
// sistemo pezzi
if (calcPzRem < numPzUdc)
{
numPzUdc = calcPzRem;
}
// creo UDC
var tabUdc = MagDataLayerObj.taEUdc.insertQuery(currData.Lotto, flusso, currData.CliCod, currData.CodPost, numPzUdc, 1, "", 0, 0, 0, "", 0, "");
// se ho nuovo udc --> seleziono stampa!
@@ -104,11 +118,7 @@ namespace MP_MAG.WebUserControls
if (!Page.IsPostBack)
{
// sistemo pezzi
int numPz2print = calcPzRem;
if (numPz2print > 0)
{
numPzUdc = numPz2print > currData.QtaUdc ? currData.QtaUdc : numPz2print;
}
checkQtaRemUdc();
}
checkPrint();
}