diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index caae7441..226abee3 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -2307,7 +2307,7 @@ public class DepositoryRecordController { * @param jsonObject 带查询数据 */ @PostMapping("/getApplicationForMaterial") - public RestResponse getInventoryApplication(@RequestBody JSONObject jsonObject) { + public RestResponse getInventoryApplication(@RequestBody JSONObject jsonObject, HttpServletRequest request) { Integer id = jsonObject.getInteger("id"); // 获取当前物料的库存数据 Inventory inventoryById = materialService.findInventoryById(id); @@ -2395,19 +2395,33 @@ public class DepositoryRecordController { Map countItemForInventory = depositoryRecordService.createStackedAreaChartSeriesItem("count", inventoryCountList); Map amountItemForInventory = depositoryRecordService.createStackedAreaChartSeriesItem("amount", inventoryAmountList); Map result = new HashMap<>(); - result.put("amountItemForIn", amountItemForIn); + result.put("countItemForIn", countItemForIn); - result.put("amountItemForOut", amountItemForOut); + result.put("countItemForOut", countItemForOut); Map> legendItem = new HashMap<>(); List legends = new ArrayList<>(); legends.add("count"); - legends.add("amount"); + legendItem.put("data", legends); - result.put("legend", legendItem); + result.put("dayNames", dayNames); result.put("countItemForInventory", countItemForInventory); - result.put("amountItemForInventory", amountItemForInventory); + + + String userAgent = request.getHeader("user-agent"); + String token = request.getHeader("user-token"); + if (token == null) { + token = (String) request.getSession().getAttribute("userToken"); + } + UserByPort userToken = AuthenticationTokenPool.getUserToken(token); + if (PublicConfig.roleAdminorgList.contains(userToken.getMaindeparment())) { + result.put("amountItemForInventory", amountItemForInventory); + result.put("amountItemForOut", amountItemForOut); + result.put("amountItemForIn", amountItemForIn); + legends.add("amount"); + } + result.put("legend", legendItem); return new RestResponse(result); } diff --git a/src/main/resources/templates/pages/material/material-view_back.html b/src/main/resources/templates/pages/material/material-view_back.html index f8ded99a..266c49ac 100644 --- a/src/main/resources/templates/pages/material/material-view_back.html +++ b/src/main/resources/templates/pages/material/material-view_back.html @@ -171,7 +171,7 @@ @@ -247,7 +247,7 @@ title: '计量单位', templet: '#unitItemList', }, - {field: 'place', width: 100, title: '所处库位', templet: '#placeItemList'}, + {field: 'place', width: 150, title: '所处库位', templet: '#placeItemList'}, {title: '库存数', width: 230, templet: '#quantityItem', align: "center"}, {field: 'remark', width: 150, title: '备注'}, {title: '操作', width: 150, toolbar: '#currentTableBar', align: "center"},