|
|
@@ -483,6 +483,8 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
return "您输入的仓库归属创客编号不存在,请重新输入正确的仓库归属创客编号";
|
|
|
}
|
|
|
Fields.Add("UserId", user.UserId); //仓库归属人
|
|
|
+ Fields.Add("ManagerEmail", data.ManagerEmail); //管理者邮箱
|
|
|
+ Fields.Add("ManageMobile", data.ManageMobile);
|
|
|
Fields.Add("Areas", data.Areas); //所属地区
|
|
|
Fields.Add("Address", data.Address); //仓库地址
|
|
|
UserForMakerCode manage = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == ManageMakerCode);
|
|
|
@@ -490,7 +492,8 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
return "您输入的仓库负责人编号不存在,请重新输入正确的仓库负责人编号";
|
|
|
}
|
|
|
- var store = db.StoreHouse.Where(m => m.Sort == 0 && m.Status == 1 && m.UserId == user.UserId).ToList();
|
|
|
+ var sto = db.StoreHouse.FirstOrDefault(m => m.Id == data.Id);
|
|
|
+ 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)
|
|
|
{
|
|
|
@@ -506,7 +509,6 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
// RedisDbconn.Instance.AddList("ResetStoreReserveQueue", user.UserId.ToString());
|
|
|
decimal olddeposit = 0;//旧押金
|
|
|
decimal newdeposit = 0;//新押金
|
|
|
- var sto = db.StoreHouse.FirstOrDefault(m => m.Id == data.Id);
|
|
|
newdeposit = data.Deposit;
|
|
|
olddeposit = sto.Deposit;
|
|
|
if (sto.OpId > 0)
|
|
|
@@ -550,14 +552,21 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
var storeOp = opdb.StoreForOperate.FirstOrDefault(m => m.Sort == 0 && m.StoreId == item.Id && m.Status > -1) ?? new OpModels.StoreForOperate();
|
|
|
storeInfo.Deposit = data.Deposit;
|
|
|
storeInfo.UserId = user.UserId;
|
|
|
+ storeInfo.ManageUserId = manage.UserId;
|
|
|
+ storeInfo.ManagerEmail = data.ManagerEmail;
|
|
|
+ storeInfo.ManageMobile = data.ManageMobile;
|
|
|
+ storeInfo.Address = data.Address;
|
|
|
+ storeInfo.Areas = data.Areas;
|
|
|
+ storeInfo.LimitTopUserId = data.LimitTopUserId;
|
|
|
+ storeInfo.FilePath = data.FilePath;
|
|
|
+ storeInfo.Deposit = data.Deposit;
|
|
|
+ storeInfo.Remark = data.Remark;
|
|
|
storeOp.UpdateDate = DateTime.Now;
|
|
|
storeOp.QueryCount = user.UserId;
|
|
|
}
|
|
|
db.SaveChanges();
|
|
|
opdb.SaveChanges();
|
|
|
Fields.Add("ManageUserId", manage.UserId); //仓库管理员
|
|
|
- Fields.Add("ManagerEmail", data.ManagerEmail); //管理者邮箱
|
|
|
- Fields.Add("ManageMobile", data.ManageMobile);
|
|
|
Fields.Add("Remark", data.Remark); //备注
|
|
|
Fields.Add("LimitTopUserId", data.LimitTopUserId); //限制创客特殊仓库
|
|
|
Fields.Add("StoreKind", data.StoreKind); //仓库归属类型
|