新建分仓和一键分仓，若关联过运营中心直接添加相关标识

修复机具换绑和坏机换新，新机不能为预发机

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -308,6 +308,14 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         return "您输入的仓库归属创客编号不存在，请重新输入正确的仓库归属创客编号";
                     }
+                    var check = db.StoreHouse.Any(m => m.Status > 0 && m.Sort == 0 && m.OpId > 0 && m.UserId == user.UserId);
+                    var OpId = 0;
+                    if (check)
+                    {
+                        var store = db.StoreHouse.FirstOrDefault(m => m.Status > 0 && m.Sort == 0 && m.OpId > 0 && m.UserId == user.UserId);
+                        OpId = store.OpId;
+                        Fields.Add("OpId", OpId); //关联运营中心
+                    }
                     Fields.Add("UserId", user.UserId); //仓库归属人
                     Fields.Add("Areas", data.Areas); //所属地区
                     Fields.Add("Address", data.Address); //仓库地址
@@ -589,6 +597,14 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 return "您输入的仓库归属创客编号不存在，请重新输入正确的仓库归属创客编号";
             }
+            var check = db.StoreHouse.Any(m => m.Status > 0 && m.Sort == 0 && m.OpId > 0 && m.UserId == user.UserId);
+            var OpId = 0;
+            if (check)
+            {
+                var store = db.StoreHouse.FirstOrDefault(m => m.Status > 0 && m.Sort == 0 && m.OpId > 0 && m.UserId == storeHouse.UserId);
+                OpId = store.OpId;
+                Fields.Add("OpId", OpId); //关联运营中心
+            }
             Fields.Add("UserId", user.UserId); //仓库归属人
             Fields.Add("Areas", data.Areas); //所属地区
             Fields.Add("Address", data.Address); //仓库地址

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1475,10 +1475,10 @@ namespace MySystem.Areas.Admin.Controllers
                 // {
                 //     return "原机具未绑定";
                 // }
-                PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId);
+                PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.PreUserId == 0);//添加新机是否为预发机判断
                 if (newpos == null)
                 {
-                    return "新机具SN不正确";
+                    return "新机具SN不正确或不满足条件";
                 }
                 oldPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == oldpos.BrandId) ?? new KqProducts();
                 newPosBrand = db.KqProducts.FirstOrDefault(m => m.Id == newpos.BrandId) ?? new KqProducts();
@@ -1651,10 +1651,10 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         return "您输入的坏机SN不存在或者不在" + MakerCode + "名下";
                     }
-                    PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0) ?? new PosMachinesTwo();
+                    PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0 && m.PreUserId == 0) ?? new PosMachinesTwo();
                     if (newpos.Id == 0)
                     {
-                        return "您输入的新机SN不存在";
+                        return "您输入的新机SN不存在或不满足条件";
                     }
                     StoreHouse storeFrom = db.StoreHouse.FirstOrDefault(m => m.Id == storeForCodeFrom.StoreId);
                     if (Convert.ToInt32(storeFrom.BrandId) != Convert.ToInt32(newpos.BrandId))
@@ -1859,10 +1859,10 @@ namespace MySystem.Areas.Admin.Controllers
                     {
                         return "您输入的坏机SN不存在或者不在仓库" + StoreCode + "中";
                     }
-                    PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0) ?? new PosMachinesTwo();
+                    PosMachinesTwo newpos = db.PosMachinesTwo.FirstOrDefault(m => m.Id == newForSnNo.SnId && m.BindingState == 0 && m.PreUserId == 0) ?? new PosMachinesTwo();
                     if (newpos.Id == 0)
                     {
-                        return "您输入的新机SN不存在";
+                        return "您输入的新机SN不存在或不满足条件";
                     }
                     StoreHouse storeFrom = db.StoreHouse.FirstOrDefault(m => m.Id == storeForCodeFrom.StoreId);
                     if (Convert.ToInt32(storeFrom.BrandId) != Convert.ToInt32(oldpos.BrandId))

Areas/Admin/Views/MainServer/StoreHouse/Edits.cshtml

@@ -169,7 +169,7 @@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">*押金</label>
                                 <div class="layui-input-inline">
-                                    <input class="layui-input" type="text" id="Deposit" name="Deposit" value=""
+                                    <input class="layui-input" type="text" id="Deposit" name="Deposit" value="@editData.Deposit"
                                         maxlength="32" lay-verify="required|" autocomplete="off" placeholder="请输入押金">
                                 </div>
                             </div>
@@ -177,7 +177,7 @@
                                 <label class="layui-form-label">附件</label>
                                 <div class="layui-input-block">
                                     <div class="layui-upload">
-                                        <input type="hidden" id="FilePath" name="FilePath" value=""
+                                        <input type="hidden" id="FilePath" name="FilePath" value="@editData.FilePath"
                                             lay-verify="required|">
                                         <button class="layui-btn" type="button" id="FilePathBtn">选择文件</button>
                                         <div class="layui-inline layui-word-aux">