Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DataCenter_Core2.1_20190520
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
DataCenter_Core2.1_20190520
Commits
b95ca4f8
Commit
b95ca4f8
authored
Jul 18, 2020
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
同上
parent
aca45c69
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
HomeController.cs
Bailun.DC.Web/Areas/Logistics/Controllers/HomeController.cs
+5
-5
EbayUkReport.cshtml
Bailun.DC.Web/Areas/Logistics/Views/Home/EbayUkReport.cshtml
+1
-1
No files found.
Bailun.DC.Web/Areas/Logistics/Controllers/HomeController.cs
View file @
b95ca4f8
...
@@ -166,7 +166,7 @@ namespace Bailun.DC.Web.Areas.Logistics.Controllers
...
@@ -166,7 +166,7 @@ namespace Bailun.DC.Web.Areas.Logistics.Controllers
m
.
lettercount
=
item
.
Where
(
a
=>
listconfig
.
Where
(
b
=>
b
.
type
==
6
).
Select
(
c
=>
c
.
config_value
).
Contains
(
a
.
logistics_order_id
)).
Count
();
//letter
m
.
lettercount
=
item
.
Where
(
a
=>
listconfig
.
Where
(
b
=>
b
.
type
==
6
).
Select
(
c
=>
c
.
config_value
).
Contains
(
a
.
logistics_order_id
)).
Count
();
//letter
m
.
percenl
=
m
.
hpackagecount
/
m
.
lettercount
;
m
.
percenl
=
m
.
lettercount
>
0
?
m
.
hpackagecount
/
m
.
lettercount
:
0
;
//需新增包裹数=1.2*信封transactionid数-包裹transactionid订单数
//需新增包裹数=1.2*信封transactionid数-包裹transactionid订单数
var
need
=
((
m
.
lettercount
*
1.2
-
m
.
hpackagecount
)
>
0
?
(
m
.
lettercount
*
1.2
-
m
.
hpackagecount
)
:
0
);
var
need
=
((
m
.
lettercount
*
1.2
-
m
.
hpackagecount
)
>
0
?
(
m
.
lettercount
*
1.2
-
m
.
hpackagecount
)
:
0
);
...
@@ -176,9 +176,9 @@ namespace Bailun.DC.Web.Areas.Logistics.Controllers
...
@@ -176,9 +176,9 @@ namespace Bailun.DC.Web.Areas.Logistics.Controllers
m
.
needcount_bg
=
Math
.
Ceiling
(
need
);
m
.
needcount_bg
=
Math
.
Ceiling
(
need
);
//letter占比
//letter占比
m
.
percenz
=
decimal
.
Parse
((
m
.
lettercount
*
100
/
m
.
ordercount
).
ToString
(
"#0.00"
))
;
m
.
percenz
=
m
.
ordercount
>
0
?
decimal
.
Parse
((
m
.
lettercount
*
100
/
m
.
ordercount
).
ToString
(
"#0.00"
)):
0
;
//包裹占比
//包裹占比
m
.
percenh
=
decimal
.
Parse
((
m
.
hpackagecount
*
100
/
m
.
ordercount
).
ToString
(
"#0.00"
))
;
m
.
percenh
=
m
.
ordercount
>
0
?
decimal
.
Parse
((
m
.
hpackagecount
*
100
/
m
.
ordercount
).
ToString
(
"#0.00"
)):
0
;
list
.
Add
(
m
);
list
.
Add
(
m
);
...
@@ -195,7 +195,7 @@ namespace Bailun.DC.Web.Areas.Logistics.Controllers
...
@@ -195,7 +195,7 @@ namespace Bailun.DC.Web.Areas.Logistics.Controllers
};
};
countM
.
percenl
=
countM
.
hpackagecount
/
countM
.
lettercount
;
countM
.
percenl
=
countM
.
lettercount
>
0
?
countM
.
hpackagecount
/
countM
.
lettercount
:
0
;
var
need1
=
((
countM
.
lettercount
*
1.2
-
countM
.
hpackagecount
)
>
0
?
(
countM
.
lettercount
*
1.2
-
countM
.
hpackagecount
)
:
0
);
var
need1
=
((
countM
.
lettercount
*
1.2
-
countM
.
hpackagecount
)
>
0
?
(
countM
.
lettercount
*
1.2
-
countM
.
hpackagecount
)
:
0
);
...
@@ -246,7 +246,7 @@ namespace Bailun.DC.Web.Areas.Logistics.Controllers
...
@@ -246,7 +246,7 @@ namespace Bailun.DC.Web.Areas.Logistics.Controllers
}
}
return
JsonConvert
.
SerializeObject
(
new
{
total
=
25
,
rows
=
list
,
count_row
=
countM
});
return
JsonConvert
.
SerializeObject
(
new
{
total
=
list
.
Count
,
rows
=
list
,
count_row
=
countM
});
}
}
}
}
...
...
Bailun.DC.Web/Areas/Logistics/Views/Home/EbayUkReport.cshtml
View file @
b95ca4f8
...
@@ -99,7 +99,7 @@
...
@@ -99,7 +99,7 @@
var url = '@Url.Content("~/Logistics/Home/EbayUkReportJson")' + '?' + $("#toolbar").serialize();
var url = '@Url.Content("~/Logistics/Home/EbayUkReportJson")' + '?' + $("#toolbar").serialize();
if (tb == undefined) {
if (tb == undefined) {
tb = OnlyTable("roletable", columns, url, "", { showfooter: true, showCount:
true}
);
tb = OnlyTable("roletable", columns, url, "", { showfooter: true, showCount:
true }, undefined,1000
);
}
}
else {
else {
tb.bootstrapTable('refresh', { url: url });
tb.bootstrapTable('refresh', { url: url });
...
...
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