From 6ff36c1ba78eb4534a18e86d8c212baa744b6430 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Wed, 16 Oct 2024 22:34:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E9=99=90=E5=88=B6=E8=B6=85=E7=AE=A1=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=9A=84=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/DepotHeadController.java | 24 ++-- .../erp/controller/DepotItemController.java | 123 +++++++++--------- 2 files changed, 78 insertions(+), 69 deletions(-) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java index 9849a8385..24dc8273a 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java @@ -12,8 +12,8 @@ import com.jsh.erp.datasource.vo.DepotHeadVo4List; import com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount; import com.jsh.erp.service.depot.DepotService; import com.jsh.erp.service.depotHead.DepotHeadService; -import com.jsh.erp.service.redis.RedisService; import com.jsh.erp.service.systemConfig.SystemConfigService; +import com.jsh.erp.service.user.UserService; import com.jsh.erp.utils.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -50,6 +50,9 @@ public class DepotHeadController { @Resource private SystemConfigService systemConfigService; + @Resource + private UserService userService; + /** * 批量设置状态-审核或者反审核 * @param jsonObject @@ -484,14 +487,17 @@ public class DepotHeadController { public BaseResponseInfo getBuyAndSaleStatistics(HttpServletRequest request) { BaseResponseInfo res = new BaseResponseInfo(); try { - String today = Tools.getNow() + BusinessConstants.DAY_FIRST_TIME; - String monthFirstDay = Tools.firstDayOfMonth(Tools.getCurrentMonth()) + BusinessConstants.DAY_FIRST_TIME; - String yesterdayBegin = Tools.getYesterday() + BusinessConstants.DAY_FIRST_TIME; - String yesterdayEnd = Tools.getYesterday() + BusinessConstants.DAY_LAST_TIME; - String yearBegin = Tools.getYearBegin() + BusinessConstants.DAY_FIRST_TIME; - String yearEnd = Tools.getYearEnd() + BusinessConstants.DAY_LAST_TIME; - Map map = depotHeadService.getBuyAndSaleStatistics(today, monthFirstDay, - yesterdayBegin, yesterdayEnd, yearBegin, yearEnd, request); + Map map = new HashMap<>(); + String loginName = userService.getCurrentUser().getLoginName(); + if(!"admin".equals(loginName)) { + String today = Tools.getNow() + BusinessConstants.DAY_FIRST_TIME; + String monthFirstDay = Tools.firstDayOfMonth(Tools.getCurrentMonth()) + BusinessConstants.DAY_FIRST_TIME; + String yesterdayBegin = Tools.getYesterday() + BusinessConstants.DAY_FIRST_TIME; + String yesterdayEnd = Tools.getYesterday() + BusinessConstants.DAY_LAST_TIME; + String yearBegin = Tools.getYearBegin() + BusinessConstants.DAY_FIRST_TIME; + String yearEnd = Tools.getYearEnd() + BusinessConstants.DAY_LAST_TIME; + map = depotHeadService.getBuyAndSaleStatistics(today, monthFirstDay, yesterdayBegin, yesterdayEnd, yearBegin, yearEnd, request); + } res.code = 200; res.data = map; } catch(Exception e){ diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java index 8371a251c..97e82177f 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -985,77 +985,80 @@ public class DepotItemController { public BaseResponseInfo buyOrSalePrice(HttpServletRequest request, HttpServletResponse response)throws Exception { BaseResponseInfo res = new BaseResponseInfo(); - Map map = new HashMap(); try { - Long userId = userService.getUserId(request); - List monthList = Tools.getLastMonths(6); - String beginTime = Tools.firstDayOfMonth(monthList.get(0)) + BusinessConstants.DAY_FIRST_TIME; - String endTime = Tools.getNow() + BusinessConstants.DAY_LAST_TIME; - List inOrOutPriceList = depotItemService.inOrOutPriceList(beginTime, endTime); - String priceLimit = userService.getRoleTypeByUserId(userId).getPriceLimit(); - JSONArray buyPriceList = new JSONArray(); - for(String month: monthList) { - JSONObject obj = new JSONObject(); - BigDecimal outPrice = BigDecimal.ZERO; - BigDecimal inPrice = BigDecimal.ZERO; - for(InOutPriceVo item: inOrOutPriceList) { - String billOperMonth = Tools.dateToStr(item.getOperTime(), "yyyy-MM"); - if(month.equals(billOperMonth)) { - if("入库".equals(item.getType()) && "采购".equals(item.getSubType())) { - outPrice = outPrice.add(item.getDiscountLastMoney()); - } - if("出库".equals(item.getType()) && "采购退货".equals(item.getSubType())) { - inPrice = inPrice.add(item.getDiscountLastMoney()); + Map map = new HashMap<>(); + String loginName = userService.getCurrentUser().getLoginName(); + if(!"admin".equals(loginName)) { + Long userId = userService.getUserId(request); + List monthList = Tools.getLastMonths(6); + String beginTime = Tools.firstDayOfMonth(monthList.get(0)) + BusinessConstants.DAY_FIRST_TIME; + String endTime = Tools.getNow() + BusinessConstants.DAY_LAST_TIME; + List inOrOutPriceList = depotItemService.inOrOutPriceList(beginTime, endTime); + String priceLimit = userService.getRoleTypeByUserId(userId).getPriceLimit(); + JSONArray buyPriceList = new JSONArray(); + for (String month : monthList) { + JSONObject obj = new JSONObject(); + BigDecimal outPrice = BigDecimal.ZERO; + BigDecimal inPrice = BigDecimal.ZERO; + for (InOutPriceVo item : inOrOutPriceList) { + String billOperMonth = Tools.dateToStr(item.getOperTime(), "yyyy-MM"); + if (month.equals(billOperMonth)) { + if ("入库".equals(item.getType()) && "采购".equals(item.getSubType())) { + outPrice = outPrice.add(item.getDiscountLastMoney()); + } + if ("出库".equals(item.getType()) && "采购退货".equals(item.getSubType())) { + inPrice = inPrice.add(item.getDiscountLastMoney()); + } } } + obj.put("x", month); + obj.put("y", roleService.parseHomePriceByLimit(outPrice.subtract(inPrice), "buy", priceLimit, "***", request)); + buyPriceList.add(obj); } - obj.put("x", month); - obj.put("y", roleService.parseHomePriceByLimit(outPrice.subtract(inPrice), "buy", priceLimit, "***", request)); - buyPriceList.add(obj); - } - map.put("buyPriceList", buyPriceList); - JSONArray salePriceList = new JSONArray(); - for(String month: monthList) { - JSONObject obj = new JSONObject(); - BigDecimal outPrice = BigDecimal.ZERO; - BigDecimal inPrice = BigDecimal.ZERO; - for(InOutPriceVo item: inOrOutPriceList) { - String billOperMonth = Tools.dateToStr(item.getOperTime(), "yyyy-MM"); - if(month.equals(billOperMonth)) { - if("出库".equals(item.getType()) && "销售".equals(item.getSubType())) { - outPrice = outPrice.add(item.getDiscountLastMoney()); - } - if("入库".equals(item.getType()) && "销售退货".equals(item.getSubType())) { - inPrice = inPrice.add(item.getDiscountLastMoney()); + map.put("buyPriceList", buyPriceList); + JSONArray salePriceList = new JSONArray(); + for (String month : monthList) { + JSONObject obj = new JSONObject(); + BigDecimal outPrice = BigDecimal.ZERO; + BigDecimal inPrice = BigDecimal.ZERO; + for (InOutPriceVo item : inOrOutPriceList) { + String billOperMonth = Tools.dateToStr(item.getOperTime(), "yyyy-MM"); + if (month.equals(billOperMonth)) { + if ("出库".equals(item.getType()) && "销售".equals(item.getSubType())) { + outPrice = outPrice.add(item.getDiscountLastMoney()); + } + if ("入库".equals(item.getType()) && "销售退货".equals(item.getSubType())) { + inPrice = inPrice.add(item.getDiscountLastMoney()); + } } } + obj.put("x", month); + obj.put("y", roleService.parseHomePriceByLimit(outPrice.subtract(inPrice), "sale", priceLimit, "***", request)); + salePriceList.add(obj); } - obj.put("x", month); - obj.put("y", roleService.parseHomePriceByLimit(outPrice.subtract(inPrice), "sale", priceLimit, "***", request)); - salePriceList.add(obj); - } - map.put("salePriceList", salePriceList); - JSONArray retailPriceList = new JSONArray(); - for(String month: monthList) { - JSONObject obj = new JSONObject(); - BigDecimal outPrice = BigDecimal.ZERO; - BigDecimal inPrice = BigDecimal.ZERO; - for(InOutPriceVo item: inOrOutPriceList) { - String billOperMonth = Tools.dateToStr(item.getOperTime(), "yyyy-MM"); - if(month.equals(billOperMonth)) { - if("出库".equals(item.getType()) && "零售".equals(item.getSubType())) { - outPrice = outPrice.add(item.getTotalPrice().abs()); - } - if("入库".equals(item.getType()) && "零售退货".equals(item.getSubType())) { - inPrice = inPrice.add(item.getTotalPrice().abs()); + map.put("salePriceList", salePriceList); + JSONArray retailPriceList = new JSONArray(); + for (String month : monthList) { + JSONObject obj = new JSONObject(); + BigDecimal outPrice = BigDecimal.ZERO; + BigDecimal inPrice = BigDecimal.ZERO; + for (InOutPriceVo item : inOrOutPriceList) { + String billOperMonth = Tools.dateToStr(item.getOperTime(), "yyyy-MM"); + if (month.equals(billOperMonth)) { + if ("出库".equals(item.getType()) && "零售".equals(item.getSubType())) { + outPrice = outPrice.add(item.getTotalPrice().abs()); + } + if ("入库".equals(item.getType()) && "零售退货".equals(item.getSubType())) { + inPrice = inPrice.add(item.getTotalPrice().abs()); + } } } + obj.put("x", month); + obj.put("y", roleService.parseHomePriceByLimit(outPrice.subtract(inPrice), "retail", priceLimit, "***", request)); + retailPriceList.add(obj); } - obj.put("x", month); - obj.put("y", roleService.parseHomePriceByLimit(outPrice.subtract(inPrice), "retail", priceLimit, "***", request)); - retailPriceList.add(obj); + map.put("retailPriceList", retailPriceList); } - map.put("retailPriceList", retailPriceList); res.code = 200; res.data = map; } catch (Exception e) {