Commit da973d22 by zhoujinhui

创建盘点计划单新增字段SKU总金额

parent 40aff05b
...@@ -129,6 +129,11 @@ namespace Domain.TakeStock ...@@ -129,6 +129,11 @@ namespace Domain.TakeStock
/// 退货单号 /// 退货单号
/// </summary> /// </summary>
public string ReturnOrderNo { get; set; } public string ReturnOrderNo { get; set; }
/// <summary>
/// sku总金额
/// </summary>
public decimal SkuTotalAmount { get; set; }
} }
/// <summary> /// <summary>
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.1" /> <PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.1" />
<PackageReference Include="EasyNetQ" Version="3.5.2" /> <PackageReference Include="EasyNetQ" Version="3.5.2" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.7.3" /> <PackageReference Include="Hangfire.AspNetCore" Version="1.7.3" />
<PackageReference Include="Hangfire.Dashboard.Authorization" Version="2.1.0" />
<PackageReference Include="Hangfire.Dashboard.Dark" Version="1.0.6" /> <PackageReference Include="Hangfire.Dashboard.Dark" Version="1.0.6" />
<PackageReference Include="Hangfire.MemoryStorage" Version="1.6.3" /> <PackageReference Include="Hangfire.MemoryStorage" Version="1.6.3" />
<PackageReference Include="Hangfire.MySqlStorage" Version="2.0.0" /> <PackageReference Include="Hangfire.MySqlStorage" Version="2.0.0" />
......
...@@ -96,5 +96,10 @@ namespace TakeStock.Application.TakeStock.Dto ...@@ -96,5 +96,10 @@ namespace TakeStock.Application.TakeStock.Dto
public int? InventoryLossType { get; set; } public int? InventoryLossType { get; set; }
public string InventoryLossTypeStr => InventoryLossType.HasValue ? ((InventoryLossType)InventoryLossType).GetEnumDes() : string.Empty; public string InventoryLossTypeStr => InventoryLossType.HasValue ? ((InventoryLossType)InventoryLossType).GetEnumDes() : string.Empty;
/// <summary>
/// 总金额
/// </summary>
public decimal SkuTotalAmount { get; set; }
} }
} }
...@@ -65,5 +65,10 @@ namespace TakeStock.Application.TakeStock.Dto ...@@ -65,5 +65,10 @@ namespace TakeStock.Application.TakeStock.Dto
/// 退货单号 /// 退货单号
/// </summary> /// </summary>
public string ReturnOrderNo { get; set; } public string ReturnOrderNo { get; set; }
/// <summary>
/// sku总金额
/// </summary>
public decimal SkuTotalAmount { get; set; }
} }
} }
...@@ -117,5 +117,10 @@ namespace TakeStock.Application.TakeStock.Dto ...@@ -117,5 +117,10 @@ namespace TakeStock.Application.TakeStock.Dto
/// 退货单号 /// 退货单号
/// </summary> /// </summary>
public string ReturnOrderNo { get; set; } public string ReturnOrderNo { get; set; }
/// <summary>
/// Sku总金额
/// </summary>
public decimal SkuTotalAmount { get; set; }
} }
} }
...@@ -172,6 +172,7 @@ namespace TakeStock.Application.TakeStock ...@@ -172,6 +172,7 @@ namespace TakeStock.Application.TakeStock
{ "TakeStockTypeStr","盘点类型" }, { "TakeStockTypeStr","盘点类型" },
{ "InventoryLossTypeStr","盘亏类型" }, { "InventoryLossTypeStr","盘亏类型" },
{ "CredentialsImgUrl","附件" }, { "CredentialsImgUrl","附件" },
{ "SkuTotalAmount","SKU总金额" },
{ "AuditUserName","审核人" }, { "AuditUserName","审核人" },
{ "AuditDateTime","审核时间" }, { "AuditDateTime","审核时间" },
{ "AuditExplain","审核说明" }, { "AuditExplain","审核说明" },
...@@ -184,7 +185,7 @@ namespace TakeStock.Application.TakeStock ...@@ -184,7 +185,7 @@ namespace TakeStock.Application.TakeStock
var list = dataList.Select(x => new { var list = dataList.Select(x => new {
x.Sku,x.BeforeQuantity,x.AfterQuantity,x.Code,x.StateStr,x.TakeStockTypeStr,x.InventoryLossTypeStr, x.Sku,x.BeforeQuantity,x.AfterQuantity,x.Code,x.StateStr,x.TakeStockTypeStr,x.InventoryLossTypeStr,
x.AuditUserName,x.AuditDateTime,x.AuditExplain,x.WarehouseName,x.SysSerialNumber,x.Description, x.AuditUserName,x.AuditDateTime,x.AuditExplain,x.WarehouseName,x.SysSerialNumber,x.Description,
x.CreatorUserName,x.CreationTime,x.CredentialsImgUrl x.CreatorUserName,x.CreationTime,x.CredentialsImgUrl,x.SkuTotalAmount
}).ToList(); }).ToList();
var ms = EPPlusUtils.ExportStream(list, titles); var ms = EPPlusUtils.ExportStream(list, titles);
return ms; return ms;
...@@ -201,7 +202,7 @@ namespace TakeStock.Application.TakeStock ...@@ -201,7 +202,7 @@ namespace TakeStock.Application.TakeStock
sqlStr.Append(@" sqlStr.Append(@"
SELECT t1.Sku,t1.AfterQuantity,t1.BeforeQuantity,t2.`Code`,t2.AuditUserName, SELECT t1.Sku,t1.AfterQuantity,t1.BeforeQuantity,t2.`Code`,t2.AuditUserName,
t2.AuditDateTime,t2.AuditExplain,t3.`Name` AS WarehouseName,t2.Description,t2.TakeStockType, t2.AuditDateTime,t2.AuditExplain,t3.`Name` AS WarehouseName,t2.Description,t2.TakeStockType,
t2.CreationTime,t2.CredentialsImgUrl,t2.State,t2.CreatorUserName,t2.SysSerialNumber,t2.InventoryLossType t2.CreationTime,t2.CredentialsImgUrl,t2.State,t2.CreatorUserName,t2.SysSerialNumber,t2.InventoryLossType,t2.SkuTotalAmount
FROM stock_takestockorder AS t1 FROM stock_takestockorder AS t1
INNER JOIN stock_takestockschedule AS t2 ON t2.Id = t1.ScheduleId INNER JOIN stock_takestockschedule AS t2 ON t2.Id = t1.ScheduleId
LEFT JOIN warehouse_warehouse AS t3 ON t3.`Code` = t2.WarehouseCode LEFT JOIN warehouse_warehouse AS t3 ON t3.`Code` = t2.WarehouseCode
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment