Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
6cb3a4a6
Commit
6cb3a4a6
authored
Jun 22, 2021
by
季圣华
Browse files
优化商品id查询单据列表接口
parent
d50159fd
Changes
1
Hide whitespace changes
Inline
Side-by-side
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View file @
6cb3a4a6
...
...
@@ -64,7 +64,6 @@ public class DepotItemController {
@RequestParam
(
"materialId"
)
String
mId
,
HttpServletRequest
request
)
throws
Exception
{
Map
<
String
,
String
>
parameterMap
=
ParamUtils
.
requestToMap
(
request
);
parameterMap
.
put
(
"mId"
,
mId
);
PageQueryInfo
queryInfo
=
new
PageQueryInfo
();
Map
<
String
,
Object
>
objectMap
=
new
HashMap
<
String
,
Object
>();
if
(
pageSize
!=
null
&&
pageSize
<=
0
)
{
pageSize
=
10
;
...
...
@@ -78,28 +77,27 @@ public class DepotItemController {
if
(
list
!=
null
)
{
for
(
DepotItemVo4DetailByTypeAndMId
d:
list
)
{
JSONObject
item
=
new
JSONObject
();
item
.
put
(
"
N
umber"
,
d
.
getNumber
());
//商品编号
item
.
put
(
"
n
umber"
,
d
.
getNumber
());
//商品编号
String
type
=
d
.
getType
();
String
subType
=
d
.
getSubType
();
if
((
"其它"
).
equals
(
type
))
{
item
.
put
(
"
T
ype"
,
subType
);
//进出类型
item
.
put
(
"
t
ype"
,
subType
);
//进出类型
}
else
{
item
.
put
(
"
T
ype"
,
subType
+
type
);
//进出类型
item
.
put
(
"
t
ype"
,
subType
+
type
);
//进出类型
}
item
.
put
(
"depotName"
,
d
.
getDepotName
());
//仓库名称
item
.
put
(
"
B
asicNumber"
,
d
.
getBnum
());
//数量
item
.
put
(
"
O
perTime"
,
d
.
getOtime
().
getTime
());
//时间
item
.
put
(
"
b
asicNumber"
,
d
.
getBnum
());
//数量
item
.
put
(
"
o
perTime"
,
d
.
getOtime
().
getTime
());
//时间
dataArray
.
add
(
item
);
}
}
objectMap
.
put
(
"page"
,
queryInfo
);
if
(
list
==
null
)
{
queryInfo
.
setRows
(
new
ArrayList
<
Object
>());
queryInfo
.
setT
otal
(
BusinessConstants
.
DEFAULT_LIST_NULL_NUMBER
);
objectMap
.
put
(
"rows"
,
new
ArrayList
<
Object
>());
objectMap
.
put
(
"t
otal
"
,
BusinessConstants
.
DEFAULT_LIST_NULL_NUMBER
);
return
returnJson
(
objectMap
,
"查找不到数据"
,
ErpInfo
.
OK
.
code
);
}
queryInfo
.
setRows
(
dataArray
);
queryInfo
.
setT
otal
(
depotItemService
.
findDetailByTypeAndMaterialIdCounts
(
parameterMap
));
objectMap
.
put
(
"rows"
,
dataArray
);
objectMap
.
put
(
"t
otal
"
,
depotItemService
.
findDetailByTypeAndMaterialIdCounts
(
parameterMap
));
return
returnJson
(
objectMap
,
ErpInfo
.
OK
.
name
,
ErpInfo
.
OK
.
code
);
}
...
...
Write
Preview
Supports
Markdown
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