From 137c01ef6483284f4fbb32c5656daccdbdc52931 Mon Sep 17 00:00:00 2001
From: double <768903061@qq.com>
Date: Fri, 14 Jun 2019 10:54:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E7=BB=9F=E8=AE=A1=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E6=80=BB=E9=94=80=E5=94=AE=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/jsh/erp/controller/DepotItemController.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java
index f78f0f86..dca9edd1 100644
--- a/src/main/java/com/jsh/erp/controller/DepotItemController.java
+++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java
@@ -584,6 +584,7 @@ public class DepotItemController {
                     BigDecimal OutSumPrice = sumPriceBuyOrSale("出库", "销售", diEx.getMId(), monthTime);
                     BigDecimal InSumRetailPrice = sumPriceBuyOrSale("入库", "零售退货", diEx.getMId(), monthTime);
                     BigDecimal InSumPrice = sumPriceBuyOrSale("入库", "销售退货", diEx.getMId(), monthTime);
+                    BigDecimal OutInSumPrice = (OutSumRetailPrice.add(OutSumPrice)).subtract(InSumRetailPrice.add(InSumPrice));
                     item.put("MaterialName", diEx.getMName());
                     item.put("MaterialModel", diEx.getMModel());
                     //扩展信息
@@ -595,6 +596,7 @@ public class DepotItemController {
                     item.put("InSum", InSumRetail.add(InSum));
                     item.put("OutSumPrice", OutSumRetailPrice.add(OutSumPrice));
                     item.put("InSumPrice", InSumRetailPrice.add(InSumPrice));
+                    item.put("OutInSumPrice",OutInSumPrice);//实际销售金额
                     dataArray.add(item);
                 }
             }