|
|
@@ -482,7 +482,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
return "您输入的仓库归属创客编号不存在，请重新输入正确的仓库归属创客编号";
|
|
|
}
|
|
|
- var check = db.StoreHouse.Any(m => m.Status == 1 && m.UserId == user.UserId);
|
|
|
+ var check = db.StoreHouse.Any(m => m.Sort == 0 && m.Status == 1 && m.UserId == user.UserId);
|
|
|
if (check)
|
|
|
{
|
|
|
return "创客" + MakerCode + "名下已存在分仓，不可再变更";
|
|
|
@@ -498,14 +498,6 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
return "您输入的仓库负责人编号不存在，请重新输入正确的仓库负责人编号";
|
|
|
}
|
|
|
var sto = db.StoreHouse.FirstOrDefault(m => m.Id == data.Id);
|
|
|
- var oldUserInfo = db.Users.FirstOrDefault(m => m.Id == sto.UserId) ?? new Users();
|
|
|
- var newUserInfo = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
|
|
|
- newUserInfo.CreateStoreDate = oldUserInfo.CreateStoreDate;
|
|
|
- newUserInfo.StoreStock = oldUserInfo.StoreStock;
|
|
|
- newUserInfo.ThisMonthSend = oldUserInfo.ThisMonthSend;
|
|
|
- newUserInfo.CreateStoreDate = null;
|
|
|
- newUserInfo.StoreStock = 0;
|
|
|
- newUserInfo.ThisMonthSend = 0;
|
|
|
var store = db.StoreHouse.Where(m => m.Sort == 0 && m.Status == 1 && m.UserId == sto.UserId).ToList();
|
|
|
UserAccount userAccount = db.UserAccount.FirstOrDefault(m => m.Id == user.UserId);
|
|
|
if (userAccount == null)
|
|
|
@@ -559,6 +551,14 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
amount.ValidAmount += data.Deposit;
|
|
|
opdb.SaveChanges();
|
|
|
}
|
|
|
+ var oldUserInfo = db.Users.FirstOrDefault(m => m.Id == sto.UserId) ?? new Users();
|
|
|
+ var newUserInfo = db.Users.FirstOrDefault(m => m.Id == user.UserId) ?? new Users();
|
|
|
+ newUserInfo.CreateStoreDate = oldUserInfo.CreateStoreDate;
|
|
|
+ newUserInfo.StoreStock = oldUserInfo.StoreStock;
|
|
|
+ newUserInfo.ThisMonthSend = oldUserInfo.ThisMonthSend;
|
|
|
+ oldUserInfo.CreateStoreDate = null;
|
|
|
+ oldUserInfo.StoreStock = 0;
|
|
|
+ oldUserInfo.ThisMonthSend = 0;
|
|
|
foreach (var item in store)
|
|
|
{
|
|
|
var storeInfo = store.FirstOrDefault(m => m.Id == item.Id);
|
|
|
@@ -577,7 +577,6 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
storeOp.UpdateDate = DateTime.Now;
|
|
|
storeOp.QueryCount = user.UserId;
|
|
|
}
|
|
|
-
|
|
|
db.SaveChanges();
|
|
|
opdb.SaveChanges();
|
|
|
Fields.Add("ManageUserId", manage.UserId); //仓库管理员
|
DuGuYang