提交代码

Property.Model/Extend/Supplies/RB_Supplies_ReportLossRecordDetail_Extend.cs

@@ -25,5 +25,22 @@ namespace Property.Model.Extend.Supplies
         /// 商品规格名称
         /// </summary>
         public string SpecificationName { get; set; }
+
+        /// <summary>
+        /// 当前库存的数量
+        /// </summary>        
+        public int? InventoryNum
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 实际数量
+        /// </summary>        
+        public int? RealityNum
+        {
+            get;
+            set;
+        }
     }
 }

Property.Modele.FixedAssets/SuppliesModule.cs

@@ -2253,7 +2253,8 @@ namespace Property.Module.FixedAssets
         public RB_Supplies_Check_Extend GetSuppliesCheck(int Id)
         {
             var model = supplies_CheckRepository.GetEntity<RB_Supplies_Check_Extend>(Id);
-            if (model != null) {
+            if (model != null)
+            {
                 model.WarehouseName = supplies_WareHouseRepository.GetEntity(model.WarehouseId ?? 0)?.Name ?? "";
             }
             return model;
@@ -2644,11 +2645,32 @@ namespace Property.Module.FixedAssets
 
 
         /// <summary>
-        /// 保存商品盘点记录
+        /// 盘点报损列表
         /// </summary>
-        /// <param name="demodel"></param>
+        /// <param name="query">查询条件</param>
         /// <returns></returns>
-        public bool SetReportLossRecord(RB_Supplies_ReportLossRecord_Extend applyModel, RB_Supplies_StockOut_Extend demodel, RB_Supplies_StockIn_Extend inDemodel, int RB_Department_Id)
+        public List<RB_Supplies_ReportLossRecord_Extend> GetReportLossRecordList(RB_Supplies_ReportLossRecord_Extend query)
+        {
+            return suppliesReportLossRecordRepository.GetReportLossRecordList(query);
+        }
+
+        /// <summary>
+        /// 盘点报损列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Supplies_ReportLossRecordDetail_Extend> GetReportLossRecordDetail(RB_Supplies_ReportLossRecordDetail_Extend query)
+        {
+            return suppliesReportLossRecordDetailRepository.GetReportLossRecordDetail(query);
+        }
+
+
+            /// <summary>
+            /// 保存商品盘点记录
+            /// </summary>
+            /// <param name="demodel"></param>
+            /// <returns></returns>
+            public bool SetReportLossRecord(RB_Supplies_ReportLossRecord_Extend applyModel, RB_Supplies_StockOut_Extend demodel, RB_Supplies_StockIn_Extend inDemodel, int RB_Department_Id)
         {
             var trans = suppliesReportLossRecordRepository.DbTransaction;
             try
@@ -2662,7 +2684,7 @@ namespace Property.Module.FixedAssets
                     {
                         CostTypeId = applyModel.CheckStatus == PropertyCheckStatusEnum.InventoryLosses ? 225 : 226,
                         Number = x.ReportLossNum,
-                        OriginalMoney = (x.ReportLossPrice ?? 0) ,
+                        OriginalMoney = (x.ReportLossPrice ?? 0),
                         UnitPrice = Math.Round((x.ReportLossPrice ?? 0) / (x.ReportLossNum ?? 1), 2, MidpointRounding.AwayFromZero),
                         Remark = x.GoodsName + x.SpecificationName
                     });
@@ -2737,7 +2759,7 @@ namespace Property.Module.FixedAssets
                         applyModel.DetailList.ForEach(x => x.CreateDate = applyModel.CreateDate);
                         applyModel.DetailList.ForEach(x => x.RB_Branch_Id = applyModel.RB_Branch_Id);
                         applyModel.DetailList.ForEach(x => x.RB_Group_Id = applyModel.RB_Group_Id);
-                        
+
                         //更新已出库的商品信息
                         foreach (var item in applyModel.DetailList)//更新盘点商品的盘点状态
                         {

Property.Repository/Supplies/RB_Supplies_ReportLossRecordDetailRepository.cs

@@ -48,7 +48,7 @@ namespace Property.Repository.Supplies
         /// </summary>
         /// <param name="query">查询条件</param>
         /// <returns></returns>
-        public List<RB_Supplies_ReportLossRecordDetail_Extend> GetWarehouseOutList(RB_Supplies_ReportLossRecordDetail_Extend query)
+        public List<RB_Supplies_ReportLossRecordDetail_Extend> GetReportLossRecordDetailList(RB_Supplies_ReportLossRecordDetail_Extend query)
         {
             StringBuilder builder = new StringBuilder();
             builder.Append($" select * from {TableName} as a where a.Status=0 ");
@@ -71,5 +71,34 @@ namespace Property.Repository.Supplies
             return Get<RB_Supplies_ReportLossRecordDetail_Extend>(builder.ToString()).ToList();
         }
 
+
+        /// <summary>
+        /// 盘点报损列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Supplies_ReportLossRecordDetail_Extend> GetReportLossRecordDetail(RB_Supplies_ReportLossRecordDetail_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($@"  select a.*,b.InventoryNum,b.RealityNum,c.`Name` as GoodsName,c.SpecificationName from {TableName} as a LEFT JOIN rb_supplies_checkdetail as b on a.CheckDetailId=b.Id
+LEFT JOIN rb_supplies_material as c on a.SuppliesId = c.Id where a.Status=0 ");
+            if (query != null)
+            {
+                if (query.Id > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Supplies_ReportLossRecordDetail_Extend.Id)}={query.Id}");
+                }
+
+                if (query.SuppliesId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Supplies_ReportLossRecordDetail_Extend.SuppliesId)}={query.SuppliesId}");
+                }
+                if (query.ReportLossRecordId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Supplies_ReportLossRecordDetail_Extend.ReportLossRecordId)}={query.ReportLossRecordId}");
+                }
+            }
+            return Get<RB_Supplies_ReportLossRecordDetail_Extend>(builder.ToString()).ToList();
+        }
     }
 }

Property.Repository/Supplies/RB_Supplies_ReportLossRecordRepository.cs

@@ -52,7 +52,7 @@ namespace Property.Repository.Supplies
         /// </summary>
         /// <param name="query">查询条件</param>
         /// <returns></returns>
-        public List<RB_Supplies_ReportLossRecord_Extend> GetWarehouseOutList(RB_Supplies_ReportLossRecord_Extend query)
+        public List<RB_Supplies_ReportLossRecord_Extend> GetReportLossRecordList(RB_Supplies_ReportLossRecord_Extend query)
         {
             StringBuilder builder = new StringBuilder();
             builder.Append($" select * from {TableName} as a where a.Status=0 ");

Property.WebApi/Controllers/Mall/WarehouseController.cs

@@ -151,5 +151,46 @@ namespace Property.WebApi.Controllers.Mall
 
 
 
+        /// <summary>
+        /// 根据报损记录id获取报损记录信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetSuppliesReportLoss(object requestMsg)
+        {
+            var requestParm = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            JObject parms = JObject.Parse(requestParm.msg.ToString());
+            int LossId = parms.GetInt("LossId", 0);
+            int RB_Group_id = parms.GetInt("RB_Group_id", 0);
+            if (LossId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递参数");
+            }
+
+            var model = suppliesModule.GetReportLossRecordList(new Model.Extend.Supplies.RB_Supplies_ReportLossRecord_Extend { Id = LossId, RB_Group_Id = RB_Group_id }).FirstOrDefault();
+            if (model == null)
+            {
+                return ApiResult.ParamIsNull("信息不存在");
+            }
+            model.DetailList = new List<Model.Extend.Supplies.RB_Supplies_ReportLossRecordDetail_Extend>();
+            model.DetailList = suppliesModule.GetReportLossRecordDetail(new Model.Extend.Supplies.RB_Supplies_ReportLossRecordDetail_Extend { ReportLossRecordId = LossId });
+            return ApiResult.Success("", new
+            {
+                model.Id,
+                model.OutOrInId,
+                DetailList = model.DetailList.Select(y => new
+                {
+                    y.Id,
+                    y.GoodsName,
+                    y.SpecificationName,
+                    y.InventoryNum,
+                    y.RealityNum,
+                    y.ReportLossNum,
+                    y.ReportLossPrice
+                }),
+                model.FinanceId
+            });
+        }
+
     }
 }
\ No newline at end of file