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-03-05 18:54:48 +01:00
parent 77273893c6 53de333421
commit 7302b04986
13 changed files with 24 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppData/ComLib.cs
+10 -4
View File
@@ -1342,6 +1342,9 @@ namespace AppData
DS_App.SheetListDataTable tabSheets = DataLayer.man.taSHL.getByStack(currBunk.StackID);
DateTime dataStart = DateTime.Now;
ProdSheet currPanel;
string nestBaseBath = memLayer.ML.CRS("nestBaseBath");
string servBaseBath = memLayer.ML.CRS("servBaseBath");
string prodBaseBath = memLayer.ML.CRS("prodBaseBath");
foreach (var item in tabSheets)
{
// converto i workData con check null sul campo data
@@ -1349,13 +1352,13 @@ namespace AppData
{
DtStart = item.IsPrntStartNull() ? null : (DateTime?)item.PrntStart,
DtEnd = item.IsPrntEndNull() ? null : (DateTime?)item.PrntEnd,
ProgramPath = item.PrintFilePath
ProgramPath = item.PrintFilePath.Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath)
};
WorkData wdMachining = new WorkData()
{
DtStart = item.IsWrkStartNull() ? null : (DateTime?)item.WrkStart,
DtEnd = item.IsWrkEndNull() ? null : (DateTime?)item.WrkEnd,
ProgramPath = item.CncFilePath
ProgramPath = item.CncFilePath.Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath)
};
WorkData wdUnload = new WorkData()
{
@@ -1424,6 +1427,9 @@ namespace AppData
DS_App.SheetListDataTable tabSheets = DataLayer.man.taSHL.getByStack(StackID);
DateTime dataStart = DateTime.Now;
ProdSheet currPanel;
string nestBaseBath = memLayer.ML.CRS("nestBaseBath");
string servBaseBath = memLayer.ML.CRS("servBaseBath");
string prodBaseBath = memLayer.ML.CRS("prodBaseBath");
foreach (var item in tabSheets)
{
// converto i workData
@@ -1431,13 +1437,13 @@ namespace AppData
{
DtStart = item.IsPrntStartNull() ? null : (DateTime?)item.PrntStart,
DtEnd = item.IsPrntEndNull() ? null : (DateTime?)item.PrntEnd,
ProgramPath = item.PrintFilePath
ProgramPath = item.PrintFilePath.Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath)
};
WorkData wdMachining = new WorkData()
{
DtStart = item.IsWrkStartNull() ? null : (DateTime?)item.WrkStart,
DtEnd = item.IsWrkEndNull() ? null : (DateTime?)item.WrkEnd,
ProgramPath = item.CncFilePath
ProgramPath = item.CncFilePath.Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath)
};
WorkData wdUnload = new WorkData()
{
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=261']) {
withEnv(['NEXT_BUILD_NUMBER=262']) {
// 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 -1
View File
@@ -209,7 +209,8 @@ namespace NKC_WF.Controllers
// salvo udpate elenco ITEMS
ComLib.updatePartsFromNesting(rispStima.PartList);
// aggiorno cadPath x items che non abbiano valorizzato...
DataLayer.man.taIL.updateCadPath(memLayer.ML.CRS("cadBaseBath"), rispStima.BatchID, false);
string cadBaseBath = $"{memLayer.ML.CRS("nestBaseBath")}/DXF";
DataLayer.man.taIL.updateCadPath(cadBaseBath, rispStima.BatchID, false);
// verifico IN CASO di validazione andata a buon fine --> valorizzo tabella!
if (bStatus > 7)
{
NKC_WF/Controllers/BunkController.cs
-13
View File
@@ -152,18 +152,5 @@ namespace NKC_WF.Controllers
return answ;
}
#if false
// POST: api/Bunk
[HttpPost]
public void Post([FromBody]string value)
{
}
// DELETE: api/Bunk/5
[HttpDelete]
public void Delete(int id)
{
}
#endif
}
}
NKC_WF/Web.Debug-LELE.config
-3
View File
@@ -7,9 +7,6 @@
<!--conf dati locali-->
<add key="_SqlCopyDir" value="\\sql2016dev\Share\NKC\" 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)"/>
<!--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/Web.Debug.config
-3
View File
@@ -8,9 +8,6 @@
<!--conf dati locali-->
<add key="_SqlCopyDir" value="\\sql2016dev\Share\NKC\" 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)"/>
<!--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/Web.Prod.config
-3
View File
@@ -8,9 +8,6 @@
<!--conf dati locali-->
<add key="_SqlCopyDir" value="c:\Share\NKC\" 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:\Share\DXF\" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="srvCadBaseBath" value="C:\Users\Dell\Dropbox\SVG\DXF\" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="svgBasePath" value="c:\Share\SVG\" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<!--conf redis-->
<add key="RedisConn" value="localhost,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnAdmin" value="localhost,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
NKC_WF/Web.Release.config
-5
View File
@@ -6,13 +6,8 @@
<appSettings>
<!--conf dati locali-->
<!--<add key="userVirtDir" value="false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>-->
<add key="_SqlCopyDir" value="~/SHARE_SQL/" 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="srvDrawBaseBath" value="~/SHARE_NEST/SVG/" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="srvCadBaseBath" value="~/SHARE_NEST/DXF/" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="svgBasePath" value="~/SHARE_NEST/" 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/Web.config
+1 -13
View File
@@ -59,19 +59,7 @@
<add key="serializeSession" value="true"/>
<add key="errorPageRedirect" value="./Reset?Action=CDV"/>
<add key="maxAgeAppConf_min" value="5"/>
<!--area file upload-->
<add key="preFixCsv" value="false"/>
<add key="_tempUploadDir" value="~/FileUpload/"/>
<add key="_SqlCopyDir" value="\\sql2016dev\Share\NKC\"/>
<add key="_SqlImportDir" value="c:\Share\NKC\"/>
<!--Area file x scambio CAD / NESTING-->
<add key="userVirtDir" value="false"/>
<add key="fileBasePath" value="C:/Users/Dell/Dropbox/SVG/"/>
<add key="drawBaseBath" value="C:/Users/Dell/Dropbox/SVG/SVG/"/>
<add key="srvDrawBaseBath" value="\\W10-DataStore\Dropbox\SVG\SVG\"/>
<add key="cadBaseBath" value="C:\Users\Dell\Dropbox\SVG\DXF\"/>
<add key="srvCadBaseBath" value="\\stor01\DropboxSteamware\SVG\DXF\"/>
<add key="svgBasePath" value="\\stor01\DropboxSteamware\SVG\"/>
<!--minima durata x validità in stima PARTS singole -->
<add key="minValidEstSec" value="2"/>
<!--Configurazioni Redis-->
<add key="RedisConn" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=nkc.password"/>
NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs
+5 -5
View File
@@ -64,15 +64,15 @@ namespace NKC_WF.WebUserControls
{
// recupero ID del foglio corrente
string answ = "";
string baseOrig = memLayer.ML.CRS("drawBaseBath").ToLower();
string baseCurr = memLayer.ML.CRS("srvDrawBaseBath").ToLower();
string baseOrig = memLayer.ML.CRS("nestBaseBath").ToLower();
string baseCurr = memLayer.ML.CRS("servBaseBath").ToLower();
try
{
var tabSheets = DataLayer.man.taSHL.getBySheetId(SheetId);
if (tabSheets.Count > 0)
{
filename = tabSheets[0].DrawFilePath.ToLower().Replace(baseOrig, baseCurr);
if(memLayer.ML.CRB("userVirtDir"))
if (memLayer.ML.CRB("userVirtDir"))
{
filename = Server.MapPath(filename);
}
@@ -81,7 +81,7 @@ namespace NKC_WF.WebUserControls
}
catch
{ }
if (answ == "")
if (string.IsNullOrEmpty(answ))
{
// loggo...
logger.lg.scriviLog($"SVG not found | filename: {filename} | baseOrig: {baseOrig} | baseCurr: {baseCurr} | used default SVG");
@@ -94,7 +94,7 @@ namespace NKC_WF.WebUserControls
}
protected void Page_Load(object sender, EventArgs e)
{
if(!Page.IsPostBack)
if (!Page.IsPostBack)
{
// scrivo valore revisione batch!
hfCurrBunkRev.Value = ComLib.getSheetRevByBunk(BatchId).ToString();
NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs
+2 -1
View File
@@ -33,7 +33,8 @@ namespace NKC_WF.WebUserControls
// chiamo stored x creazione NUOVI BATCH...
try
{
DataLayer.man.taBL.createPartValBatch(memLayer.ML.CRS("cadBaseBath"));
string cadBaseBath = $"{memLayer.ML.CRS("nestBaseBath")}/DXF";
DataLayer.man.taBL.createPartValBatch(cadBaseBath);
// eventualmente mando primo batch da validare...
bool newValidSent = ComLib.sendFirstValidationBatch();
}
NKC_WF/export/BunkDetail.aspx.cs
-12
View File
@@ -69,17 +69,5 @@ namespace NKC_WF.export
answ = $"00:{numMin:00}:{numSec:00}";
return answ;
}
/// <summary>
/// Restitusice path bnonificato
/// </summary>
/// <param name="_rawPath"></param>
/// <returns></returns>
public string fixFilePath(object _rawPath)
{
string answ = _rawPath.ToString().ToLower();
string fileBasePath = memLayer.ML.CRS("fileBasePath").ToLower();
answ = answ.Replace(fileBasePath, "").Replace("svg", "SVG").Replace("cnc", "CNC");
return answ;
}
}
}
NKC_WF/site/OrderManager.aspx.cs
+3 -3
View File
@@ -19,11 +19,11 @@ namespace NKC_WF
/// <summary>
/// Path base x nesting
/// </summary>
protected string cadBaseBath = memLayer.ML.CRS("cadBaseBath");
protected string cadBaseBath = $"{memLayer.ML.CRS("nestBaseBath")}/DXF";
/// <summary>
/// Path base x server
/// </summary>
protected string srvCadBaseBath = memLayer.ML.CRS("srvCadBaseBath");
protected string srvCadBaseBath = $"{memLayer.ML.CRS("servBaseBath")}/DXF";
protected void Page_Load(object sender, EventArgs e)
{
@@ -130,7 +130,7 @@ namespace NKC_WF
dataValidated = false;
}
// FIX eventuali cadFilePath...
DataLayer.man.taIL.updateCadPath(memLayer.ML.CRS("cadBaseBath"), 0, false);
DataLayer.man.taIL.updateCadPath(cadBaseBath, 0, false);
// recupero da batch la riga impostata...
try
{