Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
Laisi_AutoMES2
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
jiawei.su
Laisi_AutoMES2
Commits
16ba28a4
Commit
16ba28a4
authored
Jan 20, 2021
by
xin.yang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
230b1989
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
7 deletions
+4
-7
LocationController.cs
Server/Apis/Siger.ApiWMS/Controllers/LocationController.cs
+2
-7
ResponseLocationList.cs
...iddlelayer.WmsRepository/Response/ResponseLocationList.cs
+2
-0
No files found.
Server/Apis/Siger.ApiWMS/Controllers/LocationController.cs
View file @
16ba28a4
...
...
@@ -352,8 +352,6 @@ namespace Siger.ApiWMS.Controllers
var
locationType
=
locationtype
.
GetList
(
f
=>
f
.
status
==
(
int
)
RowState
.
Valid
&&
f
.
projectid
==
ProjectId
).
ToList
();
var
parentid
=
locationType
.
Select
(
f
=>
f
.
parentid
).
ToList
();
var
typeids
=
locationtype
.
GetList
(
f
=>
f
.
status
==
(
int
)
RowState
.
Valid
&&
!
parentid
.
Contains
(
f
.
id
)
&&
f
.
projectid
==
ProjectId
).
Select
(
f
=>
f
.
id
).
ToList
();
var
sonLocationTyps
=
GetSonTypes
(
0
,
locationType
);
var
LastTypeId
=
sonLocationTyps
.
Any
()
?
sonLocationTyps
.
LastOrDefault
()?.
id
??
0
:
0
;
var
locationAllData
=
location
.
GetList
(
f
=>
f
.
status
==
(
int
)
RowState
.
Valid
&&
f
.
projectid
==
ProjectId
);
...
...
@@ -419,7 +417,8 @@ namespace Siger.ApiWMS.Controllers
serialNumber
=
item
.
serial_number
,
state
=
item
.
status
,
field
=
new
List
<
FiledName
>(),
warehouseId
=
item
.
storageid
warehouseId
=
item
.
storageid
,
storeID
=
item
.
locationid
,
};
int
i
=
1
;
var
locatype
=
locationType
.
FirstOrDefault
(
q
=>
q
.
id
==
item
.
typeid
);
...
...
@@ -435,10 +434,6 @@ namespace Siger.ApiWMS.Controllers
var
entity
=
location
.
Get
(
pid
);
if
(
entity
==
null
)
break
;
if
(
entity
.
typeid
==
LastTypeId
)
{
tmp
.
storeID
=
entity
.
locationid
;
//赋值前端填写的储位ID
}
//处理顺序问题
locatype
=
locationType
.
FirstOrDefault
(
q
=>
q
.
id
==
entity
.
typeid
);
tmp
.
field
.
Add
(
new
FiledName
...
...
Server/Infrastructure/Repositories/Siger.Middlelayer.WmsRepository/Response/ResponseLocationList.cs
View file @
16ba28a4
...
...
@@ -14,6 +14,8 @@ namespace Siger.Middlelayer.WmsRepository.Response
/// 前端填写的储位ID
/// </summary>
public
int
storeID
{
get
;
set
;
}
public
int
warehouseId
{
get
;
set
;
}
}
public
class
FiledName
...
...
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