合并

Areas/Admin/Controllers/MainServer/StoreHouseController.cs

@@ -131,7 +131,10 @@ 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();
             }
             return Json(obj);
         }

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1383,6 +1383,7 @@ namespace MySystem.Areas.Admin.Controllers
                 newpos.ActivationState = oldpos.ActivationState;
                 newpos.BindingTime = oldpos.BindingTime;
                 newpos.ActivationTime = oldpos.ActivationTime;
+                newpos.IsFirst = oldpos.IsFirst;
                 // bool checkActReward = db.ActiveReward.Any(m => m.KqMerNo == merchant.KqMerNo);
                 // if (!checkActReward)
                 // {

Areas/Admin/Views/MainServer/UserCashRecord/Index.cshtml

@@ -81,8 +81,6 @@
                                 <option value="">全部...</option>
                                 <option value="1">消费代付</option>
                                 <option value="2">用户提现</option>
-                                <option value="3">盟主提现</option>
-                                <option value="4">助利宝提现</option>
                             </select>
                         </div>
                     </div>

wwwroot/layuiadmin/modules_main/StoreHouse_Admin.js

@@ -202,6 +202,11 @@ layui.config({
                 width: 120,
                 title: '剩余库存数',
                 sort: true
+            }, {
+                field: 'PreNum',
+                width: 120,
+                title: '小分仓数',
+                sort: true
             }, {
                 field: 'OutNum',
                 width: 100,