purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改库存状况打印和导出功能金额为小数点后保留两位

Browse Source 
(cherry picked from commit 36139e26a4)
This commit is contained in:
cjl
2019-01-15 15:00:52 +08:00
parent 693a7558ba
commit 12abd18e6b
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -15,6 +15,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File; import java.io.File;
import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -440,6 +441,11 @@ public class DepotItemController {
Double unitPrice = 0.0; Double unitPrice = 0.0;
if (prevSum + InSum - OutSum != 0.0) { if (prevSum + InSum - OutSum != 0.0) {
unitPrice = (prevPrice + InPrice - OutPrice) / (prevSum + InSum - OutSum); 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("UnitPrice", unitPrice);
item.put("prevSum", prevSum); item.put("prevSum", prevSum);
@@ -721,6 +727,11 @@ public class DepotItemController {
Double unitPrice = 0.0; Double unitPrice = 0.0;
if (prevSum + InSum - OutSum != 0.0) { if (prevSum + InSum - OutSum != 0.0) {
unitPrice = (prevPrice + InPrice - OutPrice) / (prevSum + InSum - OutSum); 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 thisSum = prevSum + InSum - OutSum;
Double thisAllPrice = prevPrice + InPrice - OutPrice; Double thisAllPrice = prevPrice + InPrice - OutPrice;
@@ -743,10 +754,10 @@ public class DepotItemController {
e.printStackTrace(); e.printStackTrace();
message = "导出失败"; message = "导出失败";
res.code = 500; res.code = 500;
} finally {
map.put("message", message);
res.data = map;
} }
/**
* 2019-01-15response已经返回，finally部分完全没必要
* */
return res; return res;
} }