|
@@ -76,7 +76,7 @@ namespace MySystem
|
|
|
Name = Name.Split('_')[1];
|
|
|
}
|
|
|
}
|
|
|
- else if (Mer.ProductType == "4")
|
|
|
+ else if (Mer.ProductType == "4" || Mer.ProductType == "8" || Mer.ProductType == "9")
|
|
|
{
|
|
|
Name = Mer.SeoTitle;
|
|
|
}
|
|
@@ -97,6 +97,13 @@ namespace MySystem
|
|
|
}).Entity;
|
|
|
db.SaveChanges();
|
|
|
}
|
|
|
+ else
|
|
|
+ {
|
|
|
+ string SnNo = add.KqSnNo;
|
|
|
+ PxcModels.MachineForMerNo oldPosFor = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == SnNo) ?? new PxcModels.MachineForMerNo();
|
|
|
+ PxcModels.PosMachinesTwo oldPos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == oldPosFor.SnId) ?? new PxcModels.PosMachinesTwo();
|
|
|
+ pos.IsFirst = oldPos.IsFirst;
|
|
|
+ }
|
|
|
add.UpdateDate = Mer.UpdateTime;
|
|
|
add.TopUserId = TopUserId;
|
|
|
add.BrandId = BrandId;
|