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

Merge branch 'develop' into SDK

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-08-11 11:41:59 +02:00
parent c6291a36bb 5962233299
commit 680de9cc65
15 changed files with 301 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=317']) {
withEnv(['NEXT_BUILD_NUMBER=318']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/Controllers/BatchProcController.cs
+4 -1
View File
@@ -293,8 +293,11 @@ namespace NKC_WF.Controllers
}
else
{
string nestBasePath = memLayer.ML.CRS("nestBasePath").ToLower();
string servBasePath = memLayer.ML.CRS("servBasePath").ToLower();
string fixPath = rispNest.DrawingPath.ToLower().Replace(nestBasePath, servBasePath);
// segno offline order come processato registrando il disegno e segno ogni PART come lavorata da OffOrd2Item (status 992)
DataLayer.man.taOffOL.updateDrawing(Math.Abs(rispNest.BatchID), rispNest.DrawingPath);
DataLayer.man.taOffOL.updateDrawing(Math.Abs(rispNest.BatchID), fixPath);
}
}
}
NKC_WF/NKC_WF.csproj
+8
View File
@@ -473,6 +473,7 @@
<Content Include="WebUserControls\cmp_numRow.ascx" />
<Content Include="WebUserControls\cmp_offlineOrders.ascx" />
<Content Include="WebUserControls\cmp_offOrderDetail.ascx" />
<Content Include="WebUserControls\cmp_OOIL_drawings.ascx" />
<Content Include="WebUserControls\cmp_OOLI_detail.ascx" />
<Content Include="WebUserControls\cmp_orderPrint.ascx" />
<Content Include="WebUserControls\cmp_orderRunning.ascx" />
@@ -1259,6 +1260,13 @@
<Compile Include="WebUserControls\cmp_offOrderDetail.ascx.designer.cs">
<DependentUpon>cmp_offOrderDetail.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_OOIL_drawings.ascx.cs">
<DependentUpon>cmp_OOIL_drawings.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_OOIL_drawings.ascx.designer.cs">
<DependentUpon>cmp_OOIL_drawings.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_OOLI_detail.ascx.cs">
<DependentUpon>cmp_OOLI_detail.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx
+17
View File
@@ -0,0 +1,17 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_OOIL_drawings.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_OOIL_drawings" %>
<asp:HiddenField runat="server" ID="hfDrawingPath" />
<div class="row" runat ="server" id="divDrawings">
<div class="col-12">
<h5><%: traduci("Drawings") %></h5>
</div>
<asp:Repeater ID="repDraw" runat="server">
<ItemTemplate>
<div class="col-3">
<asp:HyperLink runat="server" ID="hlQrSvg" CssClass="btn btn-sm btn-outline-primary btn-block" Target="_blank" NavigateUrl='<%# $"~/site/SvgFull?ImgPath={Eval("DrawPath")}" %>'>
<i class="fa fa-object-group" aria-hidden="true"></i> <%# Eval("imgName") %>
</asp:HyperLink>
</div>
</ItemTemplate>
</asp:Repeater>
</div>
NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx.cs
+74
View File
@@ -0,0 +1,74 @@
using SteamWare;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace NKC_WF.WebUserControls
{
public partial class cmp_OOIL_drawings : BaseUserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
public string DrawingPath
{
get
{
return hfDrawingPath.Value;
}
set
{
string nestBasePath = memLayer.ML.CRS("nestBasePath").ToLower();
string servBasePath = memLayer.ML.CRS("servBasePath").ToLower();
string fixPath = value.Replace(nestBasePath, servBasePath);
hfDrawingPath.Value = fixPath;
fixDataBind();
}
}
private void fixDataBind()
{
string currPath = DrawingPath;
// in primis: fix directory
// visibile SOLO SE valore != null...
if (string.IsNullOrEmpty(currPath))
{
divDrawings.Visible = false;
}
else
{
divDrawings.Visible = true;
List<imgData> elencoDisegni = new List<imgData>();
// verifico path assoluto...
if (!Path.IsPathRooted(currPath))
{
currPath = Server.MapPath(currPath);
}
// leggo da filesystem...
string[] elencoFiles = Directory.GetFiles(currPath, "*.svg");
if (elencoFiles != null)
{
foreach (var item in elencoFiles)
{
elencoDisegni.Add(new imgData { imgName = Path.GetFileName(item), DrawPath = item.Replace(@"/",@"\") });
}
}
// sistemo repeater
repDraw.DataSource = elencoDisegni;
repDraw.DataBind();
}
}
public class imgData
{
public string imgName { get; set; } = "";
public string DrawPath { get; set; } = "";
}
}
}
NKC_WF/WebUserControls/cmp_OOIL_drawings.ascx.designer.cs
Generated
+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_OOIL_drawings
{
/// <summary>
/// Controllo hfDrawingPath.
/// </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 hfDrawingPath;
/// <summary>
/// Controllo divDrawings.
/// </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 divDrawings;
/// <summary>
/// Controllo repDraw.
/// </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.Repeater repDraw;
}
}
NKC_WF/WebUserControls/cmp_kitList.ascx
+28 -28
View File
@@ -2,34 +2,34 @@
<asp:HiddenField runat="server" ID="hfTask" />
<asp:GridView runat="server" ID="grView" DataSourceID="ods" AutoGenerateColumns="False" DataKeyNames="PackListID" CssClass="table table-striped table-sm" AllowPaging="True" AllowSorting="True" OnSelectedIndexChanged="grView_SelectedIndexChanged" OnRowDeleted="grView_RowDeleted">
<HeaderStyle CssClass="default" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="table-info" />
<Columns>
<asp:TemplateField ShowHeader="False">
<ItemTemplate>
<div class="text-center">
<asp:LinkButton ID="lbtCheck" runat="server" CausesValidation="False" CommandName="Select" CommandArgument="Appr" OnClick="lbtCheck_Click" Text="Select" CssClass="btn btn-sm btn-success" Visible='<%# Eval("StatusID").ToString()=="1" %>' OnClientClick='return confirm("Confirm and send to KIT station?")' ToolTip="Approve Request"><i class="fa fa-check" aria-hidden="true"></i></asp:LinkButton>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="PackListID" HeaderText="#" ReadOnly="True" SortExpression="PackListID" />
<asp:BoundField DataField="StatusDesc" HeaderText="Status" ReadOnly="True" SortExpression="StatusDesc" />
<asp:BoundField DataField="BatchName" HeaderText="Name" SortExpression="BatchName" />
<asp:BoundField DataField="ImportDate" HeaderText="Import Date" SortExpression="ImportDate" />
<asp:BoundField DataField="NumKit" HeaderText="Kit #" SortExpression="NumKit" />
<asp:BoundField DataField="NumParts" HeaderText="Parts #" SortExpression="NumParts" />
<asp:BoundField DataField="TotQty" HeaderText="Tot Qty #" SortExpression="TotQty" />
<asp:TemplateField ShowHeader="False">
<ItemTemplate>
<div class="text-center">
<asp:LinkButton ID="lbtDelete" runat="server" CausesValidation="False" CommandName="Delete" Text="Delete" CssClass="btn btn-sm btn-danger" Visible='<%# Eval("StatusID").ToString()=="1" %>' OnClientClick='return confirm("Confirm Delete of Task?")' ToolTip="Delete"><i class="fa fa-trash" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton ID="lbtRemove" runat="server" CausesValidation="False" CommandName="Select" CommandArgument="Remove" OnClick="lbtRemove_Click" Text="Select" CssClass="btn btn-sm btn-warning" Visible='<%# Eval("StatusID").ToString()=="4" %>' OnClientClick='return confirm("Confirm KIT expedited?")' ToolTip="Remove"><i class="fa fa-truck" aria-hidden="true"></i></asp:LinkButton>
</div>
</ItemTemplate>
</asp:TemplateField>
</Columns>
<HeaderStyle CssClass="default" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="table-info" />
<Columns>
<asp:TemplateField ShowHeader="False">
<ItemTemplate>
<div class="text-center">
<asp:LinkButton ID="lbtCheck" runat="server" CausesValidation="False" CommandName="Select" CommandArgument="Appr" OnClick="lbtCheck_Click" Text="Select" CssClass="btn btn-sm btn-success" Visible='<%# Eval("StatusID").ToString()=="1" %>' OnClientClick='return confirm("Confirm and send to KIT station?")' ToolTip="Approve Request"><i class="fa fa-check" aria-hidden="true"></i></asp:LinkButton>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="PackListID" HeaderText="#" ReadOnly="True" SortExpression="PackListID" />
<asp:BoundField DataField="StatusDesc" HeaderText="Status" ReadOnly="True" SortExpression="StatusDesc" />
<asp:BoundField DataField="BatchName" HeaderText="Name" SortExpression="BatchName" />
<asp:BoundField DataField="ImportDate" HeaderText="Import Date" SortExpression="ImportDate" />
<asp:BoundField DataField="NumKit" HeaderText="Kit #" SortExpression="NumKit" />
<asp:BoundField DataField="NumParts" HeaderText="Parts #" SortExpression="NumParts" />
<asp:BoundField DataField="TotQty" HeaderText="Tot Qty #" SortExpression="TotQty" />
<asp:TemplateField ShowHeader="False">
<ItemTemplate>
<div class="text-center">
<asp:LinkButton ID="lbtDelete" runat="server" CausesValidation="False" CommandName="Delete" Text="Delete" CssClass="btn btn-sm btn-danger" Visible='<%# Eval("StatusID").ToString()=="1" %>' OnClientClick='return confirm("Confirm Delete of Task?")' ToolTip="Delete"><i class="fa fa-trash" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton ID="lbtRemove" runat="server" CausesValidation="False" CommandName="Select" CommandArgument="Remove" OnClick="lbtRemove_Click" Text="Select" CssClass="btn btn-sm btn-warning" Visible='<%# Eval("StatusID").ToString()=="4" %>' OnClientClick='return confirm("Confirm KIT expedited?")' ToolTip="Remove"><i class="fa fa-truck" aria-hidden="true"></i></asp:LinkButton>
</div>
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="Original_{0}" SelectMethod="getActive" DeleteMethod="deleteAll" TypeName="AppData.DS_AppTableAdapters.PackListTableAdapter">
NKC_WF/WebUserControls/cmp_offOrderDetail.ascx
+39 -32
View File
@@ -1,38 +1,45 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_offOrderDetail.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_offOrderDetail" %>
<%@ Register Src="~/WebUserControls/cmp_OOLI_detail.ascx" TagPrefix="uc1" TagName="cmp_OOLI_detail" %>
<%@ Register Src="~/WebUserControls/cmp_OOIL_drawings.ascx" TagPrefix="uc1" TagName="cmp_OOIL_drawings" %>
<div class="border border-info rounded p-2 text-center mb-2 w-100">
<asp:FormView runat="server" ID="frmView" DataKeyNames="OrdID" DataSourceID="ods" OnDataBound="frmView_DataBound" CssClass="w-100">
<ItemTemplate>
<div class="row">
<div class="col">
<asp:Label runat="server" ID="lblWarning" CssClass="text-danger lead font-weight-bold" Visible='<%# Eval("DrawFilePath").ToString() == "" %>'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> NOT YET PROCESSED</asp:Label>
<svg width="710" height="305" viewBox='0 0 1420 710' xmlns='http://www.w3.org/2000/svg' runat="server" id="svgTable" Visible='<%# Eval("DrawFilePath").ToString() != "" %>'>
</svg>
<asp:Label ID="DrawFilePathLabel" runat="server" Text='<%# Eval("DrawFilePath") %>' Visible="false" />
</div>
</div>
<div class="row my-2">
<div class="col">
<asp:LinkButton runat="server" ID="lbtMakeCnc" CssClass="btn btn-success btn-block" Visible='<%# Eval("OrdStatus").ToString()=="0" %>' OnClick="lbtMakeCnc_Click" OnClientClick='return confirm("Send to CAM?")'><i class="fa fa-laptop" aria-hidden="true"></i> MAKE CNC PROG</asp:LinkButton>
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtPrintLabels" CssClass="btn btn-info btn-block" Visible='<%# Eval("OrdStatus").ToString()!="0" %>' OnClick="lbtPrintLabels_Click"><i class="fa fa-print" aria-hidden="true"></i> PRINT LABELS</asp:LinkButton>
<asp:LinkButton runat="server" ID="lblDone" CssClass="btn btn-success btn-block" Visible='<%# Eval("OrdStatus").ToString()=="2" %>' OnClick="lblDone_Click" OnClientClick='return confirm("Confirm Item production?")'><i class="fa fa-check" aria-hidden="true"></i> ITEM DONE</asp:LinkButton>
</div>
</div>
<div class="row">
<div class="col">
<uc1:cmp_OOLI_detail runat="server" ID="cmp_OOLI_detail" OffOrdId='<%# Eval("OrdID") %>' />
</div>
</div>
</ItemTemplate>
</asp:FormView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByKey" TypeName="AppData.DS_AppTableAdapters.OfflineOrderListTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfOffOrderId" DefaultValue="0" Name="OrdId" PropertyName="Value" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:HiddenField runat="server" ID="hfOffOrderId" />
<asp:FormView runat="server" ID="frmView" DataKeyNames="OrdID" DataSourceID="ods" OnDataBound="frmView_DataBound" CssClass="w-100">
<ItemTemplate>
<div class="row">
<div class="col-12">
<asp:Label runat="server" ID="lblWarning" CssClass="text-danger lead font-weight-bold" Visible='<%# Eval("DrawFilePath").ToString() == "" %>'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> NOT YET PROCESSED</asp:Label>
<%--<svg width="710" height="305" viewBox='0 0 1420 710' xmlns='http://www.w3.org/2000/svg' runat="server" id="svgTable" Visible='<%# Eval("DrawFilePath").ToString() != "" %>'>
</svg>--%>
</div>
<div class="col-12">
<uc1:cmp_OOIL_drawings runat="server" ID="cmp_OOIL_drawings" DrawingPath='<%# Eval("DrawFilePath") %>' />
<asp:Label ID="DrawFilePathLabel" runat="server" Text='<%# Eval("DrawFilePath") %>' Visible="false" />
</div>
</div>
<div class="row my-2">
<div class="col">
<asp:LinkButton runat="server" ID="lbtMakeCnc" CssClass="btn btn-success btn-block" Visible='<%# Eval("OrdStatus").ToString()=="0" %>' OnClick="lbtMakeCnc_Click" OnClientClick='return confirm("Send to CAM?")'><i class="fa fa-laptop" aria-hidden="true"></i> MAKE CNC PROG</asp:LinkButton>
</div>
<div class="col">
<asp:LinkButton runat="server" ID="lbtPrintLabels" CssClass="btn btn-info btn-block" Visible='<%# Eval("OrdStatus").ToString()!="0" %>' OnClick="lbtPrintLabels_Click"><i class="fa fa-print" aria-hidden="true"></i> PRINT LABELS</asp:LinkButton>
<asp:LinkButton runat="server" ID="lblDone" CssClass="btn btn-success btn-block" Visible='<%# Eval("OrdStatus").ToString()=="2" %>' OnClick="lblDone_Click" OnClientClick='return confirm("Confirm Item production?")'><i class="fa fa-check" aria-hidden="true"></i> ITEM DONE</asp:LinkButton>
</div>
</div>
<div class="row">
<div class="col">
<uc1:cmp_OOLI_detail runat="server" ID="cmp_OOLI_detail" OffOrdId='<%# Eval("OrdID") %>' />
</div>
</div>
</ItemTemplate>
</asp:FormView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByKey" TypeName="AppData.DS_AppTableAdapters.OfflineOrderListTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfOffOrderId" DefaultValue="0" Name="OrdId" PropertyName="Value" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:HiddenField runat="server" ID="hfOffOrderId" />
</div>
NKC_WF/WebUserControls/cmp_offOrderDetail.ascx.cs
+1 -17
View File
@@ -37,22 +37,6 @@ namespace NKC_WF.WebUserControls
protected void frmView_DataBound(object sender, EventArgs e)
{
try
{
Label filePath = (Label)frmView.FindControl("DrawFilePathLabel");
// se ho una stringa valida mostro svg, altrimenti NOT PROCESSED...
if (!string.IsNullOrEmpty(filePath.Text))
{
string filename = Server.MapPath(filePath.Text);
string svgRawData = File.ReadAllText(filename);
HtmlGenericControl svgControl = (HtmlGenericControl)frmView.FindControl("svgTable");
svgControl.InnerHtml = svgRawData;
}
}
catch (Exception exc)
{
logger.lg.scriviLog($"Eccezione in tentativo display file svg da ordine offline{Environment.NewLine}{exc}");
}
}
protected void lbtMakeCnc_Click(object sender, EventArgs e)
@@ -103,7 +87,7 @@ namespace NKC_WF.WebUserControls
protected void lblDone_Click(object sender, EventArgs e)
{
// registro che ho COMPLETATO... 3!
// registro che ho COMPLETATO... 3! (e di conseguenza aggiorna gli items...)
DataLayer.man.taOffOL.updateStatus(OffOrdId, 3);
raiseReset();
}
NKC_WF/WebUserControls/cmp_offlineOrders.ascx.cs
+2 -1
View File
@@ -4,7 +4,7 @@ using System.Web.UI;
namespace NKC_WF.WebUserControls
{
public partial class cmp_offlineOrders : System.Web.UI.UserControl
public partial class cmp_offlineOrders : BaseUserControl
{
protected void Page_Load(object sender, EventArgs e)
{
@@ -47,6 +47,7 @@ namespace NKC_WF.WebUserControls
grView.SelectedIndex = -1;
grView.DataBind();
cmp_offOrderDetail.Visible = false;
raiseReset();
}
protected int selOrdId
NKC_WF/WebUserControls/cmp_scrapList.ascx
+43 -55
View File
@@ -3,59 +3,47 @@
<div class="card">
<div class="card-header text-center bg-warning">
<h4>Scrap List (Items to process)</h4>
</div>
<div class="card-body">
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="ItemID" DataSourceID="ods" AllowPaging="True" CssClass="table table-sm table-condensed table-striped" AllowSorting="true">
<Columns>
<%--<asp:BoundField DataField="ItemID" HeaderText="ItemID" InsertVisible="False" ReadOnly="True" SortExpression="ItemID" />
<asp:BoundField DataField="StatusID" HeaderText="StatusID" SortExpression="StatusID" />
<asp:BoundField DataField="OrdID" HeaderText="OrdID" SortExpression="OrdID" />
<asp:BoundField DataField="ItemDtmx" HeaderText="ItemDtmx" SortExpression="ItemDtmx" />--%>
<asp:TemplateField>
<HeaderTemplate>
<asp:CheckBox runat="server" ID="chkToggle" AutoPostBack="True" OnCheckedChanged="chkToggle_CheckedChanged" />
</HeaderTemplate>
<ItemTemplate>
<asp:CheckBox runat="server" ID="chkSelected" Visible='<%# Eval("StatusID").ToString()=="990" %>' />
<asp:HiddenField runat="server" ID="hfItemID" Value='<%# Eval("ItemID") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Mat" SortExpression="MatID">
<ItemTemplate>
<asp:Label runat="server" ID="lblMatId" Text='<%# matByKey(Eval("MatID")) %>' CssClass='<%# cssByStatus(Eval("StatusID")) %>' />
</ItemTemplate>
</asp:TemplateField>
<%--<asp:BoundField DataField="ItemNote" HeaderText="ItemNote" SortExpression="ItemNote" />
<asp:BoundField DataField="ItemQty" HeaderText="ItemQty" SortExpression="ItemQty" />--%>
<%--<asp:CheckBoxField DataField="MachiningReq" HeaderText="MachiningReq" SortExpression="MachiningReq" />
<asp:BoundField DataField="PostProcList" HeaderText="PostProcList" SortExpression="PostProcList" />
<asp:BoundField DataField="ProcessesReq" HeaderText="ProcessesReq" SortExpression="ProcessesReq" />
<asp:BoundField DataField="CadFilePath" HeaderText="CadFilePath" SortExpression="CadFilePath" />--%>
<asp:TemplateField HeaderText="Code" SortExpression="ItemExtCode">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("ItemExtCode") %>' CssClass='<%# cssByStatus(Eval("StatusID")) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Desc" SortExpression="ItemDesc">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("ItemDesc") %>' CssClass='<%# cssByStatus(Eval("StatusID")) %>' />
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStatus" TypeName="AppData.DS_AppTableAdapters.ItemListTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="990" Name="minStatus" Type="Int32" />
<asp:Parameter DefaultValue="999" Name="maxStatus" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
<%--<asp:DropDownList runat="server" ID="ddlMat" DataSourceID="odsMat" DataTextField="MatDesc" DataValueField="MatID"></asp:DropDownList>--%>
<%--<asp:ObjectDataSource runat="server" ID="odsMat" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="AppData.DS_AppTableAdapters.MaterialsTableAdapter"></asp:ObjectDataSource>--%>
<asp:LinkButton runat="server" ID="lbtCreateOffOrd" CssClass="btn btn-outline-success btn-block" OnClick="lbtCreateOffOrd_Click" OnClientClick='return confirm("Confirm create order fo selected items?")'>Create Order <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></asp:LinkButton>
</div>
</div>
<div class="card-footer">
<uc1:mod_righePag runat="server" ID="mod_righePag" />
<div class="card-header text-center bg-warning">
<h4>Scrap List (Items to process)</h4>
</div>
<div class="card-body">
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="ItemID" DataSourceID="ods" AllowPaging="True" CssClass="table table-sm table-condensed table-striped" AllowSorting="true">
<Columns>
<asp:TemplateField>
<HeaderTemplate>
<asp:CheckBox runat="server" ID="chkToggle" AutoPostBack="True" OnCheckedChanged="chkToggle_CheckedChanged" />
</HeaderTemplate>
<ItemTemplate>
<asp:CheckBox runat="server" ID="chkSelected" Visible='<%# Eval("StatusID").ToString()=="990" %>' />
<asp:HiddenField runat="server" ID="hfItemID" Value='<%# Eval("ItemID") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Mat" SortExpression="MatID">
<ItemTemplate>
<asp:Label runat="server" ID="lblMatId" Text='<%# matByKey(Eval("MatID")) %>' CssClass='<%# cssByStatus(Eval("StatusID")) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Code" SortExpression="ItemExtCode">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Eval("ItemExtCode") %>' CssClass='<%# cssByStatus(Eval("StatusID")) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Desc" SortExpression="ItemDesc">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("ItemDesc") %>' CssClass='<%# cssByStatus(Eval("StatusID")) %>' />
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStatus" TypeName="AppData.DS_AppTableAdapters.ItemListTableAdapter">
<SelectParameters>
<asp:Parameter DefaultValue="990" Name="minStatus" Type="Int32" />
<asp:Parameter DefaultValue="999" Name="maxStatus" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:LinkButton runat="server" ID="lbtCreateOffOrd" CssClass="btn btn-outline-success btn-block" OnClick="lbtCreateOffOrd_Click" OnClientClick='return confirm("Confirm create order fo selected items?")'>Create Order <i class="fa fa-arrow-circle-right" aria-hidden="true"></i></asp:LinkButton>
</div>
<div class="card-footer">
<uc1:mod_righePag runat="server" ID="mod_righePag" />
</div>
</div>
NKC_WF/WebUserControls/cmp_svgFull.ascx.cs
+19 -9
View File
@@ -59,18 +59,28 @@ namespace NKC_WF.WebUserControls
string baseCurr = memLayer.ML.CRS("servBasePath").ToLower();
try
{
var tabSheets = DataLayer.man.taSHL.getBySheetId(SheetId);
if (tabSheets.Count > 0)
if (SheetId > 0)
{
filename = tabSheets[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr);
// la versioen da usare è la "_qr.svg", x cui faccio replace... tolgo ultimi 4 char e sostituisco...
int repPos = filename.LastIndexOf(".svg");
filename = filename.Remove(repPos) + "_qr.svg";
if (memLayer.ML.CRB("userVirtDir"))
var tabSheets = DataLayer.man.taSHL.getBySheetId(SheetId);
if (tabSheets.Count > 0)
{
filename = Server.MapPath(filename);
filename = tabSheets[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr);
// la versioen da usare è la "_qr.svg", x cui faccio replace... tolgo ultimi 4 char e sostituisco...
int repPos = filename.LastIndexOf(".svg");
filename = filename.Remove(repPos) + "_qr.svg";
if (memLayer.ML.CRB("userVirtDir"))
{
filename = Server.MapPath(filename);
}
answ = File.ReadAllText(filename);
}
}
else
{
if (File.Exists(filename))
{
answ = File.ReadAllText(filename);
}
answ = File.ReadAllText(filename);
}
}
catch
NKC_WF/site/MachineOffline.aspx
+2 -2
View File
@@ -8,10 +8,10 @@
<ContentTemplate>
<asp:Timer ID="timerScrap" runat="server" Interval="5000" OnTick="timerScrap_Tick"></asp:Timer>
<div class="row m-2">
<div class="col">
<div class="col-12 col-md-6">
<uc1:cmp_scrapList runat="server" ID="cmp_scrapList" />
</div>
<div class="col">
<div class="col-12 col-md-6">
<uc1:cmp_offlineOrders runat="server" ID="cmp_offlineOrders" />
</div>
</div>
NKC_WF/site/MachineOffline.aspx.cs
+8 -1
View File
@@ -1,4 +1,5 @@
using System;
using NKC_WF.WebUserControls;
using System;
namespace NKC_WF
{
@@ -7,6 +8,12 @@ namespace NKC_WF
protected void Page_Load(object sender, EventArgs e)
{
cmp_scrapList.eh_doRefresh += Cmp_scrapList_eh_doRefresh;
cmp_offlineOrders.eh_doReset += cmp_offlineOrders_eh_doReset;
}
private void cmp_offlineOrders_eh_doReset(object sender, EventArgs e)
{
cmp_scrapList.doUpdate();
}
private void Cmp_scrapList_eh_doRefresh(object sender, EventArgs e)
NKC_WF/site/SvgFull.aspx.cs
+11 -2
View File
@@ -13,12 +13,21 @@ namespace NKC_WF.site
{
protected void Page_Load(object sender, EventArgs e)
{
if(!Page.IsPostBack)
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
// recupero valore URL ed imposto...
int sheetId = memLayer.ML.QSI("sheetId");
cmp_svgFull.SheetId = sheetId;
string ImgPath = memLayer.ML.QSS("ImgPath");
if (sheetId > 0)
{
cmp_svgFull.SheetId = sheetId;
}
else if(!string.IsNullOrEmpty(ImgPath))
{
cmp_svgFull.filename = ImgPath;
cmp_svgFull.updateSvg();
}
}
}
}