物料返回 商品信息

Property.Model/Entity/Supplies/RB_Supplies_Material.cs

@@ -181,5 +181,26 @@ namespace Property.Model.Entity
             get;
             set;
         }
+
+        /// <summary>
+        /// 商品id
+        /// </summary>
+        public int? GoodsId { get; set; }
+        /// <summary>
+        /// 规格名称
+        /// </summary>
+        public string SpecificationName { get; set; }
+        /// <summary>
+        /// 规格Key
+        /// </summary>
+        public string SpecificationKey { get; set; }
+        /// <summary>
+        /// 商品分类ids
+        /// </summary>
+        public string GoodsCategoryIds { get; set; }
+        /// <summary>
+        /// 商品分类名称
+        /// </summary>
+        public string GoodsCategoryName { get; set; }
     }
 }
\ No newline at end of file

Property.Model/Extend/Supplies/RB_Supplies_Material_Extend.cs

@@ -39,5 +39,13 @@ namespace Property.Model.Extend
         /// 档案ids
         /// </summary>
         public string SuppliesIdStr { get; set; }
+        /// <summary>
+        /// 商品规格
+        /// </summary>
+        public List<string> GoodsSpecificationList { get; set; }
+        /// <summary>
+        /// 商品分类
+        /// </summary>
+        public List<string> GoodsCategoryList { get; set; }
     }
 }
\ No newline at end of file

Property.Modele.FixedAssets/SuppliesModule.cs

@@ -120,6 +120,16 @@ namespace Property.Module.FixedAssets
                     item.ImageList.Add(Config.GetFileUrl(img));
                 }
                 item.InventoryNum = iList.Where(x => x.SuppliesId == item.Id).FirstOrDefault()?.Number ?? 0;
+                item.GoodsSpecificationList = new List<string>();
+                item.GoodsCategoryList = new List<string>();
+                if (!string.IsNullOrEmpty(item.SpecificationName))
+                {
+                    item.GoodsSpecificationList = JsonConvert.DeserializeObject<List<string>>(item.SpecificationName);
+                }
+                if (!string.IsNullOrEmpty(item.GoodsCategoryName))
+                {
+                    item.GoodsCategoryList = JsonConvert.DeserializeObject<List<string>>(item.GoodsCategoryName);
+                }
             }
             return list;
         }

Property.WebApi/Controllers/Property/SuppliesController.cs

@@ -50,6 +50,8 @@ namespace Property.WebApi.Controllers.User
                 x.SuppliesModel,
                 x.SuppliesNum,
                 x.InventoryNum,
+                x.GoodsSpecificationList,
+                x.GoodsCategoryList,
                 UpdateBy = CacheManager.User.UserReidsCache.GetEmployee(x.UpdateBy)?.EmName ?? "",
                 UpdateDate = x.UpdateDate.Value.ToString("yyyy-MM-dd")
             });