From 12abd18e6bd152d184e3c3fa4be0dbdf979d7fab Mon Sep 17 00:00:00 2001 From: cjl Date: Tue, 15 Jan 2019 15:00:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E7=8A=B6?= =?UTF-8?q?=E5=86=B5=E6=89=93=E5=8D=B0=E5=92=8C=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E9=87=91=E9=A2=9D=E4=B8=BA=E5=B0=8F=E6=95=B0=E7=82=B9?= =?UTF-8?q?=E5=90=8E=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 36139e26a4819f9251f9b3c5e58aa00ba2689544) --- .../jsh/erp/controller/DepotItemController.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/jsh/erp/controller/DepotItemController.java b/src/main/java/com/jsh/erp/controller/DepotItemController.java index 60adcbd6..e93f852f 100644 --- a/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -15,6 +15,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.File; +import java.text.DecimalFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -440,6 +441,11 @@ public class DepotItemController { Double unitPrice = 0.0; if (prevSum + InSum - OutSum != 0.0) { unitPrice = (prevPrice + InPrice - OutPrice) / (prevSum + InSum - OutSum); + /** + * 2019-01-15通过除法算出金额后，保留两位小数 + * */ + DecimalFormat df = new DecimalFormat("#.00"); + unitPrice= Double.parseDouble(df.format(unitPrice)); } item.put("UnitPrice", unitPrice); item.put("prevSum", prevSum); @@ -721,6 +727,11 @@ public class DepotItemController { Double unitPrice = 0.0; if (prevSum + InSum - OutSum != 0.0) { unitPrice = (prevPrice + InPrice - OutPrice) / (prevSum + InSum - OutSum); + /** + * 2019-01-15通过除法算出金额后，保留两位小数 + * */ + DecimalFormat df = new DecimalFormat("#.00"); + unitPrice= Double.parseDouble(df.format(unitPrice)); } Double thisSum = prevSum + InSum - OutSum; Double thisAllPrice = prevPrice + InPrice - OutPrice; @@ -743,10 +754,10 @@ public class DepotItemController { e.printStackTrace(); message = "导出失败"; res.code = 500; - } finally { - map.put("message", message); - res.data = map; } + /** + * 2019-01-15response已经返回，finally部分完全没必要 + * */ return res; }