Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
TakeStock
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
pengjinyang
TakeStock
Commits
da973d22
Commit
da973d22
authored
Sep 07, 2021
by
zhoujinhui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
创建盘点计划单新增字段SKU总金额
parent
40aff05b
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
3 deletions
+23
-3
TakeStockSchedule.cs
Domain/TakeStock/TakeStockSchedule.cs
+5
-0
TakeStock.API.csproj
TakeStock.API/TakeStock.API.csproj
+0
-1
ExportTakeStockOutputDto.cs
...ock.Application/TakeStock/Dto/ExportTakeStockOutputDto.cs
+5
-0
ScheduleInputDto.cs
TakeStock.Application/TakeStock/Dto/ScheduleInputDto.cs
+5
-0
ScheduleOutputDto.cs
TakeStock.Application/TakeStock/Dto/ScheduleOutputDto.cs
+5
-0
TakeStockAppService.cs
TakeStock.Application/TakeStock/TakeStockAppService.cs
+3
-2
No files found.
Domain/TakeStock/TakeStockSchedule.cs
View file @
da973d22
...
...
@@ -129,6 +129,11 @@ namespace Domain.TakeStock
/// 退货单号
/// </summary>
public
string
ReturnOrderNo
{
get
;
set
;
}
/// <summary>
/// sku总金额
/// </summary>
public
decimal
SkuTotalAmount
{
get
;
set
;
}
}
/// <summary>
...
...
TakeStock.API/TakeStock.API.csproj
View file @
da973d22
...
...
@@ -11,7 +11,6 @@
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.1" />
<PackageReference Include="EasyNetQ" Version="3.5.2" />
<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.MemoryStorage" Version="1.6.3" />
<PackageReference Include="Hangfire.MySqlStorage" Version="2.0.0" />
...
...
TakeStock.Application/TakeStock/Dto/ExportTakeStockOutputDto.cs
View file @
da973d22
...
...
@@ -96,5 +96,10 @@ namespace TakeStock.Application.TakeStock.Dto
public
int
?
InventoryLossType
{
get
;
set
;
}
public
string
InventoryLossTypeStr
=>
InventoryLossType
.
HasValue
?
((
InventoryLossType
)
InventoryLossType
).
GetEnumDes
()
:
string
.
Empty
;
/// <summary>
/// 总金额
/// </summary>
public
decimal
SkuTotalAmount
{
get
;
set
;
}
}
}
TakeStock.Application/TakeStock/Dto/ScheduleInputDto.cs
View file @
da973d22
...
...
@@ -65,5 +65,10 @@ namespace TakeStock.Application.TakeStock.Dto
/// 退货单号
/// </summary>
public
string
ReturnOrderNo
{
get
;
set
;
}
/// <summary>
/// sku总金额
/// </summary>
public
decimal
SkuTotalAmount
{
get
;
set
;
}
}
}
TakeStock.Application/TakeStock/Dto/ScheduleOutputDto.cs
View file @
da973d22
...
...
@@ -117,5 +117,10 @@ namespace TakeStock.Application.TakeStock.Dto
/// 退货单号
/// </summary>
public
string
ReturnOrderNo
{
get
;
set
;
}
/// <summary>
/// Sku总金额
/// </summary>
public
decimal
SkuTotalAmount
{
get
;
set
;
}
}
}
TakeStock.Application/TakeStock/TakeStockAppService.cs
View file @
da973d22
...
...
@@ -172,6 +172,7 @@ namespace TakeStock.Application.TakeStock
{
"TakeStockTypeStr"
,
"盘点类型"
},
{
"InventoryLossTypeStr"
,
"盘亏类型"
},
{
"CredentialsImgUrl"
,
"附件"
},
{
"SkuTotalAmount"
,
"SKU总金额"
},
{
"AuditUserName"
,
"审核人"
},
{
"AuditDateTime"
,
"审核时间"
},
{
"AuditExplain"
,
"审核说明"
},
...
...
@@ -184,7 +185,7 @@ namespace TakeStock.Application.TakeStock
var
list
=
dataList
.
Select
(
x
=>
new
{
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
.
CreatorUserName
,
x
.
CreationTime
,
x
.
CredentialsImgUrl
x
.
CreatorUserName
,
x
.
CreationTime
,
x
.
CredentialsImgUrl
,
x
.
SkuTotalAmount
}).
ToList
();
var
ms
=
EPPlusUtils
.
ExportStream
(
list
,
titles
);
return
ms
;
...
...
@@ -201,7 +202,7 @@ namespace TakeStock.Application.TakeStock
sqlStr
.
Append
(
@"
SELECT t1.Sku,t1.AfterQuantity,t1.BeforeQuantity,t2.`Code`,t2.AuditUserName,
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
INNER JOIN stock_takestockschedule AS t2 ON t2.Id = t1.ScheduleId
LEFT JOIN warehouse_warehouse AS t3 ON t3.`Code` = t2.WarehouseCode
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment