From 438ea7f2267beb94f4013412710ace1daba6d6aa Mon Sep 17 00:00:00 2001 From: erdanergou Date: Fri, 10 Feb 2023 11:20:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=BA=93=E5=8F=AF?= =?UTF-8?q?=E8=A7=86=E5=8C=96=E5=B1=95=E7=A4=BA=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DepositoryController.java | 1 + .../controller/PageController.java | 25 ++++++++++++++++--- .../mapper/DepositoryRecordMapper.xml | 9 ++++++- .../pojo/ApplicationOutRecordP.java | 2 +- .../service/DepositoryRecordService.java | 2 +- .../impl/DepositoryRecordServiceImpl.java | 14 +++++++---- .../application/form-step-look_back.html | 8 +++++- 7 files changed, 49 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java index 63009f9c..11cb7978 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryController.java @@ -1081,6 +1081,7 @@ public class DepositoryController { // 获取遍历器 Iterator it = depositoryAllNameAndId.keySet().iterator(); // 仓库名称列表 + //获取获取系统的当前日历对象 Calendar instance = Calendar.getInstance(); // 获取日期 diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index ea5d2098..afe0d03d 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -989,12 +989,31 @@ public class PageController { } @GetMapping("chart_out_back") - public ModelAndView chart_out_back() { + public ModelAndView chart_out_back(HttpServletRequest request) { ModelAndView mv = new ModelAndView(); mv.setViewName("pages/chart/chart-out_back"); + UserByPort userToken = (UserByPort) request.getAttribute("userToken"); + + // 获取当前用户所在部门管理的仓库 + List depositoryByAdminorg = depositoryService.findDepositoryByAdminorg(userToken.getMaindeparment().toString()); + + // 获取当前用户管理的仓库 + List depositoryAndRole = roleService.findDepositoryAndRole(userToken.getId()); + + List depositoryIdList = new ArrayList<>(); + for (Depository depository:depositoryByAdminorg + ) { + depositoryIdList.add(depository.getId()); + } + for (RoleAndDepository rad:depositoryAndRole + ) { + if(!depositoryIdList.contains(rad.getDepositoryId())){ + depositoryIdList.add(rad.getDepositoryId()); + } + } // 获取已经出库的记录数据 - Map mapForOut = depositoryRecordService.CalculateAllApplicationOutCount("已出库"); + Map mapForOut = depositoryRecordService.CalculateAllApplicationOutCount("已出库",depositoryIdList); // 转出物料数量 mv.addObject("OutCount", mapForOut.get("count")); // 获取数量比值 @@ -1005,7 +1024,7 @@ public class PageController { mv.addObject("outPriceRadio", mapForOut.get("radioForPrice")); // 获取要出库的记录数据 - Map mapForTrueOut = depositoryRecordService.CalculateAllApplicationOutCount(""); + Map mapForTrueOut = depositoryRecordService.CalculateAllApplicationOutCount("",depositoryIdList); // 转出物料金额 mv.addObject("allOutCount", mapForTrueOut.get("count")); // 获取数量比值 diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index ad516fd6..03bb5ea8 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -662,7 +662,14 @@ select from applicationOutRecordInfo - where applicantTime between #{start} and #{end} + where 1 = 1 + and applicantTime between #{start} and #{end} + + and depositoryId in + + #{depositoryId} + + + 仓储负责人 + 仓储负责人 @@ -163,6 +167,7 @@ let departmentheadTime=$("#departmentheadTime").text(); let depositoryManagerNameTime=$("#depositoryManagerNameTime").text(); + let depositoryManagerPass = $("#depositoryManagerPass").val(); if (departmentheadTime!=null&&departmentheadTime!==""){ $("#departmentheadTimeT").show(); $("#departmentheadMessageT").show(); @@ -170,7 +175,8 @@ $("#departmentheadMessageT").show(); } } - if (depositoryManagerNameTime!=null&&depositoryManagerNameTime!==""){ + + if (depositoryManagerNameTime!=null&&depositoryManagerNameTime!=="" && depositoryManagerPass !== "4"){ $("#depositoryManagerNameT").show(); $("#depositoryManagerNameTimeT").show(); $("#depositoryManagerNameMessageT").show();