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
19e0b3ff
Commit
19e0b3ff
authored
Jan 24, 2021
by
xin.yang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug
parent
c1b2f006
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
3 deletions
+5
-3
associateProduct.vue
Html/src/view/fms/associate/associateProduct.vue
+1
-1
storageInfoQuery.vue
Html/src/view/wms/whStatusQuery/storageInfoQuery.vue
+1
-1
AutomationLocationRepository.cs
...ccRepository/Repositories/AutomationLocationRepository.cs
+2
-1
ResponseAutomationLocation.cs
...ayer.AccRepository/Response/ResponseAutomationLocation.cs
+1
-0
No files found.
Html/src/view/fms/associate/associateProduct.vue
View file @
19e0b3ff
...
@@ -444,7 +444,7 @@ export default {
...
@@ -444,7 +444,7 @@ export default {
return
false
;
return
false
;
}
}
this
.
type
=
2
;
this
.
type
=
2
;
this
.
parentType
=
[]
;
//工装类型 清空
this
.
parentType
=
this
.
detailobj
.
categoryids
;
//工装类型 清空
this
.
parentTypeid
=
this
.
detailobj
.
categoryid
;
this
.
parentTypeid
=
this
.
detailobj
.
categoryid
;
this
.
addfrockid
=
this
.
detailobj
.
fixturetoolid
;
//工装id
this
.
addfrockid
=
this
.
detailobj
.
fixturetoolid
;
//工装id
this
.
addproductid
=
this
.
detailobj
.
productid
;
//产品
this
.
addproductid
=
this
.
detailobj
.
productid
;
//产品
...
...
Html/src/view/wms/whStatusQuery/storageInfoQuery.vue
View file @
19e0b3ff
...
@@ -569,8 +569,8 @@ export default {
...
@@ -569,8 +569,8 @@ export default {
this
.
initFrockType
();
//工装类型
this
.
initFrockType
();
//工装类型
this
.
parentType
=
this
.
detailobj
.
categoryIds
;
//工装类型
this
.
parentType
=
this
.
detailobj
.
categoryIds
;
//工装类型
let
categoryIds
=
this
.
detailobj
.
categoryIds
;
let
categoryIds
=
this
.
detailobj
.
categoryIds
;
this
.
parentTypeid
=
this
.
detailobj
.
categoryId
;
if
(
Array
.
isArray
(
categoryIds
)
&&
categoryIds
.
length
){
if
(
Array
.
isArray
(
categoryIds
)
&&
categoryIds
.
length
){
this
.
parentTypeid
=
categoryIds
[
categoryIds
.
length
-
1
];
this
.
getFrocksChange
();
this
.
getFrocksChange
();
}
}
this
.
addfrockid
=
this
.
detailobj
.
fixturetoolid
;
//工装id
this
.
addfrockid
=
this
.
detailobj
.
fixturetoolid
;
//工装id
...
...
Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationLocationRepository.cs
View file @
19e0b3ff
...
@@ -57,7 +57,8 @@ namespace Siger.Middlelayer.AccRepository.Repositories
...
@@ -57,7 +57,8 @@ namespace Siger.Middlelayer.AccRepository.Repositories
sn
=
m
.
sn
??
""
,
sn
=
m
.
sn
??
""
,
route
=
r
.
name
??
""
,
route
=
r
.
name
??
""
,
routenumber
=
r
==
null
?
""
:
r
.
serialNumber
.
ToString
(),
routenumber
=
r
==
null
?
""
:
r
.
serialNumber
.
ToString
(),
cate_guid
=
c
.
guid
??
""
cate_guid
=
c
.
guid
??
""
,
categoryId
=
c
==
null
?
0
:
c
.
id
};
};
Expression
<
Func
<
ResponseAutomationLocation
,
bool
>>
wavehouseidExpression
=
f
=>
true
;
Expression
<
Func
<
ResponseAutomationLocation
,
bool
>>
wavehouseidExpression
=
f
=>
true
;
if
(
wavehouseid
>
0
)
if
(
wavehouseid
>
0
)
...
...
Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Response/ResponseAutomationLocation.cs
View file @
19e0b3ff
...
@@ -20,6 +20,7 @@ namespace Siger.Middlelayer.AccRepository.Response
...
@@ -20,6 +20,7 @@ namespace Siger.Middlelayer.AccRepository.Response
/// </summary>
/// </summary>
public
int
fixturetoolid
{
get
;
set
;
}
public
int
fixturetoolid
{
get
;
set
;
}
public
string
fixturetool
{
get
;
set
;
}
public
string
fixturetool
{
get
;
set
;
}
public
int
categoryId
{
get
;
set
;
}
public
string
category
{
get
;
set
;
}
public
string
category
{
get
;
set
;
}
public
string
code
{
get
;
set
;
}
public
string
code
{
get
;
set
;
}
public
string
specfication
{
get
;
set
;
}
public
string
specfication
{
get
;
set
;
}
...
...
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