From e2d4e7eba8bb0e910ddee6585c5487ef4c010990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Fri, 5 Jun 2020 00:10:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=93=E5=AD=98=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=8A=A5=E8=A1=A8=E7=9A=84=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jsh/erp/controller/DepotItemController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java index cf0328aa..aa116fab 100644 --- a/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -358,13 +358,13 @@ public class DepotItemController { objs[0] = diEx.getMName().toString(); objs[1] = diEx.getMModel().toString(); objs[2] = diEx.getMaterialUnit().toString(); - objs[3] = getUnitPrice(diEx.getPresetPriceOne(), diEx.getPriceStrategy()).toString(); + objs[3] = diEx.getPurchaseDecimal().toString(); objs[4] = depotItemService.getStockByParam(depotId,mId,null,timeA,tenantId).toString(); objs[5] = depotItemService.getInNumByParam(depotId,mId,timeA,timeB,tenantId).toString(); objs[6] = depotItemService.getOutNumByParam(depotId,mId,timeA,timeB,tenantId).toString(); BigDecimal thisSum = depotItemService.getStockByParam(depotId,mId,null,timeB,tenantId); objs[7] = thisSum.toString(); - objs[8] = thisSum.multiply(getUnitPrice(diEx.getPresetPriceOne(), diEx.getPriceStrategy())).toString(); + objs[8] = thisSum.multiply(diEx.getPurchaseDecimal()).toString(); objects.add(objs); } }