admin/ayanova7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-01-02 20:11:19 +00:00
parent 676fc0b756
commit 2e8ad171c8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/Plugins/AyaNova.Plugin.V8/V8.cs
View File

@@ -1610,10 +1610,10 @@ namespace AyaNova.PlugIn.V8
dynamic d = new JObject(); dynamic d = new JObject();
d.Serial = c.Serial; d.Serial = c.Serial;
if (IsDuplicatev7v8IdMapItem(c.ID, c.Serial, progress)) continue; if (IsDuplicatev7v8IdMapItem(c.ID, c.Serial, progress)) continue;
progress.Op(ObjectTypeName + " " + d.name); progress.Op(ObjectTypeName + " " + d.serial);
d.active = c.Active; d.active = c.Active;
d.notes = c.Notes; d.notes = c.Notes;
d.customerId = Getv7v8IdMap(c.ClientID, "Client for Unit " + d.name); d.customerId = Getv7v8IdMap(c.ClientID, "Client for Unit " + d.serial);
// d.parentUnitId = Getv7v8IdMapNullOk(c.ParentID); // d.parentUnitId = Getv7v8IdMapNullOk(c.ParentID);
d.unitModelId = Getv7v8IdMapNullOk(c.UnitModelID); d.unitModelId = Getv7v8IdMapNullOk(c.UnitModelID);
d.unitHasOwnAddress = c.UnitHasOwnAddress; d.unitHasOwnAddress = c.UnitHasOwnAddress;
@@ -1701,7 +1701,7 @@ namespace AyaNova.PlugIn.V8
if (c.ParentID == Guid.Empty && c.ReplacedByUnitID == Guid.Empty) continue; if (c.ParentID == Guid.Empty && c.ReplacedByUnitID == Guid.Empty) continue;
var ObjectTID = new TypeAndID(RootObjectTypes.Unit, c.ID); var ObjectTID = new TypeAndID(RootObjectTypes.Unit, c.ID);
dynamic d = util.GetAsync("unit/" + Getv7v8IdMap(c.ID, "Unit for parent / replaced by unit step 2 unit import").ToString()); dynamic d = util.GetAsync("unit/" + Getv7v8IdMap(c.ID, "Unit for parent / replaced by unit step 2 unit import").ToString());
progress.Op(ObjectTypeName + " " + d.name); progress.Op(ObjectTypeName + " " + d.serial);
d.replacedByUnitId = Getv7v8IdMapNullOk(c.ReplacedByUnitID); d.replacedByUnitId = Getv7v8IdMapNullOk(c.ReplacedByUnitID);
d.parentUnitId = Getv7v8IdMapNullOk(c.ParentID); d.parentUnitId = Getv7v8IdMapNullOk(c.ParentID);
if (d.parentUnitId != null || d.replacedByUnitId != null) if (d.parentUnitId != null || d.replacedByUnitId != null)