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

给首页的金额进行权限控制

Browse Source
This commit is contained in:
季圣华
2022-10-23 17:09:48 +08:00
parent 9cf74048c4
commit fa300cc964
7 changed files with 57 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
View File

@@ -425,7 +425,7 @@ public class DepotHeadController {
String yearBegin = Tools.getYearBegin() + BusinessConstants.DAY_FIRST_TIME;
String yearEnd = Tools.getYearEnd() + BusinessConstants.DAY_LAST_TIME;
Map<String, Object> map = depotHeadService.getBuyAndSaleStatistics(today, monthFirstDay,
yesterdayBegin, yesterdayEnd, yearBegin, yearEnd, roleType);
yesterdayBegin, yesterdayEnd, yearBegin, yearEnd, roleType, request);
res.code = 200;
res.data = map;
} catch(Exception e){

10
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -14,6 +14,7 @@ import com.jsh.erp.service.materialExtend.MaterialExtendService;
import com.jsh.erp.service.depotItem.DepotItemService;
import com.jsh.erp.service.material.MaterialService;
import com.jsh.erp.service.redis.RedisService;
import com.jsh.erp.service.role.RoleService;
import com.jsh.erp.service.unit.UnitService;
import com.jsh.erp.utils.*;
import io.swagger.annotations.Api;
@@ -58,6 +59,9 @@ public class DepotItemController {
@Resource
private DepotService depotService;
@Resource
private RoleService roleService;
/**
* 根据仓库和商品查询单据列表
* @param mId
@@ -670,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", outPrice.subtract(inPrice));
obj.put("y", roleService.parsePriceByLimit(outPrice.subtract(inPrice), "buy", request));
buyPriceList.add(obj);
}
map.put("buyPriceList", buyPriceList);
@@ -680,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", outPrice.subtract(inPrice));
obj.put("y", roleService.parsePriceByLimit(outPrice.subtract(inPrice), "sale", request));
salePriceList.add(obj);
}
map.put("salePriceList", salePriceList);
@@ -690,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", outPrice.subtract(inPrice));
obj.put("y", roleService.parsePriceByLimit(outPrice.subtract(inPrice), "retail", request));
retailPriceList.add(obj);
}
map.put("retailPriceList", retailPriceList);

2
jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
View File

@@ -140,7 +140,7 @@ public class UserController {
Map<String, Object> data = new HashMap<String, Object>();
data.put("msgTip", msgTip);
if(user!=null){
String roleType = userService.getRoleTypeByUserId(user.getId()); //角色类型
String roleType = userService.getRoleTypeByUserId(user.getId()).getType(); //角色类型
redisService.storageObjectBySession(token,"roleType",roleType);
redisService.storageObjectBySession(token,"clientIp", Tools.getLocalIp(request));
logService.insertLogWithUserId(user.getId(), user.getTenantId(), "用户",