purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决库存报表查询的bug，改了接口类型

Browse Source
This commit is contained in:
季圣华
2019-08-11 23:02:45 +08:00
parent 26b9ca7c5d
commit d1956a27d0
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erp_web/pages/reports/buy_in_report.html
View File

@@ -201,7 +201,7 @@
var mIds = res.data.mIds; var mIds = res.data.mIds;
if (mIds) { if (mIds) {
$.ajax({ $.ajax({
type: "get", type: "post",
url: "/depotItem/buyIn", url: "/depotItem/buyIn",
dataType: "json", dataType: "json",
data: ({ data: ({

4
erp_web/pages/reports/in_out_stock_report.html
View File

@@ -332,7 +332,7 @@
} }
else { else {
$.ajax({ $.ajax({
type: "get", type: "post",
url: "/depotItem/findByAll", url: "/depotItem/findByAll",
dataType: "json", dataType: "json",
data: ({ data: ({
@@ -358,7 +358,7 @@
//总金额 //总金额
$.ajax({ $.ajax({
type: "get", type: "post",
url: "/depotItem/totalCountMoney", url: "/depotItem/totalCountMoney",
dataType: "json", dataType: "json",
data: ({ data: ({

2
erp_web/pages/reports/sale_out_report.html
View File

@@ -206,7 +206,7 @@
var mIds = res.data.mIds; var mIds = res.data.mIds;
if (mIds) { if (mIds) {
$.ajax({ $.ajax({
type: "get", type: "post",
url: "/depotItem/saleOut", url: "/depotItem/saleOut",
dataType: "json", dataType: "json",
data: ({ data: ({

8
src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -311,7 +311,7 @@ public class DepotItemController {
* @param request * @param request
* @return * @return
*/ */
@GetMapping(value = "/findByAll") @PostMapping(value = "/findByAll")
public BaseResponseInfo findByAll(@RequestParam("currentPage") Integer currentPage, public BaseResponseInfo findByAll(@RequestParam("currentPage") Integer currentPage,
@RequestParam("pageSize") Integer pageSize, @RequestParam("pageSize") Integer pageSize,
@RequestParam("projectId") Integer projectId, @RequestParam("projectId") Integer projectId,
@@ -384,7 +384,7 @@ public class DepotItemController {
* @param request * @param request
* @return * @return
*/ */
@GetMapping(value = "/totalCountMoney") @PostMapping(value = "/totalCountMoney")
public BaseResponseInfo totalCountMoney(@RequestParam("projectId") Integer pid, public BaseResponseInfo totalCountMoney(@RequestParam("projectId") Integer pid,
@RequestParam("monthTime") String monthTime, @RequestParam("monthTime") String monthTime,
@RequestParam("headIds") String headIds, @RequestParam("headIds") String headIds,
@@ -425,7 +425,7 @@ public class DepotItemController {
* @param request * @param request
* @return * @return
*/ */
@GetMapping(value = "/buyIn") @PostMapping(value = "/buyIn")
public BaseResponseInfo buyIn(@RequestParam("currentPage") Integer currentPage, public BaseResponseInfo buyIn(@RequestParam("currentPage") Integer currentPage,
@RequestParam("pageSize") Integer pageSize, @RequestParam("pageSize") Integer pageSize,
@RequestParam("monthTime") String monthTime, @RequestParam("monthTime") String monthTime,
@@ -485,7 +485,7 @@ public class DepotItemController {
* @param request * @param request
* @return * @return
*/ */
@GetMapping(value = "/saleOut") @PostMapping(value = "/saleOut")
public BaseResponseInfo saleOut(@RequestParam("currentPage") Integer currentPage, public BaseResponseInfo saleOut(@RequestParam("currentPage") Integer currentPage,
@RequestParam("pageSize") Integer pageSize, @RequestParam("pageSize") Integer pageSize,
@RequestParam("monthTime") String monthTime, @RequestParam("monthTime") String monthTime,

3
src/main/java/com/jsh/erp/controller/UserController.java
View File

@@ -81,6 +81,7 @@ public class UserController {
try { try {
userStatus = userService.validateUser(username, password); userStatus = userService.validateUser(username, password);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
logger.error(">>>>>>>>>>>>>用户 " + username + " 登录 login 方法 访问服务层异常====", e); logger.error(">>>>>>>>>>>>>用户 " + username + " 登录 login 方法 访问服务层异常====", e);
msgTip = "access service exception"; msgTip = "access service exception";
} }
@@ -122,6 +123,7 @@ public class UserController {
} }
request.getSession().setAttribute("mybatisPlusStatus",mybatisPlusStatus); //开启状态 request.getSession().setAttribute("mybatisPlusStatus",mybatisPlusStatus); //开启状态
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
logger.error(">>>>>>>>>>>>>>>查询用户名为:" + username + " ，用户信息异常", e); logger.error(">>>>>>>>>>>>>>>查询用户名为:" + username + " ，用户信息异常", e);
} }
break; break;
@@ -140,6 +142,7 @@ public class UserController {
logger.info("===============用户登录 login 方法调用结束==============="); logger.info("===============用户登录 login 方法调用结束===============");
} catch(Exception e){ } catch(Exception e){
e.printStackTrace(); e.printStackTrace();
logger.error(e.getMessage());
res.code = 500; res.code = 500;
res.data = "用户登录失败"; res.data = "用户登录失败";
} }