Merge branch 'DuGuYang' into develop

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -245,6 +245,27 @@ namespace MySystem.Areas.Admin.Controllers
                 var opInfo = opdb.SysAdmin.FirstOrDefault(m => m.QueryCount > 0 && m.UserId == OpId) ?? new OpModels.SysAdmin();
                 if (OpId == 0) dic["OpIdStatus"] = "否";
                 if (OpId > 0) dic["OpIdStatus"] = opInfo.OpCode;
+
+                //顶级创客信息
+                if (!string.IsNullOrEmpty(userid_Users.ParentNav))
+                {
+                    string[] ParentNavList = userid_Users.ParentNav.Trim(',').Replace(",,", ",").Split(',');
+                    var topUserInfo = new Users();
+                    if (ParentNavList.Length > 1)
+                    {
+                        topUserInfo = db.Users.FirstOrDefault(m => m.Id == int.Parse(ParentNavList[1])) ?? new Users();
+                    }
+                    else
+                    {
+                        topUserInfo = db.Users.FirstOrDefault(m => m.Id == int.Parse(ParentNavList[0])) ?? new Users();
+                    }
+                    //顶级创客信息
+                    dic["TopUserInfo"] = topUserInfo.MakerCode + " " + topUserInfo.RealName;
+                }
+                else
+                {
+                    dic["TopUserInfo"] = "";
+                }
             }
             return Json(obj);
         }
@@ -1366,7 +1387,7 @@ namespace MySystem.Areas.Admin.Controllers
             }
 
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("StoreHouse", Fields, "Id desc", "0", 1, 20000, condition, "StoreNo,StoreName,UserId,BrandId,Address,ManageUserId,ManagerEmail,StoreType,TotalNum,LaveNum,OutNum,LimitTopUserId,StoreStatus,StoreKind", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("StoreHouse", Fields, "Id desc", "0", 1, 20000, condition, "Id,StoreNo,StoreName,UserId,BrandId,Address,ManageUserId,ManagerEmail,StoreType,TotalNum,LaveNum,OutNum,LimitTopUserId,StoreStatus,StoreKind", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
@@ -1395,7 +1416,36 @@ namespace MySystem.Areas.Admin.Controllers
                 int StoreKind = int.Parse(dic["StoreKind"].ToString());
                 if (StoreKind == 0) dic["StoreKind"] = "分仓";
                 if (StoreKind == 1) dic["StoreKind"] = "总仓";
+                
+                //小分仓
+                int Id = int.Parse(function.CheckInt(dic["Id"].ToString()));
+                int PreCount = db.PreSendStockDetail.Count(m => m.FromStoreId == Id && m.ApplyFlag == 0 && m.Status >= 0 && m.Status <= 1);
+                dic["PreNum"] = PreCount.ToString();
+
+                //顶级创客信息
+                if (!string.IsNullOrEmpty(userid_Users.ParentNav))
+                {
+                    string[] ParentNavList = userid_Users.ParentNav.Trim(',').Replace(",,", ",").Split(',');
+                    var topUserInfo = new Users();
+                    if (ParentNavList.Length > 1)
+                    {
+                        topUserInfo = db.Users.FirstOrDefault(m => m.Id == int.Parse(ParentNavList[1])) ?? new Users();
+                    }
+                    else
+                    {
+                        topUserInfo = db.Users.FirstOrDefault(m => m.Id == int.Parse(ParentNavList[0])) ?? new Users();
+                    }
+                    //顶级创客信息
+                    dic["TopUserInfo"] = topUserInfo.MakerCode + " " + topUserInfo.RealName;
+                }
+                else
+                {
+                    dic["TopUserInfo"] = "";
+                }
 
+                dic.Remove("Id");
+                dic.Remove("ManageUserId");
+                dic.Remove("UserId");
             }
 
             Dictionary<string, object> result = new Dictionary<string, object>();
@@ -1405,6 +1455,7 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> ReturnFields = new Dictionary<string, object>();
             ReturnFields.Add("StoreNo", "仓库编号");
             ReturnFields.Add("StoreName", "仓库名称");
+            ReturnFields.Add("TopUserInfo", "顶级创客信息");
             ReturnFields.Add("UserIdMakerCode", "仓库归属人创客编号");
             ReturnFields.Add("UserIdRealName", "仓库归属人真实姓名");
             ReturnFields.Add("BrandId", "产品类型");
@@ -1420,6 +1471,7 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("LimitTopUserId", "限制创客特殊仓库");
             ReturnFields.Add("StoreStatus", "仓库状态");
             ReturnFields.Add("StoreKind", "仓库归属类型");
+            ReturnFields.Add("PreNum", "小分仓数");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "StoreHouse", "ExportExcel");

Areas/Admin/Controllers/MainServer/UsersController.cs

@@ -167,13 +167,17 @@ namespace MySystem.Areas.Admin.Controllers
                 if (!string.IsNullOrEmpty(ParentNav))
                 {
                     string[] list = ParentNav.Trim(',').Replace(",,", ",").Split(',');
+                    var topUserInfo = new Users();
                     if (list.Length > 1)
                     {
-                        int TopId = int.Parse(function.CheckInt(list[1]));
-                        Users tuser = db.Users.FirstOrDefault(m => m.Id == TopId) ?? new Users();
-                        dic["TopMakerCode"] = tuser.MakerCode;
-                        dic["TopRealName"] = tuser.RealName;
+                        topUserInfo = db.Users.FirstOrDefault(m => m.Id == int.Parse(list[1])) ?? new Users();
+                    }
+                    else
+                    {
+                        topUserInfo = db.Users.FirstOrDefault(m => m.Id == int.Parse(list[0])) ?? new Users();
                     }
+                    dic["TopMakerCode"] = topUserInfo.MakerCode;
+                    dic["TopRealName"] = topUserInfo.RealName;
                 }
             }
             return Json(obj);

wwwroot/layuiadmin/modules_main/StoreHouse_Admin.js

@@ -170,6 +170,11 @@ layui.config({
                 width: 110,
                 title: '仓库名称',
                 sort: true
+            }, {
+                field: 'TopUserInfo',
+                width: 110,
+                title: '顶级创客信息',
+                sort: true
             }, {
                 field: 'ManageUserIdMakerCode',
                 width: 145,