调整

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -1477,7 +1477,7 @@ namespace MySystem.Areas.Admin.Controllers
                 var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.UserId == userForMakerCode.UserId) ?? new OpModels.SysAdmin();
                 if (sysAdmin.Id > 0)
                 {
-                    DataTable dt = OtherMySqlConn.dtable("UPDATE StoreHouse SET OpId=" + sysAdmin.Id + " WHERE Id IN (" + Id + ") AND OpId =" + sysAdmin.Id + " AND `Status` >0");
+                    DataTable dt = OtherMySqlConn.dtable("UPDATE StoreHouse SET OpId=" + sysAdmin.UserId + " WHERE Id IN (" + Id + ") AND OpId =" + sysAdmin.UserId + " AND `Status` >0");
                     // new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreHouse", Fields, pos.Id);
                     db.SaveChanges();
                     foreach (var item in idlist)
@@ -1497,7 +1497,7 @@ namespace MySystem.Areas.Admin.Controllers
                             amount = 150;
                         }
                         tamount = amount * posCount;//扣减运营中心该品牌机具额度
-                        var userAmount = opdb.UserAccount.FirstOrDefault(m => m.UserId == sysAdmin.Id) ?? new OpModels.UserAccount();
+                        var userAmount = opdb.UserAccount.FirstOrDefault(m => m.Sort == sysAdmin.Id) ?? new OpModels.UserAccount();
                         userAmount.ValidAmount -= tamount;
                         storeInfo.OpId = sysAdmin.Id;
                         db.SaveChanges();
@@ -1505,7 +1505,7 @@ namespace MySystem.Areas.Admin.Controllers
                         var query = opdb.StoreForOperate.FirstOrDefault(m => m.OpId == sysAdmin.Id && m.StoreId == StoreId && m.Status > -1);
                         if (query == null)
                         {
-                            var user = db.Users.FirstOrDefault( m => m.Id == storeInfo.UserId) ?? new Users();
+                            var user = db.Users.FirstOrDefault(m => m.Id == storeInfo.UserId) ?? new Users();
                             query = opdb.StoreForOperate.Add(new OpModels.StoreForOperate()
                             {
                                 CreateDate = DateTime.Now, //创建时间
@@ -1519,6 +1519,7 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                     }
                     sysAdmin.StoreCount += idlist.Count();//添加关联分仓数
+                    opdb.SaveChanges();
                 }
             }
             return "success";
@@ -1561,12 +1562,33 @@ namespace MySystem.Areas.Admin.Controllers
                 var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.UserId == userForMakerCode.UserId);
                 if (sysAdmin.Id > 0)
                 {
-                    DataTable dt = OtherMySqlConn.dtable("UPDATE StoreHouse SET OpId=0 WHERE Id IN (" + Id + ") AND OpId =" + sysAdmin.Id + " AND `Status` >0");
+                    string error = "";
+                    foreach (var item in idlist)
+                    {
+                        int StoreId = int.Parse(item);
+                        var store = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId);
+                        if (store != null && store.OpId != sysAdmin.UserId)
+                        {
+                            error += "分仓" + store.StoreNo + "未在创客" + MakerCode + "的关联分仓中";
+                        }
+                    }
+
+                    if (!string.IsNullOrEmpty(error))
+                    {
+                        return "Warning|" + error;
+                    }
+
+                    DataTable dt = OtherMySqlConn.dtable("UPDATE StoreHouse SET OpId=0 WHERE Id IN (" + Id + ") AND OpId =" + sysAdmin.UserId + " AND `Status` >0");
                     // new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("StoreHouse", Fields, pos.Id);
                     db.SaveChanges();
                     foreach (var item in idlist)
                     {
                         int StoreId = int.Parse(item);
+                        var store = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId);
+                        if (store != null && store.OpId != sysAdmin.UserId)
+                        {
+                            return "分仓" + store.StoreNo + "未在创客" + MakerCode + "的关联分仓中";
+                        }
                         var amount = 0;
                         var tamount = 0;
                         var storeInfo = db.StoreHouse.FirstOrDefault(m => m.Id == StoreId);
@@ -1581,10 +1603,10 @@ namespace MySystem.Areas.Admin.Controllers
                             amount = 150;
                         }
                         tamount = amount * posCount;//扣减运营中心该品牌机具额度
-                        var userAmount = opdb.UserAccount.FirstOrDefault(m => m.UserId == sysAdmin.Id) ?? new OpModels.UserAccount();
+                        var userAmount = opdb.UserAccount.FirstOrDefault(m => m.Sort == sysAdmin.Id) ?? new OpModels.UserAccount();
                         userAmount.ValidAmount += tamount;
                         opdb.SaveChanges();
