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 893b59de..bf5d2885 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 @@ -674,7 +674,7 @@ public class DepotItemController { BigDecimal outPrice = depotItemService.inOrOutPrice("入库", "采购", month, roleType); BigDecimal inPrice = depotItemService.inOrOutPrice("出库", "采购退货", month, roleType); obj.put("x", month); - obj.put("y", roleService.parsePriceByLimit(outPrice.subtract(inPrice), "buy", request)); + obj.put("y", roleService.parsePriceByLimit(outPrice.subtract(inPrice), "buy", "***", request)); buyPriceList.add(obj); } map.put("buyPriceList", buyPriceList); @@ -684,7 +684,7 @@ public class DepotItemController { BigDecimal outPrice = depotItemService.inOrOutPrice("出库", "销售", month, roleType); BigDecimal inPrice = depotItemService.inOrOutPrice("入库", "销售退货", month, roleType); obj.put("x", month); - obj.put("y", roleService.parsePriceByLimit(outPrice.subtract(inPrice), "sale", request)); + obj.put("y", roleService.parsePriceByLimit(outPrice.subtract(inPrice), "sale", "***", request)); salePriceList.add(obj); } map.put("salePriceList", salePriceList); @@ -694,7 +694,7 @@ public class DepotItemController { BigDecimal outPrice = depotItemService.inOrOutRetailPrice("出库", "零售", month, roleType); BigDecimal inPrice = depotItemService.inOrOutRetailPrice("入库", "零售退货", month, roleType); obj.put("x", month); - obj.put("y", roleService.parsePriceByLimit(outPrice.subtract(inPrice), "retail", request)); + obj.put("y", roleService.parsePriceByLimit(outPrice.subtract(inPrice), "retail", "***", request)); retailPriceList.add(obj); } map.put("retailPriceList", retailPriceList); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 44aa394f..f643674e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -975,18 +975,18 @@ public class DepotHeadService { yearBegin, yearEnd, creatorArray); //今年零售出库 BigDecimal yearRetailSaleBack = getBuyAndSaleRetailStatistics("入库", "零售退货", yearBegin, yearEnd, creatorArray); //今年零售退货 - map.put("todayBuy", roleService.parsePriceByLimit(todayBuy.subtract(todayBuyBack), "buy", request)); - map.put("todaySale", roleService.parsePriceByLimit(todaySale.subtract(todaySaleBack), "sale", request)); - map.put("todayRetailSale", roleService.parsePriceByLimit(todayRetailSale.subtract(todayRetailSaleBack), "retail", request)); - map.put("monthBuy", roleService.parsePriceByLimit(monthBuy.subtract(monthBuyBack), "buy", request)); - map.put("monthSale", roleService.parsePriceByLimit(monthSale.subtract(monthSaleBack), "sale", request)); - map.put("monthRetailSale", roleService.parsePriceByLimit(monthRetailSale.subtract(monthRetailSaleBack), "retail", request)); - map.put("yesterdayBuy", roleService.parsePriceByLimit(yesterdayBuy.subtract(yesterdayBuyBack), "buy", request)); - map.put("yesterdaySale", roleService.parsePriceByLimit(yesterdaySale.subtract(yesterdaySaleBack), "sale", request)); - map.put("yesterdayRetailSale", roleService.parsePriceByLimit(yesterdayRetailSale.subtract(yesterdayRetailSaleBack), "retail", request)); - map.put("yearBuy", roleService.parsePriceByLimit(yearBuy.subtract(yearBuyBack), "buy", request)); - map.put("yearSale", roleService.parsePriceByLimit(yearSale.subtract(yearSaleBack), "sale", request)); - map.put("yearRetailSale", roleService.parsePriceByLimit(yearRetailSale.subtract(yearRetailSaleBack), "retail", request)); + map.put("todayBuy", roleService.parsePriceByLimit(todayBuy.subtract(todayBuyBack), "buy", "***", request)); + map.put("todaySale", roleService.parsePriceByLimit(todaySale.subtract(todaySaleBack), "sale", "***", request)); + map.put("todayRetailSale", roleService.parsePriceByLimit(todayRetailSale.subtract(todayRetailSaleBack), "retail", "***", request)); + map.put("monthBuy", roleService.parsePriceByLimit(monthBuy.subtract(monthBuyBack), "buy", "***", request)); + map.put("monthSale", roleService.parsePriceByLimit(monthSale.subtract(monthSaleBack), "sale", "***", request)); + map.put("monthRetailSale", roleService.parsePriceByLimit(monthRetailSale.subtract(monthRetailSaleBack), "retail", "***", request)); + map.put("yesterdayBuy", roleService.parsePriceByLimit(yesterdayBuy.subtract(yesterdayBuyBack), "buy", "***", request)); + map.put("yesterdaySale", roleService.parsePriceByLimit(yesterdaySale.subtract(yesterdaySaleBack), "sale", "***", request)); + map.put("yesterdayRetailSale", roleService.parsePriceByLimit(yesterdayRetailSale.subtract(yesterdayRetailSaleBack), "retail", "***", request)); + map.put("yearBuy", roleService.parsePriceByLimit(yearBuy.subtract(yearBuyBack), "buy", "***", request)); + map.put("yearSale", roleService.parsePriceByLimit(yearSale.subtract(yearSaleBack), "sale", "***", request)); + map.put("yearRetailSale", roleService.parsePriceByLimit(yearRetailSale.subtract(yearRetailSaleBack), "retail", "***", request)); return map; } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java index 190c3f4c..15b30f67 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/role/RoleService.java @@ -224,18 +224,18 @@ public class RoleService { * @param type * @return */ - public Object parsePriceByLimit(BigDecimal price, String type, HttpServletRequest request) throws Exception { + public Object parsePriceByLimit(BigDecimal price, String type, String emptyInfo, HttpServletRequest request) throws Exception { Long userId = userService.getUserId(request); String priceLimit = userService.getRoleTypeByUserId(userId).getPriceLimit(); if(StringUtil.isNotEmpty(priceLimit)) { if("buy".equals(type) && priceLimit.contains("1")) { - return "***"; + return emptyInfo; } if("retail".equals(type) && priceLimit.contains("2")) { - return "***"; + return emptyInfo; } if("sale".equals(type) && priceLimit.contains("3")) { - return "***"; + return emptyInfo; } } return price;