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
2f3fedc1
Commit
2f3fedc1
authored
Dec 30, 2020
by
guanzhenshan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决异常
parent
2d4a1bef
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
LogisticsServices.cs
Bailun.DC.Services/LogisticsServices.cs
+1
-1
common.js
Bailun.DC.Web/wwwroot/js/common.js
+1
-1
No files found.
Bailun.DC.Services/LogisticsServices.cs
View file @
2f3fedc1
...
...
@@ -541,7 +541,7 @@ namespace Bailun.DC.Services
//合并处理数据
foreach
(
var
item
in
listMerge
)
{
var
listObj
=
list
.
Where
(
a
=>
a
.
suppliername
==
item
.
Key
||
item
.
Select
(
a
=>
a
.
suppliername
).
Contains
(
a
.
suppliername
)).
ToList
();
var
listObj
=
list
.
Where
(
a
=>
a
.
suppliername
==
item
.
Key
||
item
.
Select
(
b
=>
b
.
suppliername
).
Contains
(
a
.
suppliername
)).
ToList
();
if
(
listObj
.
Count
>
0
)
{
var
newObj
=
new
dc_daily_logistics_supplier_transaction
()
...
...
Bailun.DC.Web/wwwroot/js/common.js
View file @
2f3fedc1
var
baseUrl
=
'http://
data.bailuntec.com'
;
//'http://localhost:59628/';
//
var
baseUrl
=
'http://
localhost:59628/'
;
//'http://data.bailuntec.com';
//
var
globalOrderSort
=
''
;
var
globalOrderType
=
''
;
...
...
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