提交

BPA.SAAS.Manage.Application/Device/Dtos/DeviceVesion/DeviceVesionBaseDto.cs

@@ -11,6 +11,15 @@ namespace BPA.SAAS.Manage.Application.Device.Dtos.DeviceVesion
         public string Id { get; set; }
         public string Vesion { get; set; }
         public string ProductId { get; set; }
+        /// <summary>
+        /// 仓位数量
+        /// </summary>
+        public int ProductNumber { get; set; }
+
+        /// <summary>
+        /// 仓位图片
+        /// </summary>
+        public string ProductUrl { get; set; }
 
         /// <summary>
         /// 模版路径

BPA.SAAS.Manage.Application/Device/Dtos/DeviceVesion/DeviceVesionModel.cs

@@ -23,6 +23,17 @@ namespace BPA.SAAS.Manage.Application.Device.Dtos.DeviceVesion
         /// 产品标签
         /// </summary>
         public string ProductCode { get; set; }
+
+        /// <summary>
+        /// 仓位数量
+        /// </summary>
+        public int ProductNumber { get; set; }
+
+        /// <summary>
+        /// 仓位图片
+        /// </summary>
+        public string ProductUrl { get; set; }
+
         /// <summary>
         /// 模版路径
         /// </summary>

BPA.SAAS.Manage.Application/Device/Dtos/DeviceVesion/DeviceVesionQueryInputDto.cs

@@ -10,6 +10,8 @@ namespace BPA.SAAS.Manage.Application.Device.Dtos.DeviceVesion
     public class DeviceVesionQueryInputDto : PageInputBase
     {
         public string ProductName { get; set; }
+
+
         public string Vesion { get; set; }
     }
 }

BPA.SAAS.Manage.Application/Device/Services/DeviceVesionService.cs

@@ -38,6 +38,8 @@ namespace BPA.SAAS.Manage.Application.Device.Services
                     Id=a.Id.SelectAll(),
                     ProductName=b.Name,
                     ProductCode=b.Code,
+                    ProductNumber=a.ProductNumber,
+                    ProductUrl=a.ProductUrl,
                 })
                 .ToPageListAsync(inputDto.Current, inputDto.PageSize, total);
 
@@ -64,6 +66,8 @@ namespace BPA.SAAS.Manage.Application.Device.Services
                     Vesion = inputDto.Vesion,
                     ProductId = inputDto.ProductId,
                     TemplatePath = inputDto.TemplatePath,
+                    ProductNumber = inputDto.ProductNumber,
+                    ProductUrl = inputDto.ProductUrl,
                     Status = CommonStatus.ENABLE
                 }).CallEntityMethod(m => m.Create()).ExecuteReturnEntityAsync();
                 var Product = _db.Queryable<BPA_Product>().Where(x => x.Id == inputDto.ProductId).First();
@@ -227,6 +231,8 @@ namespace BPA.SAAS.Manage.Application.Device.Services
             {
                 var res = _db.Updateable<BPA_ProductVesion>().SetColumns(t => t.Vesion == inputDto.Vesion)
                      .SetColumns(t => t.TemplatePath == inputDto.TemplatePath)
+                     .SetColumns(t => t.ProductNumber == inputDto.ProductNumber)
+                     .SetColumns(t => t.ProductUrl == inputDto.ProductUrl)
                      .SetColumns(t => t.ProductId == inputDto.ProductId)
                      .SetColumns(t => t.Status == (CommonStatus)inputDto.Status).Where(t => t.Id == inputDto.Id)
                      .ExecuteCommandHasChange();
@@ -272,7 +278,9 @@ namespace BPA.SAAS.Manage.Application.Device.Services
         /// <returns></returns>
         public async Task<List<BPA_ProductVesion>> GetDeviceVesionList()
         {
-            var resEntity =await _db.Queryable<BPA_ProductVesion>().Select(a => new BPA_ProductVesion() { Id = a.Id.SelectAll() }).ToListAsync();
+            var resEntity =await _db.Queryable<BPA_ProductVesion>()
+                .Select(a => new BPA_ProductVesion() { Id = a.Id.SelectAll() })
+                .ToListAsync();
             return resEntity;
         }
     }

BPA.SAAS.Manage.Core/Product/BPA_ProductVesion.cs

@@ -31,7 +31,7 @@ namespace BPA.SAAS.Manage.Core.Product
         /// <summary>
         /// 仓位图片
         /// </summary>
-        public int ProductUrl { get; set; }
+        public string ProductUrl { get; set; }
 
         /// <summary>
         /// 状态 0启用 1禁用