提交代码

Property.Module.Mall/WarehouseOutModule.cs

@@ -224,6 +224,45 @@ namespace Property.Module.Mall
 
 
 
+        /// <summary>
+        /// 更新出库商品数量
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool UpdateWarehouseOutGoods(List<RB_WarehouseOut_Goods_Extend> list)
+        {
+            var trans = warehouseOutRepository.DbTransaction;
+            try
+            {
+
+                foreach (var item in list)
+                {
+                    if (item.ID > 0)
+                    {
+                        Dictionary<string, object> files = new Dictionary<string, object>() {
+                        {
+                                nameof(RB_WarehouseOut_Goods.Number),item.Number}
+                        };
+                        List<WhereHelper> wheres = new List<WhereHelper>() {
+                        new WhereHelper(){
+                             FiledName=nameof(RB_WarehouseOut_Goods.ID),
+                              FiledValue=item.ID,
+                               OperatorEnum=OperatorEnum.Equal
+                        }
+                        };
+                        warehouseOutApplyRepository.Update(files, wheres);
+                    }
+                }
+                warehouseOutRepository.DBSession.Commit();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                warehouseOutRepository.DBSession.Rollback("WarehouseOut.UpdateWarehouseOutApply");
+                LogHelper.Write(ex, "WarehouseOut.UpdateWarehouseOutApply");
+                return false;
+            }
+        }
 
 
         /// <summary>
@@ -231,7 +270,7 @@ namespace Property.Module.Mall
         /// </summary>
         /// <param name="demodel"></param>
         /// <returns></returns>
-        public bool SetStockOutInfo(RB_WarehouseOut_Apply_Extend applyModel, RB_Supplies_StockOut_Extend demodel, List<RB_WarehouseOut_Goods_Extend> financeList, RB_Finance_Record_Extend record,int RB_Department_Id)
+        public bool SetStockOutInfo(RB_WarehouseOut_Apply_Extend applyModel, RB_Supplies_StockOut_Extend demodel, List<RB_WarehouseOut_Goods_Extend> financeList, RB_Finance_Record_Extend record, int RB_Department_Id)
         {
             var trans = supplies_StockOutRepository.DbTransaction;
             try

Property.WebApi/Controllers/Mall/WarehouseOutController.cs

@@ -128,6 +128,21 @@ namespace Property.WebApi.Controllers.Mall
         #region 申请单出库
 
 
+        /// <summary>
+        /// 修改出库商品信息
+        /// </summary>
+        /// <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>
@@ -138,9 +153,34 @@ namespace Property.WebApi.Controllers.Mall
             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);
+            //判断出库申请的状态
+
+            var oldModel = warehouseOutModule.GetApplyEntity(demodel.ID).RefMapperTo<RB_WarehouseOut_Apply_Extend>();
+            if (oldModel != null)
+            {
+                oldModel.WarehouseOutGoodsList = new List<RB_WarehouseOut_Goods_Extend>();
+                oldModel.WarehouseOutGoodsList = warehouseOutModule.GetWarehouseOutList(new RB_WarehouseOut_Goods_Extend { ApplyId = demodel.ID });
+            }
+            if (oldModel.ApplyStatus != 1)
+            {
+                return ApiResult.Failed("审核通过/拒绝的申请单不能修改出库商品数量");
+            }
+
+            foreach (var item in demodel.WarehouseOutGoodsList)//判断商品是否属于当前出库单
+            {
+                if (oldModel.WarehouseOutGoodsList.Any(x => x.ID == item.ID))
+                {
+                    if (item.Number <= 0)
+                    {
+                        return ApiResult.Failed("出库商品数量必须大于0");
+                    }
+                }
+                else
+                {
+                    return ApiResult.Failed("商品名称：" + item.GoodsName + "订单号：" + item.OrderNo + "不属于当前申请单");
+                }
+            }
+            var list = warehouseOutModule.UpdateWarehouseOutGoods(demodel.WarehouseOutGoodsList);
             return ApiResult.Success("", list);
         }
 
@@ -346,7 +386,7 @@ namespace Property.WebApi.Controllers.Mall
             }
             if (!demodel.StockOutDate.HasValue)
             {
-                return ApiResult.ParamIsNull("请输入入库日期");
+                return ApiResult.ParamIsNull("请输入出库日期");
             }
             if (demodel.EmployeeId <= 0)
             {
@@ -360,7 +400,7 @@ namespace Property.WebApi.Controllers.Mall
                 }
                 if (item.Number <= 0)
                 {
-                    return ApiResult.ParamIsNull("请输入入库数量");
+                    return ApiResult.ParamIsNull("请输入出库数量");
                 }
             }
             if (demodel.DetailList.Any())