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
ffcad4d6
Commit
ffcad4d6
authored
Oct 17, 2022
by
季圣华
Browse files
去掉停用的接口
parent
1e89cc16
Changes
1
Hide whitespace changes
Inline
Side-by-side
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
View file @
ffcad4d6
...
...
@@ -148,79 +148,6 @@ public class DepotHeadController {
return
res
;
}
/**
* 改接口准备停用
* @param currentPage
* @param pageSize
* @param oId
* @param number
* @param materialParam
* @param depotId
* @param beginTime
* @param endTime
* @param roleType
* @param type
* @param remark
* @param request
* @return
* @throws Exception
*/
@GetMapping
(
value
=
"/findInDetail"
)
@ApiOperation
(
value
=
"入库出库明细接口"
)
public
BaseResponseInfo
findInDetail
(
@RequestParam
(
"currentPage"
)
Integer
currentPage
,
@RequestParam
(
"pageSize"
)
Integer
pageSize
,
@RequestParam
(
value
=
"organId"
,
required
=
false
)
Integer
oId
,
@RequestParam
(
"number"
)
String
number
,
@RequestParam
(
"materialParam"
)
String
materialParam
,
@RequestParam
(
value
=
"depotId"
,
required
=
false
)
Long
depotId
,
@RequestParam
(
"beginTime"
)
String
beginTime
,
@RequestParam
(
"endTime"
)
String
endTime
,
@RequestParam
(
value
=
"roleType"
,
required
=
false
)
String
roleType
,
@RequestParam
(
"type"
)
String
type
,
@RequestParam
(
"remark"
)
String
remark
,
HttpServletRequest
request
)
throws
Exception
{
BaseResponseInfo
res
=
new
BaseResponseInfo
();
Map
<
String
,
Object
>
map
=
new
HashMap
<
String
,
Object
>();
try
{
List
<
Long
>
depotList
=
new
ArrayList
<>();
if
(
depotId
!=
null
)
{
depotList
.
add
(
depotId
);
}
else
{
//未选择仓库时默认为当前用户有权限的仓库
JSONArray
depotArr
=
depotService
.
findDepotByCurrentUser
();
for
(
Object
obj:
depotArr
)
{
JSONObject
object
=
JSONObject
.
parseObject
(
obj
.
toString
());
depotList
.
add
(
object
.
getLong
(
"id"
));
}
}
List
<
DepotHeadVo4InDetail
>
resList
=
new
ArrayList
<
DepotHeadVo4InDetail
>();
String
[]
creatorArray
=
depotHeadService
.
getCreatorArray
(
roleType
);
String
subType
=
"出库"
.
equals
(
type
)?
"销售"
:
""
;
String
[]
organArray
=
depotHeadService
.
getOrganArray
(
subType
,
""
);
beginTime
=
Tools
.
parseDayToTime
(
beginTime
,
BusinessConstants
.
DAY_FIRST_TIME
);
endTime
=
Tools
.
parseDayToTime
(
endTime
,
BusinessConstants
.
DAY_LAST_TIME
);
List
<
DepotHeadVo4InDetail
>
list
=
depotHeadService
.
findInOutDetail
(
beginTime
,
endTime
,
type
,
creatorArray
,
organArray
,
StringUtil
.
toNull
(
materialParam
),
depotList
,
oId
,
StringUtil
.
toNull
(
number
),
remark
,
(
currentPage
-
1
)*
pageSize
,
pageSize
);
int
total
=
depotHeadService
.
findInOutDetailCount
(
beginTime
,
endTime
,
type
,
creatorArray
,
organArray
,
StringUtil
.
toNull
(
materialParam
),
depotList
,
oId
,
StringUtil
.
toNull
(
number
),
remark
);
map
.
put
(
"total"
,
total
);
//存放数据json数组
if
(
null
!=
list
)
{
for
(
DepotHeadVo4InDetail
dhd
:
list
)
{
resList
.
add
(
dhd
);
}
}
map
.
put
(
"rows"
,
resList
);
res
.
code
=
200
;
res
.
data
=
map
;
}
catch
(
Exception
e
){
e
.
printStackTrace
();
res
.
code
=
500
;
res
.
data
=
"获取数据失败"
;
}
return
res
;
}
/**
* 入库出库统计接口
* @param currentPage
...
...
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