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

Integration 2.2g6 :

Browse Source 
- aggiunta gestione di pezzi (travi o pareti) senza feature.
This commit is contained in:
Dario Sassi
2020-07-25 09:43:10 +00:00
parent 9849509441
commit d7ed523ec9
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IntegrationEgaltech/Generator.cs
+13 -7
View File
@@ -91,8 +91,8 @@ namespace ib.essetre.integration.egaltech
// se invece è FALSE viene eseguita la query sulle tabelle Production
string sql = "" ;
if ( pattInfo.IsFromProject) {
sql = "SELECT P.projectId, " +
"P.elementId, 0 cutId, processId, info1, info2, enabled, level, " +
sql = "SELECT E.projectId, " +
"E.elementId, 0 cutId, processId, info1, info2, enabled, level, " +
"inTools, outTools, isChecked, P.done, isoType, ax, ay, az, P.x, P.y, P.z, " +
"P.flagDeleted, P.[group], [key], face, edge, des, " +
"p01, p02, p03, p04, p05, p06, p07, p08, p09, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, p21, p22, p23, p24, p25, p26, " +
@@ -101,13 +101,13 @@ namespace ib.essetre.integration.egaltech
"priority, processIdent, processingQuality, sag1, text, E.projectId, E.elementId, P.processId, 0 cutStart, 0 cutEnd, " +
"E.inverted, E.rotated, 0 doneTime, 0 startAngle, 0 endAngle, -1 referenceCutId, E.length, E.width, E.height " +
"FROM dbo.vw_Process AS P " +
"INNER JOIN dbo.vw_Element AS E " +
"RIGHT OUTER JOIN dbo.vw_Element AS E " +
"ON P.projectId=E.projectId AND P.elementId=E.elementId " +
"WHERE E.projectId = @firstId AND E.elementId = @secondId" ;
}
else {
sql = "SELECT vw_Task.productionId, " +
"vw_Task.patternId, vw_Task.cutId, taskId, info1, info2, enabled, level, " +
sql = "SELECT vw_Cut.productionId, " +
"vw_Cut.patternId, vw_Cut.cutId, taskId, info1, info2, enabled, level, " +
"inTools, outTools, isChecked, vw_Task.done, isoType, ax, ay, az, vw_Cut.x, vw_Cut.y, vw_Cut.z, " +
"vw_Task.flagDeleted, [group], [key], face, edge, des, " +
"p01, p02, p03, p04, p05, p06, p07, p08, p09, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, p21, p22, p23, p24, p25, p26, " +
@@ -116,9 +116,9 @@ namespace ib.essetre.integration.egaltech
"priority, processIdent, processingQuality, sag1, text, vw_Cut.projectId, vw_Cut.elementId, cutStart, cutEnd, " +
"inverted, rotated, doneTime, startAngle, endAngle, referenceCutId, length, width, height " +
"FROM dbo.vw_Task " +
"INNER JOIN vw_Cut " +
"RIGHT OUTER JOIN dbo.vw_Cut " +
"ON (vw_Task.cutId = vw_Cut.cutId AND vw_Task.patternId = vw_Cut.patternId AND vw_Task.productionId = vw_Cut.productionId) " +
"WHERE vw_Cut.productionId = @firstId AND vw_Task.patternId = @secondId" ;
"WHERE vw_Cut.productionId = @firstId AND vw_Cut.patternId = @secondId" ;
}
// Connessione al DB ed esecuzione query
@@ -570,6 +570,9 @@ namespace ib.essetre.integration.egaltech
readPart.features = new List<BTL.Feature>() ;
}
if ( string.IsNullOrEmpty( dRowF["taskId"].ToString()))
continue ;
BTL.Feature readFeature = new BTL.Feature() {
taskId = dRowF["taskId"].ToString(),
processKey = dRowF["group"].ToString() +
@@ -710,6 +713,9 @@ namespace ib.essetre.integration.egaltech
readPart.features = new List<BTL.Feature>() ;
}
if ( string.IsNullOrEmpty( dRowF["processId"].ToString()))
continue ;
BTL.Feature readFeature = new BTL.Feature() {
processId = dRowF["processId"].ToString(),
processKey = dRowF["group"].ToString() +
IntegrationEgaltech/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -36,5 +36,5 @@ using System.Runtime.InteropServices;
// È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build
// usando l'asterisco '*' come illustrato di seguito:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.2.7.5")]
[assembly: AssemblyFileVersion("2.2.7.5")]
[assembly: AssemblyVersion("2.2.7.6")]
[assembly: AssemblyFileVersion("2.2.7.6")]