From 25cea4ea7f7486645ca45e74fc7ae724e01936cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Thu, 7 Dec 2017 23:44:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BA=93=E5=AD=98=E7=8A=B6?= =?UTF-8?q?=E5=86=B5=E7=9A=84=E5=AF=BC=E5=87=BA=E6=8A=A5=E8=A1=A8=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jsh/action/materials/DepotItemAction.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/jsh/action/materials/DepotItemAction.java b/src/main/java/com/jsh/action/materials/DepotItemAction.java index 3463192d..b0969e38 100644 --- a/src/main/java/com/jsh/action/materials/DepotItemAction.java +++ b/src/main/java/com/jsh/action/materials/DepotItemAction.java @@ -751,6 +751,10 @@ public class DepotItemAction extends BaseAction Double prevPrice = sumPrice("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumPrice("出库", pid,depotItem.getMaterialId().getId(), model.getMonthTime(), true); Double InPrice = sumPrice("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),false); Double OutPrice = sumPrice("出库",pid, depotItem.getMaterialId().getId(), model.getMonthTime(), false); + Double unitPrice = 0.0; + if(prevSum + InSum - OutSum != 0) { + unitPrice = (prevPrice + InPrice - OutPrice)/(prevSum + InSum - OutSum); + } item.put("Id", depotItem.getId()); item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId()); item.put("MaterialName", depotItem.getMaterialId().getName()); @@ -758,7 +762,7 @@ public class DepotItemAction extends BaseAction item.put("MaterialStandard", depotItem.getMaterialId().getStandard()); item.put("MaterialColor", depotItem.getMaterialId().getColor()); item.put("MaterialUnit", depotItem.getMaterialId().getUnit()); - item.put("UnitPrice", (prevPrice + InPrice - OutPrice)/(prevSum + InSum - OutSum)); + item.put("UnitPrice", unitPrice); item.put("prevSum", prevSum); item.put("InSum", InSum); item.put("OutSum", OutSum);