@@ -95,6 +95,13 @@ namespace MySystem
KqMerNo = Mer.MerNo,
MerchantNo = Mer.MerNo,
}).Entity;
+ //查询商户备份表,如果有记录则继承之前的商户Id
+ PxcModels.PosMerchantInfoBak MerBak = db.PosMerchantInfoBak.FirstOrDefault(m => m.KqMerNo == Mer.MerNo);
+ if(MerBak != null)
+ {
+ add.Id = MerBak.Id;
+ db.PosMerchantInfoBak.Remove(MerBak);
+ }
db.SaveChanges();
function.WriteLog("MerNo:" + Mer.MerNo + ",PosSn:" + pos.PosSn + ",IsFirst:" + IsFirst + "\n\n", "监控机具是否互斥");
}