|
|
@@ -2142,12 +2142,14 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
PosMachinesTwo oldpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == oldForSnNo.SnId && m.BindingState == 0 && m.BuyUserId == userForMakerCode.UserId) ?? new PosMachinesTwo();
|
|
|
if (oldpos.Id == 0)
|
|
|
{
|
|
|
- return "您输入的坏机SN不存在或者不在" + MakerCode + "名下";
|
|
|
+ // return "您输入的坏机SN不存在或者不在" + MakerCode + "名下";
|
|
|
+ return "已绑定机具不支持坏机换新";
|
|
|
}
|
|
|
PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0 && m.PreUserId == 0) ?? new PosMachinesTwo();
|
|
|
if (newpos.Id == 0)
|
|
|
{
|
|
|
- return "您输入的新机SN不存在或不满足条件";
|
|
|
+ // return "您输入的新机SN不存在或不满足条件";
|
|
|
+ return "已绑定机具不支持坏机换新";
|
|
|
}
|
|
|
StoreHouse storeFrom = db.StoreHouse.FirstOrDefault(m => m.Id == storeForCodeFrom.StoreId);
|
|
|
if (Convert.ToInt32(storeFrom.BrandId) != Convert.ToInt32(newpos.BrandId))
|
|
|
@@ -2441,12 +2443,14 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
PosMachinesTwo oldpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == oldForSnNo.SnId && m.BindingState == 0 && m.StoreId == storeForBadCode.StoreId) ?? new PosMachinesTwo();
|
|
|
if (oldpos.Id == 0)
|
|
|
{
|
|
|
- return "您输入的坏机SN不存在或者不在仓库" + StoreCode + "中";
|
|
|
+ // return "您输入的坏机SN不存在或者不在仓库" + StoreCode + "中";
|
|
|
+ return "已绑定机具不支持坏机换新";
|
|
|
}
|
|
|
PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0 && m.PreUserId == 0) ?? new PosMachinesTwo();
|
|
|
if (newpos.Id == 0)
|
|
|
{
|
|
|
- return "您输入的新机SN不存在或不满足条件";
|
|
|
+ // return "您输入的新机SN不存在或不满足条件";
|
|
|
+ return "已绑定机具不支持坏机换新";
|
|
|
}
|
|
|
StoreHouse storeFrom = db.StoreHouse.FirstOrDefault(m => m.Id == storeForCodeFrom.StoreId);
|
|
|
if (Convert.ToInt32(storeFrom.BrandId) != Convert.ToInt32(oldpos.BrandId))
|