|
@@ -93,15 +93,17 @@ namespace MySystem
|
|
|
PxcModels.MachineForMerNo forMerNo = db.MachineForMerNo.FirstOrDefault(m => m.MerNo == Bind.MerNo);
|
|
|
if (forMerNo != null)
|
|
|
{
|
|
|
- PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == forMerNo.SnId) ?? new PxcModels.PosMachinesTwo();
|
|
|
- PxcModels.PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
|
|
|
- if(merchant != null)
|
|
|
- {
|
|
|
- db.PosMerchantInfo.Remove(merchant);
|
|
|
- }
|
|
|
db.MachineForMerNo.Remove(forMerNo);
|
|
|
db.SaveChanges();
|
|
|
}
|
|
|
+ PxcModels.PosMachinesTwo pos = db.PosMachinesTwo.FirstOrDefault(m => m.PosSn == Bind.MerSnNo) ?? new PxcModels.PosMachinesTwo();
|
|
|
+ PxcModels.PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.Id == pos.BindMerchantId);
|
|
|
+ if(merchant != null)
|
|
|
+ {
|
|
|
+ pos.BindMerchantId = 0;
|
|
|
+ db.PosMerchantInfo.Remove(merchant);
|
|
|
+ db.SaveChanges();
|
|
|
+ }
|
|
|
|
|
|
BindRecord edit = spdb.BindRecord.FirstOrDefault(m => m.Id == Bind.Id);
|
|
|
if (edit != null)
|