Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
data-center-auto
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
bltdc
data-center-auto
Commits
44f8627d
Commit
44f8627d
authored
Oct 31, 2019
by
lizefeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
报表新增汇总,固定列
parent
456a945d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
64 additions
and
5 deletions
+64
-5
report.cs
AutoTurnOver.DB/report.cs
+0
-0
bailun_sku_website_sales_dto.cs
AutoTurnOver.Models/Report/bailun_sku_website_sales_dto.cs
+6
-0
supplier_sales_dto.cs
AutoTurnOver.Models/Report/supplier_sales_dto.cs
+1
-0
ApiServices.cs
AutoTurnOver.Services/ApiServices.cs
+7
-2
CommonController.cs
AutoTurnOver/Controllers/CommonController.cs
+2
-2
ReportsController.cs
AutoTurnOver/Controllers/ReportsController.cs
+48
-1
No files found.
AutoTurnOver.DB/report.cs
View file @
44f8627d
This diff is collapsed.
Click to expand it.
AutoTurnOver.Models/Report/bailun_sku_website_sales_dto.cs
View file @
44f8627d
...
...
@@ -6,6 +6,10 @@ namespace AutoTurnOver.Models.Report
{
public
class
bailun_sku_website_sales_search_dto
{
/// <summary>
/// 是否汇总
/// </summary>
public
bool
?
has_sum
{
get
;
set
;
}
public
string
platform_type
{
get
;
set
;
}
}
public
class
bailun_sku_website_sales_dto
...
...
@@ -36,7 +40,9 @@ namespace AutoTurnOver.Models.Report
public
class
bailun_sku_goods_search_dto
{
public
bool
?
has_sum
{
get
;
set
;
}
public
string
product_inner_code
{
get
;
set
;
}
public
string
platform_type
{
get
;
set
;
}
}
public
class
bailun_sku_goods_dto
{
...
...
AutoTurnOver.Models/Report/supplier_sales_dto.cs
View file @
44f8627d
...
...
@@ -32,6 +32,7 @@ namespace AutoTurnOver.Models.Report
public
class
supplier_sales_search_dto
{
public
bool
?
has_sum
{
get
;
set
;
}
public
string
supplier_name
{
get
;
set
;
}
}
}
AutoTurnOver.Services/ApiServices.cs
View file @
44f8627d
...
...
@@ -693,13 +693,18 @@ namespace AutoTurnOver.Services
}
public
static
List
<
platform_type_website_dto
>
PlatformtypeWebsiteList
()
public
static
List
<
platform_type_website_dto
>
PlatformtypeWebsiteList
(
string
platform_type
)
{
//查询采购建议明细
return
RedisHelper
.
Get
(
RedisConsts
.
platform_type_website
,
()
=>
var
datas
=
RedisHelper
.
Get
(
RedisConsts
.
platform_type_website
,
()
=>
{
return
report
.
GetPlatformWebsite
();
});
if
(!
string
.
IsNullOrWhiteSpace
(
platform_type
))
{
datas
=
datas
.
Where
(
s
=>
platform_type
.
Equals
(
s
.
platform_type
,
StringComparison
.
OrdinalIgnoreCase
)).
ToList
();
}
return
datas
;
}
}
...
...
AutoTurnOver/Controllers/CommonController.cs
View file @
44f8627d
...
...
@@ -138,9 +138,9 @@ namespace AutoTurnOver.Controllers
var
datas
=
ApiServices
.
PlatformList
();
return
new
JsonResult
(
datas
);
}
public
JsonResult
PlatformtypeWebsiteList
()
public
JsonResult
PlatformtypeWebsiteList
(
string
platform_type
)
{
var
datas
=
ApiServices
.
PlatformtypeWebsiteList
();
var
datas
=
ApiServices
.
PlatformtypeWebsiteList
(
platform_type
);
return
new
JsonResult
(
datas
);
}
...
...
AutoTurnOver/Controllers/ReportsController.cs
View file @
44f8627d
...
...
@@ -640,6 +640,20 @@ namespace AutoTurnOver.Controllers
});
}
public
JsonResult
GetSkuWebsiteSalesSumFooter
(
string
platform_type
)
{
bailun_sku_website_sales_search_dto
search_data
=
new
bailun_sku_website_sales_search_dto
{
platform_type
=
platform_type
,
has_sum
=
true
};
var
list
=
new
ReportServices
().
GetSkuWebsiteSales
(
search_data
);
return
new
JsonResult
(
list
==
null
||
list
.
Count
<=
0
?
new
dc_base_stock_dto
()
:
list
[
0
]);
}
public
JsonResult
SupplierSalesList
(
string
supplier_name
,
int
offset
,
int
limit
,
string
order
,
string
sort
)
{
var
m
=
new
supplier_sales_search_dto
...
...
@@ -657,11 +671,27 @@ namespace AutoTurnOver.Controllers
});
}
public
JsonResult
GetGoods
(
string
product_inner_code
,
int
offset
,
int
limit
,
string
order
,
string
sort
)
public
JsonResult
SupplierSalesListSumFooter
(
string
supplier_name
)
{
var
m
=
new
supplier_sales_search_dto
{
supplier_name
=
supplier_name
,
has_sum
=
true
};
var
services
=
new
ReportServices
();
var
total
=
0
;
var
list
=
services
.
SupplierSalesList
(
m
,
0
,
0
,
ref
total
,
order
:
""
,
sort
:
""
);
return
new
JsonResult
(
list
==
null
||
list
.
Count
<=
0
?
new
supplier_sales_dto
()
:
list
[
0
]);
}
public
JsonResult
GetGoods
(
string
product_inner_code
,
string
platform_type
,
int
offset
,
int
limit
,
string
order
,
string
sort
)
{
var
m
=
new
bailun_sku_goods_search_dto
{
product_inner_code
=
product_inner_code
,
platform_type
=
platform_type
};
var
services
=
new
ReportServices
();
var
total
=
0
;
...
...
@@ -673,5 +703,21 @@ namespace AutoTurnOver.Controllers
total
=
total
,
});
}
public
JsonResult
GetGoodsSumFooter
(
string
product_inner_code
,
string
platform_type
)
{
var
m
=
new
bailun_sku_goods_search_dto
{
product_inner_code
=
product_inner_code
,
platform_type
=
platform_type
,
has_sum
=
true
};
var
services
=
new
ReportServices
();
var
total
=
0
;
var
list
=
services
.
GetGoods
(
m
,
0
,
0
,
ref
total
,
order
:
""
,
sort
:
""
);
return
new
JsonResult
(
list
==
null
||
list
.
Count
<=
0
?
new
supplier_sales_dto
()
:
list
[
0
]);
}
}
}
\ No newline at end of file
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