-                        var query = opdb.StoreForOperate.FirstOrDefault(m => m.OpId == sysAdmin.Id && m.StoreId == StoreId);
+                        var query = opdb.StoreForOperate.FirstOrDefault(m => m.OpId == sysAdmin.UserId && m.StoreId == StoreId);
                         if (query != null)
                         {
                             query.UpdateDate = DateTime.Now;
@@ -1593,6 +1615,7 @@ namespace MySystem.Areas.Admin.Controllers
                         }
                     }
                     sysAdmin.StoreCount -= idlist.Count();//减少关联分仓数
+                    opdb.SaveChanges();
                 }
             }
             return "success";

Areas/Admin/Controllers/OperateServer/PosCouponsLeaderController.cs

@@ -574,11 +574,15 @@ namespace MySystem.Areas.Admin.Controllers
             if (userForMakerCode.UserId > 0)
             {
                 var user = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId) ?? new Users();
-                if (user.Id > 0)
+                if (user.Id > 0 && user.LeaderLevel > 0)
                 {
                     DataTable dt = OtherMySqlConn.dtable("UPDATE PosCoupons SET LeaderUserId=" + user.Id + ",SeoTitle=" + SysUserName + "_" + SysRealName + " WHERE Id IN (" + Id + ")");
                     db.SaveChanges();
                 }
+                else
+                {
+                    return "该创客不是盟主或者账号不存在";
+                }
             }
             return "success";
         }
@@ -620,6 +624,21 @@ namespace MySystem.Areas.Admin.Controllers
                 var user = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId) ?? new Users();
                 if (user.Id > 0)
                 {
+                    var posCoupons = db.PosCoupons.Where(m => m.LeaderUserId == user.Id).ToList();
+                    var error = "";
+                    foreach (var item in idlist)
+                    {
+                        var check = posCoupons.Any(m => m.Id == int.Parse(item) && m.LeaderUserId == user.Id);
+                        if (!check)
+                        {
+                            error += "ID为" + item + "的机具券不是盟主" + MakerCode + "的机具券";
+                        }
+                    }
+
+                    if (!string.IsNullOrEmpty(error))
+                    {
+                        return "Warning|" + error;
+                    }
                     DataTable dt = OtherMySqlConn.dtable("UPDATE PosCoupons SET LeaderUserId=0,SeoTitle=" + SysUserName + "_" + SysRealName + " WHERE Id IN (" + Id + ") AND LeaderUserId=" + user.Id + "");
                     db.SaveChanges();
                 }

Areas/Admin/Controllers/OperateServer/StoreHouseOperateController.cs

@@ -52,7 +52,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// 仓库列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(StoreHouse data, string CreateDateData, string OpCode, string YZOpCode,int ShowFlag = 0, int page = 1, int limit = 30)
+        public JsonResult IndexData(StoreHouse data, string CreateDateData, string OpCode, string MakerCode, int ShowFlag = 0, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
@@ -76,7 +76,16 @@ namespace MySystem.Areas.Admin.Controllers
             //所属运营中心编号
             if (!string.IsNullOrEmpty(OpCode))
             {
-                var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.OpCode == YZOpCode) ?? new OpModels.SysAdmin();
+                var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.OpCode == OpCode) ?? new OpModels.SysAdmin();
+                if (sysAdmin.Id > 0)
+                {
+                    condition += " and Sort=" + sysAdmin.Id;
+                }
+            }
+            //创客编号
+            if (!string.IsNullOrEmpty(MakerCode))
+            {
+                var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.MakerCode == MakerCode) ?? new OpModels.SysAdmin();
                 if (sysAdmin.Id > 0)
                 {
                     condition += " and Sort=" + sysAdmin.Id;
@@ -92,6 +101,7 @@ namespace MySystem.Areas.Admin.Controllers
                 Users userid_Users = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new Users();
                 dic["UserIdMakerCode"] = userid_Users.MakerCode;
                 dic["UserIdRealName"] = userid_Users.RealName;
+                dic["MakerMobiles"] = userid_Users.Mobile;
 
                 int OpId = int.Parse(function.CheckInt(dic["Sort"].ToString()));
                 var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == OpId) ?? new OpModels.SysAdmin();

Areas/Admin/Controllers/OperateServer/SysAdminOperateController.cs

@@ -100,7 +100,7 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["MakerName"] = sysAdmin.MakerName;
 
                 //实缴额度
-                UserAccount userAccount = opdb.UserAccount.FirstOrDefault(m => m.UserId == Id) ?? new UserAccount();
+                UserAccount userAccount = opdb.UserAccount.FirstOrDefault(m => m.Sort == Id) ?? new UserAccount();
                 dic["TotalAmt"] = userAccount.TotalAmt;
 
                 //当前额度
@@ -167,6 +167,7 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         return "该用户已存在运营中心，请重新输入";
                     }
+                    Fields.Add("CreateMan", SysUserName + "_" + SysRealName); //创建人
                     Fields.Add("RealName", data.RealName); //运营中心名称
                     Fields.Add("MakerCode", data.MakerCode); //创客编号
                     Fields.Add("MakerMobile", data.MakerMobile); //手机号
@@ -203,7 +204,8 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         Field.Add("TotalAmt", userAccount.TotalAmt); //初始额度
                         Field.Add("ValidAmount", userAccount.TotalAmt); //可用额度
-                        Field.Add("UserId", Id); //运营中心Id
+                        Field.Add("Sort", Id); //运营中心Id
+                        Field.Add("UserId", edit.UserId); //创客Id
                         int Ids = new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Add("UserAccount", Field, 0);
                         AddSysLog(userAccount.Id.ToString(), "UserAccount", "add");
                         var query = opdb.SysAdminRole.Add(new SysAdminRole()
@@ -212,7 +214,7 @@ namespace MySystem.Areas.Admin.Controllers
                             Sort = edit.Id,//所属运营中心
                             CreateMan = SysUserName + "_" + SysRealName,
                             Details = "运营中心管理员，可以操作运营中心所有权限",
-                            RightInfo = ",1_1,1_1_1,1_1_1_edit,1_2,1_2_1,1_2_1_export,1_3,1_3_1,1_3_1_base,1_4,1_4_1,1_4_1_add,1_4_2,1_4_2_add,1_6,1_6_1,1_6_1_add,1_6_1_delete,1_6_1_edit,1_6_2,1_6_2_add,1_6_2_delete,1_6_2_edit,",
+                            RightInfo = ",1_1,1_1_1,1_1_1_edit,1_2,1_2_1,1_2_1_export,1_3,1_3_1,1_3_1_import,1_4,1_4_1,1_4_1_add,1_4_2,1_4_2_add,1_6,1_6_1,1_6_1_add,1_6_1_delete,1_6_1_edit,1_6_2,1_6_2_add,1_6_2_delete,1_6_2_edit,",
                             Name = "运营中心管理员",
 
                         }).Entity;
@@ -274,7 +276,7 @@ namespace MySystem.Areas.Admin.Controllers
 
 
             SysAdmin editData = opdb.SysAdmin.FirstOrDefault(m => m.Id == Id) ?? new SysAdmin();
-            UserAccount editDatas = opdb.UserAccount.FirstOrDefault(m => m.UserId == Id) ?? new UserAccount();
+            UserAccount editDatas = opdb.UserAccount.FirstOrDefault(m => m.Sort == Id) ?? new UserAccount();
             ViewBag.data = editData;
             ViewBag.datas = editDatas;
             return View();
@@ -301,16 +303,12 @@ namespace MySystem.Areas.Admin.Controllers
                 var userInfo = db.Users.FirstOrDefault(m => m.Id == userForMakerCode.UserId && m.Mobile == data.MakerMobile) ?? new Models.Users();
                 if (userInfo.Id > 0)
                 {
-                    var check = opdb.SysAdmin.Any(m => m.AdminName == data.AdminName);
                     var checks = opdb.SysAdmin.Any(m => m.UserId == userInfo.Id);
-                    if (check)
-                    {
-                        return "该用户名已存在，请重新输入";
-                    }
                     if (checks)
                     {
                         return "该用户已存在运营中心，请重新输入";
                     }
+                    Fields.Add("UpdateMan", SysUserName + "_" + SysRealName); //修改人
                     Fields.Add("RealName", data.RealName); //运营中心名称
                     Fields.Add("MakerCode", data.MakerCode); //创客编号
                     Fields.Add("MakerMobile", data.MakerMobile); //手机号
@@ -328,8 +326,8 @@ namespace MySystem.Areas.Admin.Controllers
                     Fields.Add("FilePath", data.FilePath); //附件
                     Field.Add("TotalAmt", userAccount.TotalAmt); //初始额度
                     Field.Add("ValidAmount", userAccount.TotalAmt); //可用额度
-                    Field.Add("UserId", data.Id); //运营中心Id
-
+                    Field.Add("Sort", data.Id); //运营中心Id
+                    Field.Add("UserId", userInfo.Id); //创客Id
                     var suser = opdb.SysAdmin.FirstOrDefault(m => m.Id == data.Id);
                     var user = db.Users.FirstOrDefault(m => m.Id == suser.UserId) ?? new Models.Users();
                     if (user.Id > 0)
@@ -357,8 +355,9 @@ namespace MySystem.Areas.Admin.Controllers
                     AddSysLog(data.Id.ToString(), "SysAdmin", "update");
                     opdb.SaveChanges();
                     new AdminContentOther(_accessor.HttpContext, PublicFunction.OpTables).Edit("UserAccount", Field, userAccount.Id);
-                    UserAccount edits = opdb.UserAccount.FirstOrDefault(m => m.UserId == data.Id);
+                    UserAccount edits = opdb.UserAccount.FirstOrDefault(m => m.Sort == data.Id);
                     edits.CreateDate = edits.CreateDate;
+                    edits.UserId = userInfo.Id;
                     AddSysLog(userAccount.Id.ToString(), "UserAccount", "update");
                     opdb.SaveChanges();
 
@@ -401,7 +400,7 @@ namespace MySystem.Areas.Admin.Controllers
                         db.SaveChanges();
                     }
                 }
-                var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.UserId == id) ?? new OpModels.SysAdmin();
+                var sysAdmin = opdb.SysAdmin.FirstOrDefault(m => m.Id == id) ?? new OpModels.SysAdmin();
                 if (sysAdmin.Id > 0)
                 {
                     sysAdmin.Status = -1;

Areas/Admin/Views/OperateServer/StoreHouseOperate/Index.cshtml

@@ -57,6 +57,12 @@
                             <input class="layui-input" type="text" name="OpCode" placeholder="" autocomplete="off">
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">创客编号</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="MakerCode" placeholder="" autocomplete="off">
+                        </div>
+                    </div>
                     <div class="layui-inline">
                         <label class="layui-form-label">创建时间</label>
                         <div class="layui-input-inline">
@@ -92,11 +98,11 @@
                         <button class="layui-btn" data-type="ExportExcel"><i
                             class="layui-icon layui-icon-export layuiadmin-button-btn"></i>导出</button>
                     }
-                    @if (RightInfo.Contains("," + right + "_import1,") || RightInfo.Contains("," + right + "_import,"))
+                    @* @if (RightInfo.Contains("," + right + "_import1,") || RightInfo.Contains("," + right + "_import,"))
                     {
                         <button class="layui-btn" data-type="ImportMachine"><i
                             class="layui-icon layui-icon-upload layuiadmin-button-btn"></i>机具入库</button>
-                    }
+                    } *@
                     @* @if (RightInfo.Contains("," + right + "_import2,") || RightInfo.Contains("," + right + "_import,"))
                     {
                         <button class="layui-btn" data-type="ImportChange"><i
@@ -130,27 +136,8 @@
                             class="layui-icon layui-icon-edit layuiadmin-button-btn"></i>取消关联</button>
                     } *@
                 </div>
-
-                <script type="text/html" id="ManageTpl">
-                    <a lay-href="/Admin/Users/Index?right=@right&MakerCode={{d.ManageUserIdMakerCode}}" style="color: #428bca;">{{d.ManageUserIdMakerCode}}</a>
-                </script>
-                <script type="text/html" id="MakerCodeTpl">
-                    <a lay-href="/Admin/Users/Index?right=@right&MakerCode={{d.UserIdMakerCode}}" style="color: #428bca;">{{d.UserIdMakerCode}}</a>
-                </script>
                 <table id="LAY-list-manage" lay-filter="LAY-list-manage"></table>
                 <script type="text/html" id="table-list-tools">
-                    @* @if (RightInfo.Contains("," + right + "_edit,"))
-                    {
-                                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit"><i class="layui-icon layui-icon-edit"></i>修改</a>
-                    }
-                    @if (RightInfo.Contains("," + right + "_edits,"))
-                    {
-                                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edits"><i class="layui-icon layui-icon-add"></i>一键新建仓库</a>
-                    }
-                    @if (RightInfo.Contains("," + right + "_sycn,"))
-                    {
-                                    <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="sycn"><i class="layui-icon layui-icon-edit"></i>同步库存</a>
-                    } *@
                 </script>
             </div>
         </div>

wwwroot/layuiadmin/modules_main/PosCoupons_Admin.js

@@ -119,7 +119,7 @@ layui.config({
         , cols: [[
             { type: 'checkbox', fixed: 'left' }
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
-            , { field: 'UserIdMakerCode', width: 200, title: '创客创客编号', sort: true }
+            , { field: 'UserIdMakerCode', width: 200, title: '创客编号', sort: true }
             , { field: 'UserIdRealName', width: 200, title: '创客真实姓名', sort: true }
             , { field: 'LeaderUserIdMakerCode', width: 200, title: '盟主编号', sort: true }
             , { field: 'LeaderUserIdRealName', width: 200, title: '盟主真实姓名', sort: true }

wwwroot/layuiadmin/modules_operate/StoreHouse_Admin.js

@@ -179,7 +179,7 @@ layui.config({
                 title: '仓库所属人姓名',
                 sort: true,
             }, {
-                field: 'MakerMobile',
+                field: 'MakerMobiles',
                 width: 150,
                 title: '仓库所属人手机号',
                 sort: true,
@@ -228,7 +228,7 @@ layui.config({
                 width: 150,
                 title: '创建时间',
                 sort: true
-            },, {
+            }, {
                 field: 'Deposit',
                 width: 110,
                 title: '押金',