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-09 18:40:29 +01:00
parent 837f7c5cb7 1b0010952f
commit 6eebe96f1e
9 changed files with 38 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppData/ComLib.cs
+10 -10
View File
@@ -1342,9 +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").ToLower();
string servBaseBath = memLayer.ML.CRS("servBaseBath").ToLower();
string prodBaseBath = memLayer.ML.CRS("prodBaseBath").ToLower();
string nestBasePath = memLayer.ML.CRS("nestBasePath").ToLower();
string servBasePath = memLayer.ML.CRS("servBasePath").ToLower();
string prodBasePath = memLayer.ML.CRS("prodBasePath").ToLower();
foreach (var item in tabSheets)
{
// converto i workData con check null sul campo data
@@ -1352,13 +1352,13 @@ namespace AppData
{
DtStart = item.IsPrntStartNull() ? null : (DateTime?)item.PrntStart,
DtEnd = item.IsPrntEndNull() ? null : (DateTime?)item.PrntEnd,
ProgramPath = item.PrintFilePath.ToLower().Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath)
ProgramPath = item.PrintFilePath.ToLower().Replace(nestBasePath, prodBasePath).Replace(servBasePath, prodBasePath)
};
WorkData wdMachining = new WorkData()
{
DtStart = item.IsWrkStartNull() ? null : (DateTime?)item.WrkStart,
DtEnd = item.IsWrkEndNull() ? null : (DateTime?)item.WrkEnd,
ProgramPath = item.CncFilePath.ToLower().Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath)
ProgramPath = item.CncFilePath.ToLower().Replace(nestBasePath, prodBasePath).Replace(servBasePath, prodBasePath)
};
WorkData wdUnload = new WorkData()
{
@@ -1427,9 +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").ToLower();
string servBaseBath = memLayer.ML.CRS("servBaseBath").ToLower();
string prodBaseBath = memLayer.ML.CRS("prodBaseBath").ToLower();
string nestBasePath = memLayer.ML.CRS("nestBasePath").ToLower();
string servBasePath = memLayer.ML.CRS("servBasePath").ToLower();
string prodBasePath = memLayer.ML.CRS("prodBasePath").ToLower();
foreach (var item in tabSheets)
{
// converto i workData
@@ -1437,13 +1437,13 @@ namespace AppData
{
DtStart = item.IsPrntStartNull() ? null : (DateTime?)item.PrntStart,
DtEnd = item.IsPrntEndNull() ? null : (DateTime?)item.PrntEnd,
ProgramPath = item.PrintFilePath.ToLower().Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath)
ProgramPath = item.PrintFilePath.ToLower().Replace(nestBasePath, prodBasePath).Replace(servBasePath, prodBasePath)
};
WorkData wdMachining = new WorkData()
{
DtStart = item.IsWrkStartNull() ? null : (DateTime?)item.WrkStart,
DtEnd = item.IsWrkEndNull() ? null : (DateTime?)item.WrkEnd,
ProgramPath = item.CncFilePath.ToLower().Replace(nestBaseBath, prodBaseBath).Replace(servBaseBath, prodBaseBath)
ProgramPath = item.CncFilePath.ToLower().Replace(nestBasePath, prodBasePath).Replace(servBasePath, prodBasePath)
};
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=263']) {
withEnv(['NEXT_BUILD_NUMBER=264']) {
// 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/Content/Site.css
+12 -12
View File
@@ -12,8 +12,8 @@ body {
padding-right: 15px;
}
.textCondens {
font-family: 'Roboto Condensed', sans-serif;
/*font-family: 'Open Sans Condensed', sans-serif;*/
/*font-family: 'Roboto Condensed', sans-serif;*/
font-family: 'Open Sans Condensed', sans-serif;
}
.textNormal {
font-family: 'Roboto', sans-serif;
@@ -134,10 +134,10 @@ body {
text-align: center;
}
.shortcuts .shortcut {
min-width: 180px;
min-height: 100px;
min-width: 9rem;
min-height: 5rem;
display: inline-block;
padding: 13.33333333px 0;
padding: 0.66666667rem 0;
margin: 0 2px 1em;
vertical-align: top;
text-decoration: none;
@@ -150,13 +150,13 @@ body {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);
border: 1px solid #ddd;
box-sizing: border-box;
border-radius: 10px;
border-radius: 0.5rem;
}
.shortcuts .shortcut-sm {
min-width: 90px;
min-height: 60px;
min-width: 4.5rem;
min-height: 3rem;
display: inline-block;
padding: 5px 0;
padding: 0.25rem 0;
margin: 0 2px 1em;
vertical-align: top;
text-decoration: none;
@@ -169,20 +169,20 @@ body {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);
border: 1px solid #ddd;
box-sizing: border-box;
border-radius: 10px;
border-radius: 0.5rem;
}
.shortcuts .shortcut .shortcut-icon {
width: 100%;
margin-top: 0;
margin-bottom: 0;
font-size: 40px;
font-size: 2rem;
color: #333;
}
.shortcuts .shortcut-sm .shortcut-icon {
width: 100%;
margin-top: 0;
margin-bottom: 0;
font-size: 40px;
font-size: 2rem;
color: #333;
}
.shortcuts .shortcut:hover {
NKC_WF/Controllers/BatchProcController.cs
+2 -2
View File
@@ -209,8 +209,8 @@ namespace NKC_WF.Controllers
// salvo udpate elenco ITEMS
ComLib.updatePartsFromNesting(rispStima.PartList);
// aggiorno cadPath x items che non abbiano valorizzato...
string cadBaseBath = $"{memLayer.ML.CRS("nestBaseBath")}/DXF";
DataLayer.man.taIL.updateCadPath(cadBaseBath, rispStima.BatchID, false);
string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}/{memLayer.ML.CRS("drawingFolder")}";
DataLayer.man.taIL.updateCadPath(cadBasePath, rispStima.BatchID, false);
// verifico IN CASO di validazione andata a buon fine --> valorizzo tabella!
if (bStatus > 7)
{
NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs
+2 -2
View File
@@ -64,8 +64,8 @@ namespace NKC_WF.WebUserControls
{
// recupero ID del foglio corrente
string answ = "";
string baseOrig = memLayer.ML.CRS("nestBaseBath").ToLower();
string baseCurr = memLayer.ML.CRS("servBaseBath").ToLower();
string baseOrig = memLayer.ML.CRS("nestBasePath").ToLower();
string baseCurr = memLayer.ML.CRS("servBasePath").ToLower();
try
{
var tabSheets = DataLayer.man.taSHL.getBySheetId(SheetId);
NKC_WF/WebUserControls/cmp_fileUpload.ascx.cs
+1 -1
View File
@@ -75,7 +75,7 @@ namespace NKC_WF.WebUserContols
/// <summary>
/// permesso scrittura SE E' abilitato a aprtire dalla tab diritti...
/// permesso scrittura SE E' abilitato a partire dalla tab diritti...
/// </summary>
public bool userIsAuth
{
NKC_WF/WebUserControls/cmp_validationSummary.ascx.cs
+2 -2
View File
@@ -33,8 +33,8 @@ namespace NKC_WF.WebUserControls
// chiamo stored x creazione NUOVI BATCH...
try
{
string cadBaseBath = $"{memLayer.ML.CRS("nestBaseBath")}/DXF";
DataLayer.man.taBL.createPartValBatch(cadBaseBath);
string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}/{memLayer.ML.CRS("drawingFolder")}";
DataLayer.man.taBL.createPartValBatch(cadBasePath);
// eventualmente mando primo batch da validare...
bool newValidSent = ComLib.sendFirstValidationBatch();
}
NKC_WF/compilerconfig.json
-4
View File
@@ -3,10 +3,6 @@
"outputFile": "Content/Site.css",
"inputFile": "Content/Site.less"
},
{
"outputFile": "Content/Site-old.css",
"inputFile": "Content/Site-old.less"
},
{
"outputFile": "Content/fonts.css",
"inputFile": "Content/fonts.less"
NKC_WF/site/OrderManager.aspx.cs
+8 -8
View File
@@ -19,11 +19,11 @@ namespace NKC_WF
/// <summary>
/// Path base x nesting
/// </summary>
protected string cadBaseBath = $"{memLayer.ML.CRS("nestBaseBath")}/DXF";
protected string cadBasePath = $"{memLayer.ML.CRS("nestBasePath")}/{memLayer.ML.CRS("drawingFolder")}";
/// <summary>
/// Path base x server
/// </summary>
protected string srvCadBaseBath = $"{memLayer.ML.CRS("servBaseBath")}/DXF";
protected string srvCadBasePath = $"{memLayer.ML.CRS("servBasePath")}/{memLayer.ML.CRS("drawingFolder")}";
protected void Page_Load(object sender, EventArgs e)
{
@@ -47,7 +47,7 @@ namespace NKC_WF
* Note validazione:
* - leggo cSV
* - carico su DB
* - verifico (coem ora x DXF) TTTI i aprticolari
* - verifico (come ora x DXF) TUTTI i particolari
* - cerco su tab ItemValidation
* --> NON TROVATO --> creo record IV + record Batch stato 8, con KitID = OrdID = 0, DA VALUTARE!!!
* - se valutazione tempo <= 1 sec --> NON VALIDO
@@ -130,7 +130,7 @@ namespace NKC_WF
dataValidated = false;
}
// FIX eventuali cadFilePath...
DataLayer.man.taIL.updateCadPath(cadBaseBath, 0, false);
DataLayer.man.taIL.updateCadPath(cadBasePath, 0, false);
// recupero da batch la riga impostata...
try
{
@@ -185,20 +185,20 @@ namespace NKC_WF
// verifico SE già processato...
if (!missingDxfList.Contains(item.ItemExtCode))
{
// cerco file! sostituisco cadBaseBath --> srvCadBaseBath
// cerco file! sostituisco cadBasePath --> srvCadBasePath
if (string.IsNullOrEmpty(item.CadFilePath))
{
localPath = $"{srvCadBaseBath}{item.ItemExtCode}.dxf";
localPath = $"{srvCadBasePath}{item.ItemExtCode}.dxf";
}
else
{
localPath = item.CadFilePath.Replace(cadBaseBath, srvCadBaseBath);
localPath = item.CadFilePath.Replace(cadBasePath, srvCadBasePath);
}
// verifico
fileOk = System.IO.File.Exists(localPath);
if (!fileOk)
{
DataLayer.man.taEL.insertQuery(DateTime.Now, "I.1", $"B.{batchID}", $"{item.ItemExtCode}.dxf", $"DXF File not found for part {item.ItemExtCode} on {srvCadBaseBath} | {item.ItemDesc}");
DataLayer.man.taEL.insertQuery(DateTime.Now, "I.1", $"B.{batchID}", $"{item.ItemExtCode}.dxf", $"DXF File not found for part {item.ItemExtCode} on {srvCadBasePath} | {item.ItemDesc}");
allOk = false;
missingDxfList.Add(item.ItemExtCode);
}