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-01-27 13:00:50 +01:00
parent 3b1ebb28c0 416738d9d3
commit 56b5bd43db
6 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=229']) {
withEnv(['NEXT_BUILD_NUMBER=231']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '0.9.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/Controllers/BatchProcController.cs
+2 -2
View File
@@ -260,14 +260,14 @@ namespace NKC_WF.Controllers
{
// resetto le precedenti elaborazioni: elimino dati child MA NON il batch...
DataLayer.man.taBL.resetTree(rispNest.BatchID);
// SALVO info riguardo al batch completato
DataLayer.man.taBL.updateStatus(rispNest.BatchID, bStatus, rispNest.EnvNum, (decimal)rispNest.EstimatedWorktime / 60);
// salvo info riguardo ai vari Bunk / Sheets / Items...
ComLib.updateBunksFromNesting(rispNest.BatchID, rispNest.BunkList);
// salvo info x CART & BINS previsti
ComLib.updateBinsFromNesting(rispNest.BatchID, rispNest.BinList);
ComLib.updateCartsFromNesting(rispNest.BatchID, rispNest.CartList);
}
// SALVO info riguardo al batch completato
DataLayer.man.taBL.updateStatus(rispNest.BatchID, bStatus, rispNest.EnvNum, (decimal)rispNest.EstimatedWorktime / 60);
// registro OK
answ = "OK";
}
NKC_WF/WebUserControls/cmp_BP_sheetList.ascx
+2 -2
View File
@@ -15,10 +15,10 @@
<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>
</HeaderTemplate>
<ItemTemplate>
<asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CommandArgument='<%# Eval("StackIndex") %>' CssClass="btn btn-sm btn-primary"><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-sm btn-primary"><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="StackIndex" HeaderText="#" ReadOnly="True" SortExpression="StackIndex" />
<asp:BoundField DataField="SheetIndex" HeaderText="#" ReadOnly="True" SortExpression="SheetIndex" />
<asp:TemplateField HeaderText="Material" SortExpression="MatExtCode">
<ItemTemplate>
<div class="row">
NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs
+1 -1
View File
@@ -91,7 +91,7 @@ namespace NKC_WF.WebUserControls
{
int totSec = 0;
string answ = "";
int.TryParse(_timeSec.ToString(), out totSec);
int.TryParse(_timeSec.ToString().Replace(".",""), out totSec);
int numMin = totSec / 60;
int numSec = totSec - (60 * numMin);
answ = $"{numMin:00}:{numSec:00}";
NKC_WF/site/BatchPreview.aspx
+1 -1
View File
@@ -15,7 +15,7 @@
<div class="col-9 px-0">
<h3>Batch preview</h3>
<asp:Label runat="server" ID="lblOut" txt="..." />
<uc1:cmp_slider runat="server" id="cmp_slider" minVal="0" maxVal="100" />
<uc1:cmp_slider runat="server" id="cmp_slider" />
<uc1:cmp_MU_svgViewer runat="server" id="cmp_MU_svgViewer" />
</div>
<div class="col-2 pl-0 small">
NKC_WF/site/BatchPreview.aspx.cs
+5
View File
@@ -14,6 +14,11 @@ namespace NKC_WF.site
{
if (!Page.IsPostBack)
{
cmp_slider.selValue = 0;
//cmp_BP_bunkList.selIndex = 0;
//cmp_BP_sheetList.BunkId = cmp_BP_bunkList.BunkIdSel;
//cmp_BP_sheetList.selIndex = 0;
//cmp_MU_svgViewer.SheetId = cmp_BP_sheetList.SheetIdSel;
doUpdate();
}
cmp_BP_bunkList.eh_doRefresh += Cmp_BP_bunkList_eh_doRefresh;