From e387338efad5debe1d7feadd7baac00c07f6915a Mon Sep 17 00:00:00 2001 From: erdanergou Date: Sun, 9 Jul 2023 16:14:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E9=A1=B5=E9=9D=A2=E4=B8=AD=E5=9B=BE=E6=A0=87=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DepositoryRecordController.java | 10 +- .../impl/DepositoryRecordServiceImpl.java | 3 + .../pages/material/material-view_back.html | 174 +++++++----------- 3 files changed, 80 insertions(+), 107 deletions(-) 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 f4118d13..caae7441 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -2348,7 +2348,7 @@ public class DepositoryRecordController { List dayTimeSpaces = ObjectFormatUtil.objToList(monthBeginToNow.get("dayTimeSpace"), Long.class); dayTimeSpaces.add(Calendar.getInstance().getTimeInMillis()); // 获取当前物料的入库总额与数量 - Map seriesForApplicationIn = depositoryRecordService.getApplicationByMaterial(id, dayTimeSpaces, 1,flagForSplitInfo,splitInfo); + Map seriesForApplicationIn = depositoryRecordService.getApplicationByMaterial(id, dayTimeSpaces, 1, flagForSplitInfo, splitInfo); Object amountItemForIn = seriesForApplicationIn.get("amountItem"); Object countItemForIn = seriesForApplicationIn.get("countItem"); @@ -2358,7 +2358,7 @@ public class DepositoryRecordController { List amountListForIn = ObjectFormatUtil.objToList(countItemForInMapString.get("data"), Double.class); // 获取当前物料的出库总额与数量 - Map seriesForApplicationOut = depositoryRecordService.getApplicationByMaterial(id, dayTimeSpaces, 2,flagForSplitInfo,splitInfo); + Map seriesForApplicationOut = depositoryRecordService.getApplicationByMaterial(id, dayTimeSpaces, 2, flagForSplitInfo, splitInfo); Object amountItemForOut = seriesForApplicationOut.get("amountItem"); Object countItemForOut = seriesForApplicationOut.get("countItem"); @@ -2370,8 +2370,13 @@ public class DepositoryRecordController { List inventoryCountList = new ArrayList<>(); // 定义库存总额列表 + int scale = 1; // 获取当前物料单价 Double price = inventoryById.getPrice(); + if (flagForSplitInfo) { + scale = splitUnitService.findSplitInfoScaleQuantity(splitInfo, -1); + price = ObjectFormatUtil.divide(price, scale, 2); + } // 获取当前物料总额 double amount = ObjectFormatUtil.multiply(inventory, price); // 添加 @@ -2383,6 +2388,7 @@ public class DepositoryRecordController { inventoryCountList.add(inventory); inventoryAmountList.add(ObjectFormatUtil.multiply(inventory, price)); } + // 反转 Collections.reverse(inventoryAmountList); Collections.reverse(inventoryCountList); diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index c9edc6eb..b86d65d8 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -2177,6 +2177,9 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { // 获取当前物料的单价 double price = ObjectFormatUtil.divide(inventoryById.getPrice(), 100.0, 2); + if(flagForSplit){ + price = ObjectFormatUtil.divide(price, scale, 2); + } // 获取当前物料的总额 amount = ObjectFormatUtil.multiply(price, count); } 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 71c02019..1b3ad0a7 100644 --- a/src/main/resources/templates/pages/material/material-view_back.html +++ b/src/main/resources/templates/pages/material/material-view_back.html @@ -76,60 +76,6 @@
库存基本信息
- -
@@ -229,6 +175,10 @@ } + function initEchart() { + + } + var barCode = []; var flag = false; @@ -292,6 +242,65 @@ }); + // 柱状图 + var echartLineChartIn = echarts.init(document.getElementById('echarts-line-in')); + var echartLineChartOut = echarts.init(document.getElementById('echarts-line-out')); + var echartLineChartInventory = echarts.init(document.getElementById('echarts-line-inventory')); + var optionLineChartIn = { + xAxis: { + type: 'category', + boundaryGap: false, + data: [] + }, + yAxis: { + type: 'value' + }, + tooltip: { + trigger: "axis", + }, + series: [] + + }; + var optionLineChartOut = { + xAxis: { + type: 'category', + boundaryGap: false, + data: [] + }, + yAxis: { + type: 'value' + }, + tooltip: { + trigger: "axis", + }, + series: [] + + }; + var optionLineChartInventory = { + xAxis: { + type: 'category', + boundaryGap: false, + data: [] + }, + yAxis: { + type: 'value' + }, + tooltip: { + trigger: "axis", + }, + series: [] + + }; + + // 数据行点击事件 + table.on('row(currentTableId)', function(obj){ + var data = obj.data; // 获取当前行数据 + let id = data.id; + let req = {}; + req.id = id; + initEchart(req); + }); + form.on('select()', function (data) { var id = data.elem.id; //得到select原始DOM对象id @@ -484,62 +493,15 @@ }; - // 柱状图 - var echartLineChartIn = echarts.init(document.getElementById('echarts-line-in')); - var echartLineChartOut = echarts.init(document.getElementById('echarts-line-out')); - var echartLineChartInventory = echarts.init(document.getElementById('echarts-line-inventory')); - var optionLineChartIn = { - xAxis: { - type: 'category', - boundaryGap: false, - data: [] - }, - yAxis: { - type: 'value' - }, - tooltip: { - trigger: "axis", - }, - series: [] - - }; - var optionLineChartOut = { - xAxis: { - type: 'category', - boundaryGap: false, - data: [] - }, - yAxis: { - type: 'value' - }, - tooltip: { - trigger: "axis", - }, - series: [] - - }; - var optionLineChartInventory = { - xAxis: { - type: 'category', - boundaryGap: false, - data: [] - }, - yAxis: { - type: 'value' - }, - tooltip: { - trigger: "axis", - }, - series: [] - }; - /*$.ajax({ + initEchart = function(req) { + $.ajax({ url: '/depositoryRecord/getApplicationForMaterial', type: 'post', async: true, dataType: "json", - data: JSON.stringify({"id": id}), + data: JSON.stringify(req), contentType: "application/json;charset=utf-8", complete: function (XHR, TS) { layer.close(this.layerIndex); @@ -583,7 +545,9 @@ echartLineChartOut.setOption(optionLineChartOut); echartLineChartInventory.setOption(optionLineChartInventory); } - })*/ + }) + } + });