|
|
@@ -1854,11 +1854,9 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
return "新机具SN不正确或不满足条件";
|
|
|
}
|
|
|
- oldPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
|
|
|
- newPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == newpos.BrandId) ?? new KqProducts();
|
|
|
- if (oldPosBrand.Kind != newPosBrand.Kind && oldPosBrand.Kind == 1)
|
|
|
+ if (oldpos.BrandId != newpos.BrandId)
|
|
|
{
|
|
|
- return "电签不能兑换大POS";
|
|
|
+ return "换绑机具品牌不一致";
|
|
|
}
|
|
|
PosMerchantInfo merchant = db.PosMerchantInfo.FirstOrDefault(m => m.KqMerNo == MerNo);
|
|
|
if (merchant == null)
|