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-26 11:43:36 +01:00
parent 1a59e634b1 fdb5e44ae2
commit 3a4e59d641
13 changed files with 58 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppData/ComLib.cs
+11 -1
View File
@@ -738,7 +738,17 @@ namespace AppData
return answ;
}
/// <summary>
/// Salvo dati su PartList ricevuti da Nesting (COMPETATO)
/// Resetto i dati PRIMA di salvare i nuovi dati dal nesting
/// </summary>
/// <param name="BatchID"></param>
/// <param name="BunkList"></param>
public static void resetPrevDataFromNesting(int BatchID)
{
//elimino dati child MA NON il batch...
DataLayer.man.taBL.deleteTree(BatchID, 0);
}
/// <summary>
/// Salvo dati Bunks/Sheets/Parts ricevuti da Nesting (COMPETATO)
/// </summary>
/// <param name="BatchID"></param>
/// <param name="BunkList"></param>
Jenkinsfile
Vendored
+1 -19
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=223']) {
withEnv(['NEXT_BUILD_NUMBER=225']) {
// 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}')
@@ -84,28 +84,10 @@ pipeline {
sleep 3
}
},
// SITE_IIS01: {
// if(env.enableIIS01 == "Y")
// {
// sleep 3
// // SITE
// bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj"
// sleep 1
// }
// },
failFast: false)
}
else if (env.BRANCH_NAME == "develop") {
parallel (
// SITE_IIS02: {
// if(env.enableIIS02 == "Y")
// {
// sleep 1
// // SITE
// bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ NKC_WF/NKC_WF.csproj"
// sleep 3
// }
// },
SITE_IIS01: {
if(env.enableIIS01 == "Y")
{
NKC_WF/Controllers/BatchProcController.cs
+8 -6
View File
@@ -104,7 +104,7 @@ namespace NKC_WF.Controllers
// deserializzo.
baseNestAnsw batchProcAnsw = JsonConvert.DeserializeObject<baseNestAnsw>(content);
// se ho errori inizioa salvarli...
// se ho errori inizio a salvarli...
if (batchProcAnsw.ErrorList.Count > 0)
{
// procedura idempotente: elimino eventuali dati della "busta" precedente...
@@ -122,8 +122,8 @@ namespace NKC_WF.Controllers
/*************************************************
* IN BASE al tipo di risposta saprò se
* - è BatchReq / OfflineOrder
* - è stima iniziale o dettaglio (x batch)
* - si tratta di una stima di validazione o meno...
* - è stima iniziale o NEST dettagliato
* - si tratta di una stima di validazione ITEM ...
*
*************************************************/
if (batchProcAnsw.OrderType == oType.BatchRequest)
@@ -137,7 +137,7 @@ namespace NKC_WF.Controllers
// 2020.01.16 salvo su mongoDb la risposta...
ComLib.man.saveEstAnsw(rispStima);
// recupero info sul batch /KIT specifico x capire se sia di tipo "validation"
// recupero info sul batch / KIT specifico x capire se sia di tipo "validation"
bool isValidation = false;
var tabOrd = DataLayer.man.taOL.getByBatch(rispStima.BatchID);
if (tabOrd.Count > 0)
@@ -255,17 +255,19 @@ namespace NKC_WF.Controllers
bStatus = 2;
break;
}
// SALVO info riguardo al batch completato
DataLayer.man.taBL.updateStatus(rispNest.BatchID, bStatus, rispNest.EnvNum, (decimal)rispNest.EstimatedWorktime / 60);
// aggiorno il resto SOLO SE status == completo...
if (rispNest.ProcessStatus == procStatus.completed)
{
// resetto le precedenti elaborazioni: elimino dati child MA NON il batch...
DataLayer.man.taBL.deleteTree(rispNest.BatchID, 0);
// 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/Web.Release.config
+4 -3
View File
@@ -5,11 +5,12 @@
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<!--conf dati locali-->
<add key="_SqlCopyDir" value="\\sql2016dev\Share\NKC\" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="_SqlCopyDir" value="M:\" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="_SqlImportDir" value="c:\Share\NKC\" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="cadBaseBath" value="C:\Users\Dell\Dropbox\SVG\DXF\" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="srvCadBaseBath" value="\\stor01\DropboxSteamware\SVG\DXF\" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="svgBasePath" value="\\stor01\DropboxSteamware\SVG\" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="srvDrawBaseBath" value="N:\SVG\" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="srvCadBaseBath" value="N:\DXF\" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="svgBasePath" value="N:\" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<!--conf redis-->
<add key="RedisConn" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnAdmin" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
NKC_WF/WebUserControls/cmp_BP_bunkList.ascx
+6 -1
View File
@@ -19,7 +19,12 @@
<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>
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="StackIndex" HeaderText="Bunk #" ReadOnly="True" SortExpression="StackIndex" />
<asp:TemplateField HeaderText="Bunk #" SortExpression="StackIndex">
<ItemTemplate>
<asp:Label ID="lblStackIndex" runat="server" Text='<%# Eval("StackIndex") %>' CssClass="font-weight-bold" /></br>
<asp:Label ID="lblStackID" runat="server" Text='<%# Eval("StackID") %>' CssClass="small" />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Sheets (Prepared / Total)" SortExpression="NumSheets">
<ItemTemplate>
<div runat="server" id="divMain" class="row mx-1 ">
NKC_WF/WebUserControls/cmp_MU_stats.ascx
+5 -5
View File
@@ -5,23 +5,23 @@
<asp:HiddenField ID="hfBatchID" runat="server" />
<div class="row mt-2">
<div class="col-2">
<div class="col-2 pr-0">
<uc1:cmp_MU_singleStat runat="server" ID="cmp_MU_singleStatBin" />
</div>
<div class="col-1">
</div>
<div class="col-2">
<div class="col-2 px-0">
<uc1:cmp_MU_singleStat runat="server" ID="cmp_MU_singleStatBatch" />
</div>
<div class="col-2">
<div class="col-2 px-0">
<uc1:cmp_MU_singleStat runat="server" ID="cmp_MU_singleStatBunk" />
</div>
<div class="col-2">
<div class="col-2 px-0">
<uc1:cmp_MU_singleStat runat="server" ID="cmp_MU_singleStatSheet" />
</div>
<div class="col-1">
</div>
<div class="col-2">
<div class="col-2 pl-0">
<uc1:cmp_MU_singleStat runat="server" ID="cmp_MU_singleStatCart" />
</div>
</div>
NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx
-1
View File
@@ -22,6 +22,5 @@
</script>
<svg width="1200" height="600" xmlns='http://www.w3.org/2000/svg' runat="server" id="svgTable">
</svg>
<asp:HiddenField ID="hfBatchID" runat="server" />
<asp:HiddenField ID="hfSheetId" runat="server" Value="0" />
<asp:HiddenField ID="hfFilename" runat="server" Value="" />
NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs
+4 -61
View File
@@ -12,24 +12,6 @@ namespace NKC_WF.WebUserControls
{
public partial class cmp_MU_svgViewer : System.Web.UI.UserControl
{
/// <summary>
/// Batch corrente...
/// </summary>
public int BatchId
{
set
{
hfBatchID.Value = value.ToString();
calcSheet();
doUpdate();
}
get
{
int answ = 0;
int.TryParse(hfBatchID.Value, out answ);
return answ;
}
}
/// <summary>
/// Foglio corrente...
/// </summary>
@@ -61,55 +43,14 @@ namespace NKC_WF.WebUserControls
hfFilename.Value = value;
}
}
protected void calcSheet()
{
// base path
string baseOrig = memLayer.ML.CRS("drawBaseBath").ToLower();
string baseCurr = memLayer.ML.CRS("srvDrawBaseBath").ToLower();
//SOLO SE ho batch != 0...
if (BatchId > 0)
{
// FORSE 5/5?!?
var sheetList = DataLayer.man.taSHL.getByMLStatus(BatchId, 3, 5);
if (sheetList.Count > 0)
{
SheetId = sheetList[0].SheetID;
#if false
filename = sheetList[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr);
// NON DOVREBEB SERVIRE MAP se è già share di rete... anche se è su MEDESIMA macchina
//filename = Server.MapPath(filename);
#endif
}
}
#if false
else if (SheetId > 0)
{
filename = DataLayer.man.taSHL.getByItemID(SheetId)[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr);
}
#endif
}
public void doUpdate()
{
// recupero ID del foglio corrente
string answ = "";
string baseOrig = memLayer.ML.CRS("drawBaseBath").ToLower();
string baseCurr = memLayer.ML.CRS("srvDrawBaseBath").ToLower();
try
{
#if false
// FORSE 5/5?!?
var sheetList = DataLayer.man.taSHL.getByMLStatus(BatchId, 3, 5);
if (sheetList.Count > 0)
{
SheetId = sheetList[0].SheetID;
// lo leggo da file
string baseOrig = memLayer.ML.CRS("drawBaseBath").ToLower();
string baseCurr = memLayer.ML.CRS("srvDrawBaseBath").ToLower();
filename = sheetList[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr);
// NON DOVREBEB SERVIRE MAP se è già share di rete... anche se è su MEDESIMA macchina
//filename = Server.MapPath(filename);
}
#endif
string baseOrig = memLayer.ML.CRS("drawBaseBath").ToLower();
string baseCurr = memLayer.ML.CRS("srvDrawBaseBath").ToLower();
var tabSheets = DataLayer.man.taSHL.getBySheetId(SheetId);
if (tabSheets.Count > 0)
{
@@ -121,6 +62,8 @@ namespace NKC_WF.WebUserControls
{ }
if (answ == "")
{
// loggo...
logger.lg.scriviLog($"SVG not found | filename: {filename} | baseOrig: {baseOrig} | baseCurr: {baseCurr} | used default SVG");
// leggo SVG DI DEFAULT che indica NON PRESENTE...
filename = Server.MapPath("~/Images/NoData.svg");
answ = File.ReadAllText(filename);
NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.designer.cs
Generated
-9
View File
@@ -23,15 +23,6 @@ namespace NKC_WF.WebUserControls
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl svgTable;
/// <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 hfSheetId.
/// </summary>
NKC_WF/site/BatchPreview.aspx
+3 -3
View File
@@ -6,15 +6,15 @@
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<asp:HiddenField ID="hfBatchID" runat="server" />
<div class="row text-center">
<div class="col-2 pr-0">
<div class="row text-center small">
<div class="col-2 pr-0 small">
<uc1:cmp_BP_bunkList runat="server" id="cmp_BP_bunkList" />
</div>
<div class="col-8 px-0">
<h3>Batch preview - start | pause | stop</h3>
<uc1:cmp_MU_svgViewer runat="server" id="cmp_MU_svgViewer" />
</div>
<div class="col-2 pl-0">
<div class="col-2 pl-0 small">
<uc1:cmp_BP_sheetList runat="server" id="cmp_BP_sheetList" />
</div>
</div>
NKC_WF/site/DBG_QRCode_Unload.aspx
-3
View File
@@ -4,9 +4,6 @@
<%@ Register Src="~/WebUserControls/cmp_MU_bins.ascx" TagPrefix="uc1" TagName="cmp_MU_bins" %>
<%@ Register Src="~/WebUserControls/cmp_MU_Items.ascx" TagPrefix="uc1" TagName="cmp_MU_Items" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<asp:HiddenField ID="hfBatchID" runat="server" />
<asp:HiddenField ID="hfSheetID" runat="server" />
NKC_WF/site/MachineUnload.aspx
+3 -3
View File
@@ -17,13 +17,13 @@
<div class="card-body py-1 bg-dark">
<uc1:cmp_MU_stats runat="server" ID="cmp_MU_stats" />
<div class="row">
<div class="col-2">
<div class="col-2 pr-0">
<uc1:cmp_MU_bins runat="server" ID="cmp_MU_bins" />
</div>
<div class="col-8 py-0 my-0">
<div class="col-8 py-0 my-0 px-0">
<uc1:cmp_MU_svgViewer runat="server" id="cmp_MU_svgViewer" />
</div>
<div class="col-2">
<div class="col-2 pl-0">
<uc1:cmp_MU_carts runat="server" ID="cmp_MU_carts" />
</div>
</div>
NKC_WF/site/MachineUnload.aspx.cs
+13 -1
View File
@@ -38,9 +38,21 @@ namespace NKC_WF
BatchId = 242; // fixed x test!
// aggiorno child
cmp_MU_stats.BatchId = BatchId;
cmp_MU_svgViewer.BatchId = BatchId;
cmp_MU_bins.BatchId = BatchId;
cmp_MU_carts.BatchId = BatchId;
// calcolo sheet x SVG viewer...
int SheetId = 0;
//SOLO SE ho batch != 0...
if (BatchId > 0)
{
// FORSE 5/5?!?
var sheetList = DataLayer.man.taSHL.getByMLStatus(BatchId, 3, 5);
if (sheetList.Count > 0)
{
SheetId = sheetList[0].SheetID;
}
}
cmp_MU_svgViewer.SheetId = SheetId;
}
}
}