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
d1956a27
Commit
d1956a27
authored
Aug 11, 2019
by
季圣华
Browse files
解决库存报表查询的bug,改了接口类型
parent
26b9ca7c
Changes
5
Hide whitespace changes
Inline
Side-by-side
erp_web/pages/reports/buy_in_report.html
View file @
d1956a27
...
...
@@ -201,7 +201,7 @@
var
mIds
=
res
.
data
.
mIds
;
if
(
mIds
)
{
$
.
ajax
({
type
:
"
ge
t
"
,
type
:
"
pos
t
"
,
url
:
"
/depotItem/buyIn
"
,
dataType
:
"
json
"
,
data
:
({
...
...
erp_web/pages/reports/in_out_stock_report.html
View file @
d1956a27
...
...
@@ -332,7 +332,7 @@
}
else
{
$
.
ajax
({
type
:
"
ge
t
"
,
type
:
"
pos
t
"
,
url
:
"
/depotItem/findByAll
"
,
dataType
:
"
json
"
,
data
:
({
...
...
@@ -358,7 +358,7 @@
//总金额
$
.
ajax
({
type
:
"
ge
t
"
,
type
:
"
pos
t
"
,
url
:
"
/depotItem/totalCountMoney
"
,
dataType
:
"
json
"
,
data
:
({
...
...
erp_web/pages/reports/sale_out_report.html
View file @
d1956a27
...
...
@@ -206,7 +206,7 @@
var
mIds
=
res
.
data
.
mIds
;
if
(
mIds
)
{
$
.
ajax
({
type
:
"
ge
t
"
,
type
:
"
pos
t
"
,
url
:
"
/depotItem/saleOut
"
,
dataType
:
"
json
"
,
data
:
({
...
...
src/main/java/com/jsh/erp/controller/DepotItemController.java
View file @
d1956a27
...
...
@@ -311,7 +311,7 @@ public class DepotItemController {
* @param request
* @return
*/
@
Ge
tMapping
(
value
=
"/findByAll"
)
@
Pos
tMapping
(
value
=
"/findByAll"
)
public
BaseResponseInfo
findByAll
(
@RequestParam
(
"currentPage"
)
Integer
currentPage
,
@RequestParam
(
"pageSize"
)
Integer
pageSize
,
@RequestParam
(
"projectId"
)
Integer
projectId
,
...
...
@@ -384,7 +384,7 @@ public class DepotItemController {
* @param request
* @return
*/
@
Ge
tMapping
(
value
=
"/totalCountMoney"
)
@
Pos
tMapping
(
value
=
"/totalCountMoney"
)
public
BaseResponseInfo
totalCountMoney
(
@RequestParam
(
"projectId"
)
Integer
pid
,
@RequestParam
(
"monthTime"
)
String
monthTime
,
@RequestParam
(
"headIds"
)
String
headIds
,
...
...
@@ -425,7 +425,7 @@ public class DepotItemController {
* @param request
* @return
*/
@
Ge
tMapping
(
value
=
"/buyIn"
)
@
Pos
tMapping
(
value
=
"/buyIn"
)
public
BaseResponseInfo
buyIn
(
@RequestParam
(
"currentPage"
)
Integer
currentPage
,
@RequestParam
(
"pageSize"
)
Integer
pageSize
,
@RequestParam
(
"monthTime"
)
String
monthTime
,
...
...
@@ -485,7 +485,7 @@ public class DepotItemController {
* @param request
* @return
*/
@
Ge
tMapping
(
value
=
"/saleOut"
)
@
Pos
tMapping
(
value
=
"/saleOut"
)
public
BaseResponseInfo
saleOut
(
@RequestParam
(
"currentPage"
)
Integer
currentPage
,
@RequestParam
(
"pageSize"
)
Integer
pageSize
,
@RequestParam
(
"monthTime"
)
String
monthTime
,
...
...
src/main/java/com/jsh/erp/controller/UserController.java
View file @
d1956a27
...
...
@@ -81,6 +81,7 @@ public class UserController {
try
{
userStatus
=
userService
.
validateUser
(
username
,
password
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
logger
.
error
(
">>>>>>>>>>>>>用户 "
+
username
+
" 登录 login 方法 访问服务层异常===="
,
e
);
msgTip
=
"access service exception"
;
}
...
...
@@ -122,6 +123,7 @@ public class UserController {
}
request
.
getSession
().
setAttribute
(
"mybatisPlusStatus"
,
mybatisPlusStatus
);
//开启状态
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
logger
.
error
(
">>>>>>>>>>>>>>>查询用户名为:"
+
username
+
" ,用户信息异常"
,
e
);
}
break
;
...
...
@@ -140,6 +142,7 @@ public class UserController {
logger
.
info
(
"===============用户登录 login 方法调用结束==============="
);
}
catch
(
Exception
e
){
e
.
printStackTrace
();
logger
.
error
(
e
.
getMessage
());
res
.
code
=
500
;
res
.
data
=
"用户登录失败"
;
}
...
...
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