Merge branch 'develop' into SDK

This commit is contained in:
Samuele E. Locatelli
2020-07-28 12:49:18 +02:00
24 changed files with 709 additions and 205 deletions
+3 -1
View File
@@ -280,13 +280,15 @@ namespace AppData
switch (tipoDoc)
{
case tipoDocumento.docBinPre:
break;
case tipoDocumento.docBinPost:
int.TryParse(keyParam, out intIdx);
var tabBinPre = taBN.getByKey(intIdx);
answ = tabBinPre.Count > 0;
break;
case tipoDocumento.docCart:
int.TryParse(keyParam, out intIdx);
var tabCarts = taCR.getByKey(intIdx);
answ = tabCarts.Count > 0;
break;
case tipoDocumento.docPart:
int.TryParse(keyParam, out intIdx);
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=300']) {
withEnv(['NEXT_BUILD_NUMBER=301']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '0.11.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
+16
View File
@@ -420,6 +420,7 @@
<Content Include="WebUserControls\cmp_KS_OkoiOI.ascx" />
<Content Include="WebUserControls\cmp_KS_OkoiSum.ascx" />
<Content Include="WebUserControls\cmp_KS_OtherItemsCart.ascx" />
<Content Include="WebUserControls\cmp_labelsPrint.ascx" />
<Content Include="WebUserControls\cmp_login.ascx" />
<Content Include="WebUserControls\cmp_ML_ShDet.ascx" />
<Content Include="WebUserControls\cmp_MU_carts.ascx" />
@@ -432,6 +433,7 @@
<Content Include="WebUserControls\cmp_offlineOrders.ascx" />
<Content Include="WebUserControls\cmp_offOrderDetail.ascx" />
<Content Include="WebUserControls\cmp_OOLI_detail.ascx" />
<Content Include="WebUserControls\cmp_orderPrint.ascx" />
<Content Include="WebUserControls\cmp_orderRunning.ascx" />
<Content Include="WebUserControls\cmp_orderSched.ascx" />
<Content Include="WebUserControls\cmp_painting.ascx" />
@@ -1065,6 +1067,13 @@
<Compile Include="WebUserControls\cmp_KS_OtherItemsCart.ascx.designer.cs">
<DependentUpon>cmp_KS_OtherItemsCart.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_labelsPrint.ascx.cs">
<DependentUpon>cmp_labelsPrint.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_labelsPrint.ascx.designer.cs">
<DependentUpon>cmp_labelsPrint.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_login.ascx.cs">
<DependentUpon>cmp_login.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1156,6 +1165,13 @@
<Compile Include="WebUserControls\cmp_OOLI_detail.ascx.designer.cs">
<DependentUpon>cmp_OOLI_detail.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_orderPrint.ascx.cs">
<DependentUpon>cmp_orderPrint.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_orderPrint.ascx.designer.cs">
<DependentUpon>cmp_orderPrint.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_orderRunning.ascx.cs">
<DependentUpon>cmp_orderRunning.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
+56 -42
View File
@@ -1,47 +1,61 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_MU_bins.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_MU_bins" %>
<div class="card text-center mb-2" style="width: 100%;">
<h5 class="card-header bg-primary text-light">BINS</h5>
<div class="card-body py-1">
<div class="row">
<div class="col-12 px-0">
<asp:GridView runat="server" ID="grView" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" DataKeyNames="BinID" DataSourceID="ods" CssClass="table table-striped table-sm table-borderless" BorderWidth="0">
<HeaderStyle CssClass="default" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="table-info" />
<EmptyDataTemplate>
No Record
</EmptyDataTemplate>
<Columns>
<asp:TemplateField HeaderText="Cod" SortExpression="BinDtmx">
<ItemTemplate>
<asp:Image runat="server" Height='<%# qrSize %>' Visible='<%# hfShowQr.Value.ToLower()=="true" %>' ImageUrl='<%# getImgUrl(Eval("BinDtmx")) %>' />
<b><asp:Label ID="lblBinIndex" runat="server" Text='<%# Eval("BinIndex","B{0}") %>' CssClass='<%# getCssByRatio(getRatio(Eval("TotItemLoad"),Eval("TotItem"))) %>' /></b>
<asp:Label ID="lblBinDtmx" runat="server" Visible='<%# hfShowQr.Value.ToLower()=="true" %>' Text='<%# Eval("BinDtmx") %>' CssClass="small" />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="D/T" SortExpression="TotItem">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("TotItemLoad") +"/" + Eval("TotItem") %>' CssClass='<%# getCssByRatio(getRatio(Eval("TotItemLoad"),Eval("TotItem"))) %>'/>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="%" SortExpression="TotItemLoad">
<ItemTemplate>
<asp:Label ID="Label3" runat="server" Text='<%# getRatio(Eval("TotItemLoad"),Eval("TotItem")).ToString("P1") %>' CssClass='<%# getCssByRatio(getRatio(Eval("TotItemLoad"),Eval("TotItem"))) %>'/>
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="original_{0}" SelectMethod="getByBatch" TypeName="AppData.DS_AppTableAdapters.BinsTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfBatchID" DefaultValue="0" Name="BatchID" PropertyName="Value" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:HiddenField ID="hfBatchID" runat="server" />
<asp:HiddenField ID="hfShowQr" runat="server" Value="false" />
<asp:HiddenField ID="hfQrSize" runat="server" Value="32" />
</div>
<h5 class="card-header bg-primary text-light">BINS</h5>
<div class="card-body py-1">
<div class="row">
<div class="col-12 px-0">
<asp:GridView runat="server" ID="grView" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" DataKeyNames="BinID" DataSourceID="ods" CssClass="table table-striped table-sm table-borderless" BorderWidth="0" OnSelectedIndexChanged="grView_SelectedIndexChanged">
<HeaderStyle CssClass="default" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="table-info" />
<EmptyDataTemplate>
No Record
</EmptyDataTemplate>
<Columns>
<asp:TemplateField HeaderText="Cod" SortExpression="BinDtmx">
<ItemTemplate>
<asp:Image runat="server" Height='<%# qrSize %>' Visible='<%# hfShowQr.Value.ToLower()=="true" %>' ImageUrl='<%# getImgUrl(Eval("BinDtmx")) %>' />
<b>
<asp:Label ID="lblBinIndex" runat="server" Text='<%# Eval("BinIndex","B{0}") %>' CssClass='<%# getCssByRatio(getRatio(Eval("TotItemLoad"),Eval("TotItem"))) %>' /></b>
<asp:Label ID="lblBinDtmx" runat="server" Visible='<%# hfShowQr.Value.ToLower()=="true" %>' Text='<%# Eval("BinDtmx") %>' CssClass="small" />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="D/T" SortExpression="TotItem">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("TotItemLoad") +"/" + Eval("TotItem") %>' CssClass='<%# getCssByRatio(getRatio(Eval("TotItemLoad"),Eval("TotItem"))) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="%" SortExpression="TotItemLoad">
<ItemTemplate>
<asp:Label ID="Label3" runat="server" Text='<%# getRatio(Eval("TotItemLoad"),Eval("TotItem")).ToString("P1") %>' CssClass='<%# getCssByRatio(getRatio(Eval("TotItemLoad"),Eval("TotItem"))) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField ShowHeader="False">
<HeaderTemplate>
<div class="text-center">
<asp:LinkButton ID="lbtPrintAll" runat="server" OnClick="lbtPrintAll_Click" CssClass="btn btn-sm btn-primary" ToolTip='<%# traduci("PrintAll") %>' Visible='<%# hfShowPrint.Value.ToLower()=="true" %>'><i class="fa fa-print"></i> <i class="fa fa-plus"></i></asp:LinkButton>
</div>
</HeaderTemplate>
<ItemTemplate>
<div class="text-center">
<asp:LinkButton ID="lbtSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-sm btn-info" Visible='<%# hfShowPrint.Value.ToLower()=="true" %>'><i class="fa fa-print" aria-hidden="true"></i></asp:LinkButton>
</div>
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="original_{0}" SelectMethod="getByBatch" TypeName="AppData.DS_AppTableAdapters.BinsTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfBatchID" DefaultValue="0" Name="BatchID" PropertyName="Value" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:HiddenField ID="hfBatchID" runat="server" />
<asp:HiddenField ID="hfShowQr" runat="server" Value="false" />
<asp:HiddenField ID="hfQrSize" runat="server" Value="32" />
<asp:HiddenField ID="hfShowPrint" runat="server" Value="false" />
</div>
</div>
</div>
</div>
</div>
+87 -2
View File
@@ -1,8 +1,10 @@
using System;
using AppData;
using NKC_SDK;
using System;
namespace NKC_WF.WebUserControls
{
public partial class cmp_MU_bins : System.Web.UI.UserControl
public partial class cmp_MU_bins : BaseUserControl
{
/// <summary>
/// Batch corrente...
@@ -38,6 +40,45 @@ namespace NKC_WF.WebUserControls
}
}
/// <summary>
/// Indica se mostrare o meno button PRINT
/// </summary>
public bool ShowPrint
{
set
{
hfShowPrint.Value = value.ToString();
}
get
{
bool answ = false;
bool.TryParse(hfShowPrint.Value, out answ);
return answ;
}
}
/// <summary>
/// BinId selezionato
/// </summary>
public int selBinId
{
get
{
int answ = 0;
int.TryParse(grView.SelectedValue.ToString(), out answ);
return answ;
}
}
/// <summary>
/// Stampante associata
/// </summary>
protected string printer
{
get
{
string answ = DataLayer.man.getPrinter("PC-MACHINE-UNLOAD2");
return answ;
}
}
/// <summary>
/// restituisce URL immagine QRCode
/// </summary>
/// <param name="currId"></param>
@@ -112,5 +153,49 @@ namespace NKC_WF.WebUserControls
doUpdate();
}
}
/// <summary>
/// Alla selezione mando in stampa il singolo record
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void grView_SelectedIndexChanged(object sender, EventArgs e)
{
// invio SINGOLO record in stampa
DataLayer.man.stampaDoc(selBinId.ToString(), printer, tipoDocumento.docBinPre, Request.UserHostName);
// reset
doReset();
}
/// <summary>
/// comando reset
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbtPrintAll_Click(object sender, EventArgs e)
{
// chiamo stored x stampare OGNI cart del BATCH
var tabBins = DataLayer.man.taBN.getByBatch(BatchId);
try
{
if (tabBins != null && tabBins.Count > 0)
{
foreach (var item in tabBins)
{
// invio SINGOLO record in stampa
DataLayer.man.stampaDoc(item.BinID.ToString(), printer, tipoDocumento.docBinPre, Request.UserHostName);
}
}
}
catch
{ }
// reset
doReset();
}
private void doReset()
{
// resetto
grView.SelectedIndex = -1;
grView.DataBind();
}
}
}
+52 -43
View File
@@ -11,52 +11,61 @@ namespace NKC_WF.WebUserControls
{
public partial class cmp_MU_bins
{
public partial class cmp_MU_bins
{
/// <summary>
/// Controllo grView.
/// </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.GridView grView;
/// <summary>
/// Controllo grView.
/// </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.GridView grView;
/// <summary>
/// Controllo ods.
/// </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 ods;
/// <summary>
/// Controllo ods.
/// </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 ods;
/// <summary>
/// Controllo hfBatchID.
/// </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.HiddenField hfBatchID;
/// <summary>
/// Controllo hfBatchID.
/// </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.HiddenField hfBatchID;
/// <summary>
/// Controllo hfShowQr.
/// </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.HiddenField hfShowQr;
/// <summary>
/// Controllo hfShowQr.
/// </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.HiddenField hfShowQr;
/// <summary>
/// Controllo hfQrSize.
/// </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.HiddenField hfQrSize;
}
/// <summary>
/// Controllo hfQrSize.
/// </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.HiddenField hfQrSize;
/// <summary>
/// Controllo hfShowPrint.
/// </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.HiddenField hfShowPrint;
}
}
+56 -42
View File
@@ -1,47 +1,61 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_MU_carts.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_MU_carts" %>
<div class="card text-center mb-2" style="width: 100%;">
<h5 class="card-header bg-success">CARTS</h5>
<div class="card-body py-1">
<div class="row">
<div class="col-12 px-0">
<asp:GridView runat="server" ID="grView" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" DataKeyNames="CartID" DataSourceID="ods" CssClass="table table-striped table-sm table-borderless" BorderWidth="0">
<HeaderStyle CssClass="default" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="table-info" />
<EmptyDataTemplate>
No Record
</EmptyDataTemplate>
<Columns>
<asp:TemplateField HeaderText="Cod" SortExpression="CartDtmx">
<ItemTemplate>
<asp:Image runat="server" Height='<%# qrSize %>' Visible='<%# hfShowQr.Value.ToLower()=="true" %>' ImageUrl='<%# getImgUrl(Eval("CartDtmx")) %>' />
<b><asp:Label ID="lblCartIndex" runat="server" Text='<%# Eval("CartIndex","C{0}") %>' CssClass='<%# getCssByRatio(getRatio(Eval("TotItemLoad"),Eval("TotItem"))) %>' /></b>
<asp:Label ID="lblCartDtmx" runat="server" Visible='<%# hfShowQr.Value.ToLower()=="true" %>' Text='<%# Eval("CartDtmx") %>' CssClass="small" />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="D/T" SortExpression="TotItem">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("TotItemLoad") +"/" + Eval("TotItem") %>' CssClass='<%# getCssByRatio(getRatio(Eval("TotItemLoad"),Eval("TotItem"))) %>'/>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="%" SortExpression="TotItemLoad">
<ItemTemplate>
<asp:Label ID="Label3" runat="server" Text='<%# getRatio(Eval("TotItemLoad"),Eval("TotItem")).ToString("P1") %>' CssClass='<%# getCssByRatio(getRatio(Eval("TotItemLoad"),Eval("TotItem"))) %>'/>
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="original_{0}" SelectMethod="getByBatch" TypeName="AppData.DS_AppTableAdapters.CartsTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfBatchID" DefaultValue="0" Name="BatchID" PropertyName="Value" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:HiddenField ID="hfBatchID" runat="server" />
<asp:HiddenField ID="hfShowQr" runat="server" Value="false" />
<asp:HiddenField ID="hfQrSize" runat="server" Value="32" />
</div>
<h5 class="card-header bg-success">CARTS</h5>
<div class="card-body py-1">
<div class="row">
<div class="col-12 px-0">
<asp:GridView runat="server" ID="grView" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" DataKeyNames="CartID" DataSourceID="ods" CssClass="table table-striped table-sm table-borderless" BorderWidth="0" OnSelectedIndexChanged="grView_SelectedIndexChanged">
<HeaderStyle CssClass="default" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="table-info" />
<EmptyDataTemplate>
No Record
</EmptyDataTemplate>
<Columns>
<asp:TemplateField HeaderText="Cod" SortExpression="CartDtmx">
<ItemTemplate>
<asp:Image runat="server" Height='<%# qrSize %>' Visible='<%# hfShowQr.Value.ToLower()=="true" %>' ImageUrl='<%# getImgUrl(Eval("CartDtmx")) %>' />
<b>
<asp:Label ID="lblCartIndex" runat="server" Text='<%# Eval("CartIndex","C{0}") %>' CssClass='<%# getCssByRatio(getRatio(Eval("TotItemLoad"),Eval("TotItem"))) %>' /></b>
<asp:Label ID="lblCartDtmx" runat="server" Visible='<%# hfShowQr.Value.ToLower()=="true" %>' Text='<%# Eval("CartDtmx") %>' CssClass="small" />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="D/T" SortExpression="TotItem">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("TotItemLoad") +"/" + Eval("TotItem") %>' CssClass='<%# getCssByRatio(getRatio(Eval("TotItemLoad"),Eval("TotItem"))) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="%" SortExpression="TotItemLoad">
<ItemTemplate>
<asp:Label ID="Label3" runat="server" Text='<%# getRatio(Eval("TotItemLoad"),Eval("TotItem")).ToString("P1") %>' CssClass='<%# getCssByRatio(getRatio(Eval("TotItemLoad"),Eval("TotItem"))) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField ShowHeader="False">
<HeaderTemplate>
<div class="text-center">
<asp:LinkButton ID="lbtPrintAll" runat="server" OnClick="lbtPrintAll_Click" CssClass="btn btn-sm btn-primary" ToolTip='<%# traduci("PrintAll") %>' Visible='<%# hfShowPrint.Value.ToLower()=="true" %>'><i class="fa fa-print"></i> <i class="fa fa-plus"></i></asp:LinkButton>
</div>
</HeaderTemplate>
<ItemTemplate>
<div class="text-center">
<asp:LinkButton ID="lbtSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-sm btn-info" Visible='<%# hfShowPrint.Value.ToLower()=="true" %>'><i class="fa fa-print" aria-hidden="true"></i></asp:LinkButton>
</div>
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="original_{0}" SelectMethod="getByBatch" TypeName="AppData.DS_AppTableAdapters.CartsTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfBatchID" DefaultValue="0" Name="BatchID" PropertyName="Value" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:HiddenField ID="hfBatchID" runat="server" />
<asp:HiddenField ID="hfShowQr" runat="server" Value="false" />
<asp:HiddenField ID="hfQrSize" runat="server" Value="32" />
<asp:HiddenField ID="hfShowPrint" runat="server" Value="false" />
</div>
</div>
</div>
</div>
</div>
+98 -13
View File
@@ -1,8 +1,10 @@
using System;
using AppData;
using NKC_SDK;
using System;
namespace NKC_WF.WebUserControls
{
public partial class cmp_MU_carts : System.Web.UI.UserControl
public partial class cmp_MU_carts : BaseUserControl
{
/// <summary>
/// Batch corrente...
@@ -38,6 +40,62 @@ namespace NKC_WF.WebUserControls
}
}
/// <summary>
/// Dimensione QRCode
/// </summary>
public int qrSize
{
get
{
int answ = 32;
int.TryParse(hfQrSize.Value, out answ);
return answ;
}
set
{
hfQrSize.Value = value.ToString();
doUpdate();
}
}
/// <summary>
/// Indica se mostrare o meno button PRINT
/// </summary>
public bool ShowPrint
{
set
{
hfShowPrint.Value = value.ToString();
}
get
{
bool answ = false;
bool.TryParse(hfShowPrint.Value, out answ);
return answ;
}
}
/// <summary>
/// CartId selezionato
/// </summary>
public int selCartId
{
get
{
int answ = 0;
int.TryParse(grView.SelectedValue.ToString(), out answ);
return answ;
}
}
/// <summary>
/// Stampante associata
/// </summary>
protected string printer
{
get
{
string answ = DataLayer.man.getPrinter("PC-MACHINE-UNLOAD");
return answ;
}
}
/// <summary>
/// restituisce URL immagine QRCode
/// </summary>
/// <param name="currId"></param>
@@ -96,21 +154,48 @@ namespace NKC_WF.WebUserControls
return answ;
}
/// <summary>
/// Dimensione QRCode
/// Alla selezione mando in stampa il singolo record
/// </summary>
public int qrSize
/// <param name="sender"></param>
/// <param name="e"></param>
protected void grView_SelectedIndexChanged(object sender, EventArgs e)
{
get
// invio SINGOLO record in stampa
DataLayer.man.stampaDoc(selCartId.ToString(), printer, tipoDocumento.docCart, Request.UserHostName);
// reset
doReset();
}
/// <summary>
/// comando reset
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbtPrintAll_Click(object sender, EventArgs e)
{
// chiamo stored x stampare OGNI cart del BATCH
var tabCarts = DataLayer.man.taCR.getByBatch(BatchId);
try
{
int answ = 32;
int.TryParse(hfQrSize.Value, out answ);
return answ;
}
set
{
hfQrSize.Value = value.ToString();
doUpdate();
if (tabCarts != null && tabCarts.Count > 0)
{
foreach (var item in tabCarts)
{
// invio SINGOLO record in stampa
DataLayer.man.stampaDoc(item.CartID.ToString(), printer, tipoDocumento.docCart, Request.UserHostName);
}
}
}
catch
{ }
// reset
doReset();
}
private void doReset()
{
// resetto
grView.SelectedIndex = -1;
grView.DataBind();
}
}
}
+52 -43
View File
@@ -11,52 +11,61 @@ namespace NKC_WF.WebUserControls
{
public partial class cmp_MU_carts
{
public partial class cmp_MU_carts
{
/// <summary>
/// Controllo grView.
/// </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.GridView grView;
/// <summary>
/// Controllo grView.
/// </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.GridView grView;
/// <summary>
/// Controllo ods.
/// </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 ods;
/// <summary>
/// Controllo ods.
/// </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 ods;
/// <summary>
/// Controllo hfBatchID.
/// </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.HiddenField hfBatchID;
/// <summary>
/// Controllo hfBatchID.
/// </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.HiddenField hfBatchID;
/// <summary>
/// Controllo hfShowQr.
/// </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.HiddenField hfShowQr;
/// <summary>
/// Controllo hfShowQr.
/// </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.HiddenField hfShowQr;
/// <summary>
/// Controllo hfQrSize.
/// </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.HiddenField hfQrSize;
}
/// <summary>
/// Controllo hfQrSize.
/// </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.HiddenField hfQrSize;
/// <summary>
/// Controllo hfShowPrint.
/// </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.HiddenField hfShowPrint;
}
}
@@ -0,0 +1 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_labelsPrint.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_labelsPrint" %>
@@ -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 NKC_WF.WebUserControls
{
public partial class cmp_labelsPrint : System.Web.UI.UserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
+17
View File
@@ -0,0 +1,17 @@
//------------------------------------------------------------------------------
// <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 NKC_WF.WebUserControls
{
public partial class cmp_labelsPrint
{
}
}
@@ -0,0 +1,17 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_orderPrint.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_orderPrint" %>
<%@ Register Src="~/WebUserControls/cmp_MU_bins.ascx" TagPrefix="uc1" TagName="cmp_MU_bins" %>
<%@ Register Src="~/WebUserControls/cmp_MU_carts.ascx" TagPrefix="uc1" TagName="cmp_MU_carts" %>
<asp:HiddenField runat="server" ID="hfBatchID" />
<div class="row">
<div class="col-12 col-lg-6">
<uc1:cmp_MU_bins runat="server" ID="cmp_MU_bins" ShowQr="false" ShowPrint="true" />
</div>
<div class="col-12 col-lg-6">
<uc1:cmp_MU_carts runat="server" ID="cmp_MU_carts" ShowQr="false" ShowPrint="true" />
</div>
</div>
@@ -0,0 +1,38 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace NKC_WF.WebUserControls
{
public partial class cmp_orderPrint : BaseUserControl
{
protected void Page_Load(object sender, EventArgs e)
{
if(!Page.IsPostBack)
{
}
}
/// <summary>
/// BatchId corrente...
/// </summary>
public int BatchId
{
set
{
hfBatchID.Value = value.ToString();
cmp_MU_bins.BatchId = value;
cmp_MU_carts.BatchId = value;
}
get
{
int answ = 0;
int.TryParse(hfBatchID.Value, out answ);
return answ;
}
}
}
}
+44
View File
@@ -0,0 +1,44 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace NKC_WF.WebUserControls
{
public partial class cmp_orderPrint
{
/// <summary>
/// Controllo hfBatchID.
/// </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.HiddenField hfBatchID;
/// <summary>
/// Controllo cmp_MU_bins.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_MU_bins cmp_MU_bins;
/// <summary>
/// Controllo cmp_MU_carts.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_MU_carts cmp_MU_carts;
}
}
+18 -1
View File
@@ -2,7 +2,7 @@
<h3><%: traduci("RunningOrders") %></h3>
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="BatchID" DataSourceID="odsOrders" Width="100%" CssClass="table table-success table-striped table-sm">
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="BatchID" DataSourceID="odsOrders" Width="100%" CssClass="table table-success table-striped table-sm" OnSelectedIndexChanged="grView_SelectedIndexChanged">
<HeaderStyle CssClass="default" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
@@ -11,8 +11,25 @@
<%# traduci("NoRunningOrders") %>
</EmptyDataTemplate>
<Columns>
<asp:TemplateField ShowHeader="False">
<HeaderTemplate>
<div class="text-center">
<asp:LinkButton ID="lbtReset" runat="server" OnClick="lbtReset_Click" CssClass="btn btn-sm btn-primary" Visible="true" ToolTip="Reset"><i class="fa fa-refresh"></i></asp:LinkButton>
</div>
</HeaderTemplate>
<ItemTemplate>
<div class="text-center">
<asp:LinkButton ID="lbtSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-sm btn-info"><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="Takt" HeaderText="#" InsertVisible="False" ReadOnly="True" SortExpression="Takt" />
<asp:BoundField DataField="NumOrders" HeaderText="Orders #" InsertVisible="False" ReadOnly="True" SortExpression="NumOrders" />
<asp:BoundField DataField="NumStacks" HeaderText="Bunks #" InsertVisible="False" ReadOnly="True" SortExpression="NumStacks" />
<asp:BoundField DataField="NumSheets" HeaderText="Sheets #" InsertVisible="False" ReadOnly="True" SortExpression="NumSheets" />
<asp:BoundField DataField="NumItems" HeaderText="Items #" InsertVisible="False" ReadOnly="True" SortExpression="NumItems" />
<asp:BoundField DataField="TotalTime" HeaderText="Estimated Time" SortExpression="TotalTime" DataFormatString="{0:N2} min" ItemStyle-CssClass="text-right">
<HeaderStyle CssClass="text-right"></HeaderStyle>
<ItemStyle CssClass="text-right"></ItemStyle>
</asp:BoundField>
</Columns>
@@ -7,6 +7,34 @@ namespace NKC_WF.WebUserControls
protected void Page_Load(object sender, EventArgs e)
{
}
/// <summary>
/// comando reset
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbtReset_Click(object sender, EventArgs e)
{
grView.SelectedIndex = -1;
grView.DataBind();
raiseReset();
}
protected void grView_SelectedIndexChanged(object sender, EventArgs e)
{
raiseEvent();
}
/// <summary>
/// BatchId selezionato
/// </summary>
public int selBatchId
{
get
{
int answ = 0;
int.TryParse(grView.SelectedValue.ToString(), out answ);
return answ;
}
}
}
}
+17 -1
View File
@@ -2,7 +2,7 @@
<h3><asp:label runat="server" ID="lblTitle"><%: traduci("ScheduledOrders") %></asp:label></h3>
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="BatchID" DataSourceID="odsOrders" Width="100%" CssClass="table table-striped table-sm">
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="BatchID" DataSourceID="odsOrders" Width="100%" CssClass="table table-striped table-sm" OnSelectedIndexChanged="grView_SelectedIndexChanged">
<HeaderStyle CssClass="default" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
@@ -11,6 +11,18 @@
<%# traduci("NoScheduledOrders") %>
</EmptyDataTemplate>
<Columns>
<asp:TemplateField ShowHeader="False">
<HeaderTemplate>
<div class="text-center">
<asp:LinkButton ID="lbtReset" runat="server" OnClick="lbtReset_Click" CssClass="btn btn-sm btn-primary" Visible="true" ToolTip="Reset"><i class="fa fa-refresh"></i></asp:LinkButton>
</div>
</HeaderTemplate>
<ItemTemplate>
<div class="text-center">
<asp:LinkButton ID="lbtSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-sm btn-info"><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Prior" SortExpression="SchedPrior">
<ItemTemplate>
<asp:LinkButton ID="lbtUp" runat="server" CommandArgument='<%# Eval("BatchID") %>' CssClass="btn btn-sm btn-primary" OnClick="lbtUp_Click" Enabled='<%# checkVisible("first", Eval("SchedPrior")) %>'><i class="fa fa-arrow-up" aria-hidden="true"></i></asp:LinkButton>
@@ -19,6 +31,10 @@
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="Takt" HeaderText="#" InsertVisible="False" ReadOnly="True" SortExpression="Takt" />
<asp:BoundField DataField="NumOrders" HeaderText="Orders #" InsertVisible="False" ReadOnly="True" SortExpression="NumOrders" />
<asp:BoundField DataField="NumStacks" HeaderText="Bunks #" InsertVisible="False" ReadOnly="True" SortExpression="NumStacks" />
<asp:BoundField DataField="NumSheets" HeaderText="Sheets #" InsertVisible="False" ReadOnly="True" SortExpression="NumSheets" />
<asp:BoundField DataField="NumItems" HeaderText="Items #" InsertVisible="False" ReadOnly="True" SortExpression="NumItems" />
<asp:BoundField DataField="TotalTime" HeaderText="Estimated Time" SortExpression="TotalTime" DataFormatString="{0:N2} min" ItemStyle-CssClass="text-right">
<ItemStyle CssClass="text-right"></ItemStyle>
</asp:BoundField>
@@ -88,6 +88,33 @@ namespace NKC_WF.WebUserControls
}
return answ;
}
/// <summary>
/// comando reset
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbtReset_Click(object sender, EventArgs e)
{
grView.SelectedIndex = -1;
grView.DataBind();
raiseReset();
}
protected void grView_SelectedIndexChanged(object sender, EventArgs e)
{
raiseEvent();
}
/// <summary>
/// BatchId selezionato
/// </summary>
public int selBatchId
{
get
{
int answ = 0;
int.TryParse(grView.SelectedValue.ToString(), out answ);
return answ;
}
}
}
}
+4 -3
View File
@@ -29,9 +29,10 @@ namespace NKC_WF.site
int.TryParse(hfBatchID.Value, out answ);
return answ;
}
}/// <summary>
/// SheetId corrente...
/// </summary>
}
/// <summary>
/// SheetId corrente...
/// </summary>
public int SheetId
{
set
+3 -12
View File
@@ -11,16 +11,7 @@ namespace NKC_WF.site
{
public partial class LabelsPrint
{
/// <summary>
/// Controllo tpl_WIP.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.tpl_WIP tpl_WIP;
}
public partial class LabelsPrint
{
}
}
+7 -1
View File
@@ -2,6 +2,8 @@
<%@ Register Src="~/WebUserControls/cmp_orderSched.ascx" TagPrefix="uc1" TagName="cmp_orderSched" %>
<%@ Register Src="~/WebUserControls/cmp_orderRunning.ascx" TagPrefix="uc1" TagName="cmp_orderRunning" %>
<%@ Register Src="~/WebUserControls/cmp_orderPrint.ascx" TagPrefix="uc1" TagName="cmp_orderPrint" %>
@@ -13,9 +15,13 @@
</div>
<div class="card-body">
<div class="row">
<div class="col-12 mb-2">
<div class="col-12 border border-success mb-2 ">
<uc1:cmp_orderRunning runat="server" ID="cmp_orderRunning" />
<uc1:cmp_orderPrint runat="server" ID="cmp_orderPrintRun" />
</div>
<div class="col-12 border border-info mb-2">
<uc1:cmp_orderSched runat="server" ID="cmp_orderSched" />
<uc1:cmp_orderPrint runat="server" ID="cmp_orderPrintSch" />
</div>
</div>
</div>
+32
View File
@@ -6,7 +6,39 @@ namespace NKC_WF.site
{
protected void Page_Load(object sender, EventArgs e)
{
if(!Page.IsPostBack)
{
cmp_orderPrintRun.Visible = false;
cmp_orderPrintSch.Visible = false;
}
cmp_orderRunning.eh_doRefresh += cmp_orderRunning_eh_doRefresh;
cmp_orderRunning.eh_doReset += cmp_orderRunning_eh_doReset;
cmp_orderSched.eh_doRefresh += cmp_orderSched_eh_doRefresh;
cmp_orderSched.eh_doReset += cmp_orderSched_eh_doReset;
}
private void cmp_orderSched_eh_doReset(object sender, EventArgs e)
{
cmp_orderPrintSch.BatchId = 0;
cmp_orderPrintSch.Visible = false;
}
private void cmp_orderSched_eh_doRefresh(object sender, EventArgs e)
{
cmp_orderPrintSch.BatchId = cmp_orderSched.selBatchId;
cmp_orderPrintSch.Visible = true;
}
private void cmp_orderRunning_eh_doReset(object sender, EventArgs e)
{
cmp_orderPrintRun.BatchId = 0;
cmp_orderPrintRun.Visible = false;
}
private void cmp_orderRunning_eh_doRefresh(object sender, EventArgs e)
{
cmp_orderPrintRun.BatchId = cmp_orderRunning.selBatchId;
cmp_orderPrintRun.Visible = true;
}
}
}
+18
View File
@@ -23,6 +23,15 @@ namespace NKC_WF.site
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_orderRunning cmp_orderRunning;
/// <summary>
/// Controllo cmp_orderPrintRun.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_orderPrint cmp_orderPrintRun;
/// <summary>
/// Controllo cmp_orderSched.
/// </summary>
@@ -31,5 +40,14 @@ namespace NKC_WF.site
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_orderSched cmp_orderSched;
/// <summary>
/// Controllo cmp_orderPrintSch.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_orderPrint cmp_orderPrintSch;
}
}