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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-08-31 17:56:38 +02:00
parent 6e44549824 49246f83e2
commit 07f3951ede
6 changed files with 268 additions and 90 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=361']) {
withEnv(['NEXT_BUILD_NUMBER=362']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/WebUserControls/cmp_PartMIA_byBinID.ascx
+69 -1
View File
@@ -3,7 +3,7 @@
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="ItemID" DataSourceID="ods" CssClass="table table-striped table-sm textCondens" AllowPaging="True" OnSelectedIndexChanged="grView_SelectedIndexChanged">
<Columns>
<asp:TemplateField HeaderText="PART" SortExpression="ItemExtCode">
<%--<asp:TemplateField HeaderText="PART" SortExpression="ItemExtCode">
<ItemTemplate>
<div class="font-weight-bold textBig">
<asp:Label ID="Label1" runat="server" Text='<%# Eval("ItemExtCode") %>' />
@@ -94,6 +94,74 @@
<asp:Label ID="BinDtmxLabel" runat="server" Text='<%# Eval("BinDtmx") %>' />
</div>
</ItemTemplate>
</asp:TemplateField>--%>
<asp:TemplateField HeaderText="PART" SortExpression="ItemExtCode">
<ItemTemplate>
<div class="row">
<div class="col-12 col-md-3">
<div class="font-weight-bold textBig">
<asp:Label ID="Label1" runat="server" Text='<%# Eval("ItemExtCode") %>' />
</div>
<asp:Label ID="ItemDescLabel" runat="server" Text='<%# Eval("ItemDesc") %>' />
</div>
<div class="col-12 col-md-3">
<div class="font-weight-bold textBig">
<asp:Image runat="server" Height="64" Visible='<%# !checkProd %>' ImageUrl='<%# getImgUrl(Eval("ItemDtmx")) %>' CssClass="img-fluid" />
<asp:Label ID="ItemDtmxLabel" runat="server" Text='<%# Eval("ItemDtmx") %>' Visible='<%# showFull %>' />
</div>
<div class="row" runat="server" visible='<%# showFull %>'>
<div class="col-6">
<i class="fa fa-wrench" aria-hidden="true"></i>
<asp:Label ID="PostProcListLabel" runat="server" Text='<%# Eval("PostProcList") %>' />
</div>
<div class="col-6">
<i class="fa fa-paint-brush" aria-hidden="true"></i>
<asp:Label ID="ProcessesReqLabel" runat="server" Text='<%# Eval("ProcessesReq") %>' />
</div>
</div>
</div>
<div class="col-12 col-md-3">
<div class="row">
<div class="col-8">
<div class="font-weight-bold textBig">
<asp:Label ID="MatExtCodeLabel" runat="server" Text='<%# Eval("MatExtCode") %>' />
</div>
<asp:Label ID="MatDescLabel" runat="server" Text='<%# Eval("MatDesc") %>' Visible='<%# showFull %>' />
</div>
<div class="col-4">
<div runat="server" visible='<%# showFull %>'>
<div class="font-weight-bold textBig">
<asp:Label ID="OrderExtCodeLabel" runat="server" Text='<%# Eval("OrderExtCode") %>' />
</div>
<asp:Label ID="lblOrder" runat="server" Text='<%# traduci("Order") %>' />
</div>
</div>
</div>
</div>
<div class="col-12 col-md-3">
<div class="row">
<div class="col-6">
<div runat="server" visible='<%# showFull %>'>
<div class="textBig">
CART <b>
<asp:Label ID="CartIndexLabel" runat="server" Text='<%# Eval("CartIndex","C{0}") %>' /></b>
</div>
<asp:Label ID="CartDtmxLabel" runat="server" Text='<%# Eval("CartDtmx") %>' />
</div>
</div>
<div class="col-6">
<div runat="server" visible='<%# showFull %>'>
<div class="textBig">
BIN <b>
<asp:Label ID="BinIndexLabel" runat="server" Text='<%# Eval("BinIndex","B{0}") %>' /></b>
</div>
<asp:Label ID="BinDtmxLabel" runat="server" Text='<%# Eval("BinDtmx") %>' />
</div>
</div>
</div>
</div>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField ShowHeader="False" ItemStyle-Width="3em">
<ItemTemplate>
NKC_WF/WebUserControls/cmp_PartMIA_byCartID.ascx
+69 -1
View File
@@ -3,7 +3,7 @@
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="ItemID" DataSourceID="ods" CssClass="table table-striped table-sm textCondens" AllowPaging="True" OnSelectedIndexChanged="grView_SelectedIndexChanged">
<Columns>
<asp:TemplateField HeaderText="PART" SortExpression="ItemExtCode">
<%--<asp:TemplateField HeaderText="PART" SortExpression="ItemExtCode">
<ItemTemplate>
<div class="font-weight-bold textBig">
<asp:Label ID="Label1" runat="server" Text='<%# Eval("ItemExtCode") %>' />
@@ -94,6 +94,74 @@
<asp:Label ID="BinDtmxLabel" runat="server" Text='<%# Eval("BinDtmx") %>' />
</div>
</ItemTemplate>
</asp:TemplateField>--%>
<asp:TemplateField HeaderText="PART" SortExpression="ItemExtCode">
<ItemTemplate>
<div class="row">
<div class="col-12 col-md-3">
<div class="font-weight-bold textBig">
<asp:Label ID="Label1" runat="server" Text='<%# Eval("ItemExtCode") %>' />
</div>
<asp:Label ID="ItemDescLabel" runat="server" Text='<%# Eval("ItemDesc") %>' />
</div>
<div class="col-12 col-md-3">
<div class="font-weight-bold textBig">
<asp:Image runat="server" Height="64" Visible='<%# !checkProd %>' ImageUrl='<%# getImgUrl(Eval("ItemDtmx")) %>' CssClass="img-fluid" />
<asp:Label ID="ItemDtmxLabel" runat="server" Text='<%# Eval("ItemDtmx") %>' Visible='<%# showFull %>' />
</div>
<div class="row" runat="server" visible='<%# showFull %>'>
<div class="col-6">
<i class="fa fa-wrench" aria-hidden="true"></i>
<asp:Label ID="PostProcListLabel" runat="server" Text='<%# Eval("PostProcList") %>' />
</div>
<div class="col-6">
<i class="fa fa-paint-brush" aria-hidden="true"></i>
<asp:Label ID="ProcessesReqLabel" runat="server" Text='<%# Eval("ProcessesReq") %>' />
</div>
</div>
</div>
<div class="col-12 col-md-3">
<div class="row">
<div class="col-8">
<div class="font-weight-bold textBig">
<asp:Label ID="MatExtCodeLabel" runat="server" Text='<%# Eval("MatExtCode") %>' />
</div>
<asp:Label ID="MatDescLabel" runat="server" Text='<%# Eval("MatDesc") %>' Visible='<%# showFull %>' />
</div>
<div class="col-4">
<div runat="server" visible='<%# showFull %>'>
<div class="font-weight-bold textBig">
<asp:Label ID="OrderExtCodeLabel" runat="server" Text='<%# Eval("OrderExtCode") %>' />
</div>
<asp:Label ID="lblOrder" runat="server" Text='<%# traduci("Order") %>' />
</div>
</div>
</div>
</div>
<div class="col-12 col-md-3">
<div class="row">
<div class="col-6">
<div runat="server" visible='<%# showFull %>'>
<div class="textBig">
CART <b>
<asp:Label ID="CartIndexLabel" runat="server" Text='<%# Eval("CartIndex","C{0}") %>' /></b>
</div>
<asp:Label ID="CartDtmxLabel" runat="server" Text='<%# Eval("CartDtmx") %>' />
</div>
</div>
<div class="col-6">
<div runat="server" visible='<%# showFull %>'>
<div class="textBig">
BIN <b>
<asp:Label ID="BinIndexLabel" runat="server" Text='<%# Eval("BinIndex","B{0}") %>' /></b>
</div>
<asp:Label ID="BinDtmxLabel" runat="server" Text='<%# Eval("BinDtmx") %>' />
</div>
</div>
</div>
</div>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField ShowHeader="False" ItemStyle-Width="3em">
<ItemTemplate>
NKC_WF/WebUserControls/cmp_partMIA.ascx
+59 -83
View File
@@ -6,96 +6,72 @@
<Columns>
<asp:TemplateField HeaderText="PART" SortExpression="ItemExtCode">
<ItemTemplate>
<div class="font-weight-bold textBig">
<asp:Label ID="Label1" runat="server" Text='<%# Eval("ItemExtCode") %>' />
</div>
<asp:Label ID="ItemDescLabel" runat="server" Text='<%# Eval("ItemDesc") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Code" SortExpression="ItemDtmx">
<HeaderTemplate>
<asp:Label ID="lblItemDtmx" runat="server" Text='<%# traduci("Code") %>' Visible='<%# showFull %>' />
</HeaderTemplate>
<ItemTemplate>
<div class="font-weight-bold textBig">
<asp:Image runat="server" Height="64" Visible='<%# !checkProd %>' ImageUrl='<%# getImgUrl(Eval("ItemDtmx")) %>' CssClass="img-fluid" />
<asp:Label ID="ItemDtmxLabel" runat="server" Text='<%# Eval("ItemDtmx") %>' Visible='<%# showFull %>' />
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="OP" SortExpression="PostProcList">
<HeaderTemplate>
<asp:Label ID="lblPostProcList" runat="server" Text='<%# traduci("SecOp") %>' Visible='<%# showFull %>' />
</HeaderTemplate>
<ItemTemplate>
<div class="row" runat="server" visible='<%# showFull %>'>
<div class="col-1">
<i class="fa fa-wrench" aria-hidden="true"></i>
<div class="row">
<div class="col-12 col-md-3">
<div class="font-weight-bold textBig">
<asp:Label ID="Label1" runat="server" Text='<%# Eval("ItemExtCode") %>' />
</div>
<asp:Label ID="ItemDescLabel" runat="server" Text='<%# Eval("ItemDesc") %>' />
</div>
<div class="col-11">
<asp:Label ID="PostProcListLabel" runat="server" Text='<%# Eval("PostProcList") %>' />
<div class="col-12 col-md-3">
<div class="font-weight-bold textBig">
<asp:Image runat="server" Height="64" Visible='<%# !checkProd %>' ImageUrl='<%# getImgUrl(Eval("ItemDtmx")) %>' CssClass="img-fluid" />
<asp:Label ID="ItemDtmxLabel" runat="server" Text='<%# Eval("ItemDtmx") %>' Visible='<%# showFull %>' />
</div>
<div class="row" runat="server" visible='<%# showFull %>'>
<div class="col-6">
<i class="fa fa-wrench" aria-hidden="true"></i>
<asp:Label ID="PostProcListLabel" runat="server" Text='<%# Eval("PostProcList") %>' />
</div>
<div class="col-6">
<i class="fa fa-paint-brush" aria-hidden="true"></i>
<asp:Label ID="ProcessesReqLabel" runat="server" Text='<%# Eval("ProcessesReq") %>' />
</div>
</div>
</div>
<div class="col-1">
<i class="fa fa-paint-brush" aria-hidden="true"></i>
<div class="col-12 col-md-3">
<div class="row">
<div class="col-8">
<div class="font-weight-bold textBig">
<asp:Label ID="MatExtCodeLabel" runat="server" Text='<%# Eval("MatExtCode") %>' />
</div>
<asp:Label ID="MatDescLabel" runat="server" Text='<%# Eval("MatDesc") %>' Visible='<%# showFull %>' />
</div>
<div class="col-4">
<div runat="server" visible='<%# showFull %>'>
<div class="font-weight-bold textBig">
<asp:Label ID="OrderExtCodeLabel" runat="server" Text='<%# Eval("OrderExtCode") %>' />
</div>
<asp:Label ID="lblOrder" runat="server" Text='<%# traduci("Order") %>' />
</div>
</div>
</div>
</div>
<div class="col-11">
<asp:Label ID="ProcessesReqLabel" runat="server" Text='<%# Eval("ProcessesReq") %>' />
<div class="col-12 col-md-3">
<div class="row">
<div class="col-6">
<div runat="server" visible='<%# showFull %>'>
<div class="textBig">
CART <b>
<asp:Label ID="CartIndexLabel" runat="server" Text='<%# Eval("CartIndex","C{0}") %>' /></b>
</div>
<asp:Label ID="CartDtmxLabel" runat="server" Text='<%# Eval("CartDtmx") %>' />
</div>
</div>
<div class="col-6">
<div runat="server" visible='<%# showFull %>'>
<div class="textBig">
BIN <b>
<asp:Label ID="BinIndexLabel" runat="server" Text='<%# Eval("BinIndex","B{0}") %>' /></b>
</div>
<asp:Label ID="BinDtmxLabel" runat="server" Text='<%# Eval("BinDtmx") %>' />
</div>
</div>
</div>
</div>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="MaterialCode" SortExpression="MatExtCode">
<HeaderTemplate>
<asp:Label ID="lblMatExtCode" runat="server" Text='<%# traduci("Material") %>' />
</HeaderTemplate>
<ItemTemplate>
<div runat="server">
<div class="font-weight-bold textBig">
<asp:Label ID="MatExtCodeLabel" runat="server" Text='<%# Eval("MatExtCode") %>' />
</div>
<asp:Label ID="MatDescLabel" runat="server" Text='<%# Eval("MatDesc") %>' Visible='<%# showFull %>' />
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Order" SortExpression="OrderExtCode">
<HeaderTemplate>
<asp:Label ID="lblOrder" runat="server" Text='<%# traduci("Order") %>' Visible='<%# showFull %>' />
</HeaderTemplate>
<ItemTemplate>
<div runat="server" visible='<%# showFull %>'>
<div class="font-weight-bold textBig">
<asp:Label ID="OrderExtCodeLabel" runat="server" Text='<%# Eval("OrderExtCode") %>' />
</div>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Cart" SortExpression="CartDtmx">
<HeaderTemplate>
<asp:Label ID="lblCart" runat="server" Text='<%# traduci("Cart") %>' Visible='<%# showFull %>' />
</HeaderTemplate>
<ItemTemplate>
<div runat="server" visible='<%# showFull %>'>
<div class="font-weight-bold textBig">
<asp:Label ID="CartIndexLabel" runat="server" Text='<%# Eval("CartIndex","C{0}") %>' />
</div>
<asp:Label ID="CartDtmxLabel" runat="server" Text='<%# Eval("CartDtmx") %>' />
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Bin" SortExpression="BinDtmx">
<HeaderTemplate>
<asp:Label ID="lblBin" runat="server" Text='<%# traduci("Bin") %>' Visible='<%# showFull %>' />
</HeaderTemplate>
<ItemTemplate>
<div runat="server" visible='<%# showFull %>'>
<div class="font-weight-bold textBig">
<asp:Label ID="BinIndexLabel" runat="server" Text='<%# Eval("BinIndex","B{0}") %>' />
</div>
<asp:Label ID="BinDtmxLabel" runat="server" Text='<%# Eval("BinDtmx") %>' />
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField ShowHeader="False" ItemStyle-Width="3em">
<ItemTemplate>
<asp:LinkButton ID="lbtSetScrap" runat="server" CausesValidation="False" CommandArgument='<%# Eval("ItemID") %>' Visible='<%# checkVisible(Eval("StatusID")) && enableScrap %>' CommandName="Select" CssClass="btn btn-lg btn-block btn-danger" OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmSendScrap") %>' ToolTip='<%# traduci("SetScrap") %>'><i class="fa fa-recycle" aria-hidden="true"></i></asp:LinkButton>
NKC_WF/WebUserControls/cmp_partMIA_byPLID.ascx
+69 -1
View File
@@ -3,7 +3,7 @@
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataKeyNames="ItemID" DataSourceID="ods" CssClass="table table-striped table-sm textCondens" AllowPaging="True" OnSelectedIndexChanged="grView_SelectedIndexChanged">
<Columns>
<asp:TemplateField HeaderText="PART" SortExpression="ItemExtCode">
<%--<asp:TemplateField HeaderText="PART" SortExpression="ItemExtCode">
<ItemTemplate>
<div class="font-weight-bold textBig">
<asp:Label ID="Label1" runat="server" Text='<%# Eval("ItemExtCode") %>' />
@@ -94,6 +94,74 @@
<asp:Label ID="BinDtmxLabel" runat="server" Text='<%# Eval("BinDtmx") %>' />
</div>
</ItemTemplate>
</asp:TemplateField>--%>
<asp:TemplateField HeaderText="PART" SortExpression="ItemExtCode">
<ItemTemplate>
<div class="row">
<div class="col-12 col-md-3">
<div class="font-weight-bold textBig">
<asp:Label ID="Label1" runat="server" Text='<%# Eval("ItemExtCode") %>' />
</div>
<asp:Label ID="ItemDescLabel" runat="server" Text='<%# Eval("ItemDesc") %>' />
</div>
<div class="col-12 col-md-3">
<div class="font-weight-bold textBig">
<asp:Image runat="server" Height="64" Visible='<%# !checkProd %>' ImageUrl='<%# getImgUrl(Eval("ItemDtmx")) %>' CssClass="img-fluid" />
<asp:Label ID="ItemDtmxLabel" runat="server" Text='<%# Eval("ItemDtmx") %>' Visible='<%# showFull %>' />
</div>
<div class="row" runat="server" visible='<%# showFull %>'>
<div class="col-6 pr-0">
<i class="fa fa-wrench" aria-hidden="true"></i>
<asp:Label ID="PostProcListLabel" runat="server" Text='<%# Eval("PostProcList") %>' />
</div>
<div class="col-6 pl-0">
<i class="fa fa-paint-brush" aria-hidden="true"></i>
<asp:Label ID="ProcessesReqLabel" runat="server" Text='<%# Eval("ProcessesReq") %>' />
</div>
</div>
</div>
<div class="col-12 col-md-3">
<div class="row">
<div class="col-9 pr-0">
<div class="font-weight-bold textBig">
<asp:Label ID="MatExtCodeLabel" runat="server" Text='<%# Eval("MatExtCode") %>' />
</div>
<asp:Label ID="MatDescLabel" runat="server" Text='<%# Eval("MatDesc") %>' Visible='<%# showFull %>' />
</div>
<div class="col-3 pl-0 text-right">
<div runat="server" visible='<%# showFull %>'>
<div class="font-weight-bold textBig">
<asp:Label ID="OrderExtCodeLabel" runat="server" Text='<%# Eval("OrderExtCode") %>' />
</div>
<asp:Label ID="lblOrder" runat="server" Text='<%# traduci("Order") %>' />
</div>
</div>
</div>
</div>
<div class="col-12 col-md-3">
<div class="row">
<div class="col-6">
<div runat="server" visible='<%# showFull %>'>
<div class="textBig">
CART <b>
<asp:Label ID="CartIndexLabel" runat="server" Text='<%# Eval("CartIndex","C{0}") %>' /></b>
</div>
<asp:Label ID="CartDtmxLabel" runat="server" Text='<%# Eval("CartDtmx") %>' />
</div>
</div>
<div class="col-6">
<div runat="server" visible='<%# showFull %>'>
<div class="textBig">
BIN <b>
<asp:Label ID="BinIndexLabel" runat="server" Text='<%# Eval("BinIndex","B{0}") %>' /></b>
</div>
<asp:Label ID="BinDtmxLabel" runat="server" Text='<%# Eval("BinDtmx") %>' />
</div>
</div>
</div>
</div>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField ShowHeader="False" ItemStyle-Width="3em">
<ItemTemplate>
NKC_WF/site/PartMIA.aspx
+1 -3
View File
@@ -6,8 +6,6 @@
<%@ Register Src="~/WebUserControls/cmp_PartMIA_byCartID.ascx" TagPrefix="uc1" TagName="cmp_PartMIA_byCartID" %>
<%@ Register Src="~/WebUserControls/cmp_PartMIA_byBinID.ascx" TagPrefix="uc1" TagName="cmp_PartMIA_byBinID" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<div class="mx-2">
<asp:UpdatePanel runat="server" ID="upnlCarts" UpdateMode="Always">
@@ -19,7 +17,7 @@
<asp:Label runat="server" ID="lblBatchId" Visible="false" /></sub></h4>
<asp:HiddenField ID="hfBatchID" runat="server" />
</div>
<div class="card-body">
<div class="card-body p-0">
<div class="row">
<div class="col-12 my-2" runat="server" id="divBatchList">
<uc1:cmp_partMIA runat="server" ID="cmp_partMIA" showFull="true" enableScrap="false" />