Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
hp-smart
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
platform
hp-smart
Commits
5da8b18a
Commit
5da8b18a
authored
Apr 22, 2024
by
liuyang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://git.pseer.com/platform/hp-smart
into dev-ly
parents
88f002f0
2d448aa8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletions
+3
-1
ServiceHPKC003A.java
...java/com/baosight/hpjx/hp/kc/service/ServiceHPKC003A.java
+2
-1
HPXS006.js
src/main/webapp/HP/XS/HPXS006.js
+1
-0
No files found.
src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC003A.java
View file @
5da8b18a
...
@@ -56,7 +56,8 @@ public class ServiceHPKC003A extends ServiceEPBase {
...
@@ -56,7 +56,8 @@ public class ServiceHPKC003A extends ServiceEPBase {
public
EiInfo
initLoad
(
EiInfo
inInfo
)
{
public
EiInfo
initLoad
(
EiInfo
inInfo
)
{
try
{
try
{
Map
queryMap
=
new
HashMap
();
Map
queryMap
=
new
HashMap
();
queryMap
.
put
(
"inventTypes"
,
new
String
[]{
"2"
,
"3"
});
//"2",
queryMap
.
put
(
"inventTypes"
,
new
String
[]{
"3"
});
queryMap
.
put
(
"userId"
,
UserSessionUtils
.
getUserId
());
queryMap
.
put
(
"userId"
,
UserSessionUtils
.
getUserId
());
CommonMethod
.
initBlock
(
inInfo
,
Arrays
.
asList
(
DdynamicEnum
.
USER_GROUP_BLOCK_ID
),
queryMap
,
false
);
CommonMethod
.
initBlock
(
inInfo
,
Arrays
.
asList
(
DdynamicEnum
.
USER_GROUP_BLOCK_ID
),
queryMap
,
false
);
CommonMethod
.
initBlock
(
inInfo
,
Arrays
.
asList
(
DdynamicEnum
.
WH_RECORD_BLOCK_ID
),
queryMap
,
false
);
CommonMethod
.
initBlock
(
inInfo
,
Arrays
.
asList
(
DdynamicEnum
.
WH_RECORD_BLOCK_ID
),
queryMap
,
false
);
...
...
src/main/webapp/HP/XS/HPXS006.js
View file @
5da8b18a
...
@@ -44,6 +44,7 @@ $(function () {
...
@@ -44,6 +44,7 @@ $(function () {
},
},
}
}
}
}
downKeyUp
();
});
});
let
query
=
function
()
{
resultGrid
.
dataSource
.
page
(
1
);}
let
query
=
function
()
{
resultGrid
.
dataSource
.
page
(
1
);}
...
...
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