|
|
@@ -547,9 +547,14 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
foreach (var item in store)
|
|
|
{
|
|
|
var storeInfo = store.FirstOrDefault(m => m.Id == item.Id);
|
|
|
+ var storeOp = opdb.StoreForOperate.FirstOrDefault(m => m.Sort == 0 && m.StoreId == item.Id && m.Status > -1) ?? new OpModels.StoreForOperate();
|
|
|
storeInfo.Deposit = data.Deposit;
|
|
|
- db.SaveChanges();
|
|
|
+ storeInfo.UserId = user.UserId;
|
|
|
+ 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);
|
|
|
@@ -1046,8 +1051,8 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
AfterOutNum = toStore.OutNum, //操作后出库数
|
|
|
}).Entity;
|
|
|
db.SaveChanges();
|
|
|
-
|
|
|
- if(!opData.Contains(posInfo.BuyUserId + ":" + posInfo.BrandId))
|
|
|
+
|
|
|
+ if (!opData.Contains(posInfo.BuyUserId + ":" + posInfo.BrandId))
|
|
|
{
|
|
|
opData.Add(posInfo.BuyUserId + ":" + posInfo.BrandId);
|
|
|
}
|
|
|
@@ -1141,7 +1146,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
}).Entity;
|
|
|
db.SaveChanges();
|
|
|
|
|
|
- if(!opData.Contains(posInfo.BuyUserId + ":" + posInfo.BrandId))
|
|
|
+ if (!opData.Contains(posInfo.BuyUserId + ":" + posInfo.BrandId))
|
|
|
{
|
|
|
opData.Add(posInfo.BuyUserId + ":" + posInfo.BrandId);
|
|
|
}
|
|
|
@@ -1185,7 +1190,7 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
{
|
|
|
return "Warning|" + error;
|
|
|
}
|
|
|
- foreach(string sub in opData)
|
|
|
+ foreach (string sub in opData)
|
|
|
{
|
|
|
string[] datalist = sub.Split(":");
|
|
|
PublicFunction.SycnMachineCount(int.Parse(datalist[0]), int.Parse(datalist[1]));
|