|
|
@@ -1194,10 +1194,10 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
return "原机具SN不正确";
|
|
|
}
|
|
|
- if (oldpos.BindingState != 1)
|
|
|
- {
|
|
|
- return "原机具未绑定";
|
|
|
- }
|
|
|
+ // if (oldpos.BindingState != 1)
|
|
|
+ // {
|
|
|
+ // return "原机具未绑定";
|
|
|
+ // }
|
|
|
PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId);
|
|
|
if (oldpos == null)
|
|
|
{
|
|
|
@@ -1266,9 +1266,6 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
BackProductName = newPosBrand.Name;
|
|
|
ChangeDeviceName = oldpos.DeviceName;
|
|
|
ChangeSnExpand += oldpos.PosSn + "\n";
|
|
|
- RedisDbconn.Instance.Clear("PosMachinesTwo:" + oldpos.Id);
|
|
|
- RedisDbconn.Instance.Clear("PosMachinesTwo:" + newpos.Id);
|
|
|
- RedisDbconn.Instance.Clear("PosMerchantInfo:" + merchant.Id);
|
|
|
PublicFunction.SycnMachineCount(oldpos.BuyUserId, oldpos.BrandId);
|
|
|
}
|
|
|
add.BackProductType = BackProductType; //退回产品类型
|
|
|
@@ -1366,15 +1363,12 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
ApplyNo = "U" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8),
|
|
|
});
|
|
|
pos.BindMerchantId = 0;
|
|
|
- pos.Status = -2;
|
|
|
pos.BindingState = 0;
|
|
|
pos.BindingTime = DateTime.Parse("1900-01-01");
|
|
|
pos.UserId = pos.BuyUserId;
|
|
|
string IdBrand = pos.BuyUserId + "_" + pos.BrandId;
|
|
|
db.SaveChanges();
|
|
|
PublicFunction.SycnMachineCount(pos.BuyUserId, pos.BrandId);
|
|
|
- RedisDbconn.Instance.Clear("UserMachineData:" + IdBrand);
|
|
|
- RedisDbconn.Instance.Clear("PosMachinesTwo:" + pos.Id);
|
|
|
return "success";
|
|
|
}
|
|
|
#endregion
|