提交代码

Property.WebApi/Controllers/Mall/WarehouseOutController.cs

@@ -134,21 +134,6 @@ namespace Property.WebApi.Controllers.Mall
         /// <returns></returns>
         [HttpPost]
         public ApiResult UpdateOutGoods()
-        {
-            var parms = GetRequestParm();
-            UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(parms.uid);
-            RB_WarehouseOut_Apply_Extend demodel = JsonConvert.DeserializeObject<RB_WarehouseOut_Apply_Extend>(parms.msg.ToString());
-            var list = warehouseOutModule.GetOuGoodsByWarehouseId(demodel);
-            return ApiResult.Success("", list);
-        }
-
-
-        /// <summary>
-        /// 根据仓库id和申请id获取申请单中的商品
-        /// </summary>
-        /// <returns></returns>
-        [HttpPost]
-        public ApiResult GetOuGoodsByWarehouseId()
         {
             var parms = GetRequestParm();
             UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(parms.uid);
@@ -187,6 +172,25 @@ namespace Property.WebApi.Controllers.Mall
 
 
 
+        /// <summary>
+        /// 根据仓库id和申请id获取申请单中的商品
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetOuGoodsByWarehouseId()
+        {
+            var parms = GetRequestParm();
+            UserInfo userInfo = CacheManager.User.UserReidsCache.GetUserLoginInfo(parms.uid);
+            RB_WarehouseOut_Apply_Extend demodel = JsonConvert.DeserializeObject<RB_WarehouseOut_Apply_Extend>(parms.msg.ToString());
+            demodel.RB_Group_Id = userInfo.RB_Group_id;
+            demodel.RB_Branch_Id = -1;
+            var list = warehouseOutModule.GetOuGoodsByWarehouseId(demodel);
+            return ApiResult.Success("", list);
+        }
+
+
+
+
         /// <summary>
         /// 保存出库单
         /// </summary>