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

解决库存状况的导出报表的bug

Browse Source
This commit is contained in:
季圣华
2017-12-07 23:44:18 +08:00
parent 95e036b9a0
commit 25cea4ea7f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/jsh/action/materials/DepotItemAction.java
View File

@@ -751,6 +751,10 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
Double prevPrice = sumPrice("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),true) - sumPrice("出库", pid,depotItem.getMaterialId().getId(), model.getMonthTime(), true); 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 InPrice = sumPrice("入库",pid,depotItem.getMaterialId().getId(),model.getMonthTime(),false);
Double OutPrice = 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("Id", depotItem.getId());
item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId()); item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId());
item.put("MaterialName", depotItem.getMaterialId().getName()); item.put("MaterialName", depotItem.getMaterialId().getName());
@@ -758,7 +762,7 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
item.put("MaterialStandard", depotItem.getMaterialId().getStandard()); item.put("MaterialStandard", depotItem.getMaterialId().getStandard());
item.put("MaterialColor", depotItem.getMaterialId().getColor()); item.put("MaterialColor", depotItem.getMaterialId().getColor());
item.put("MaterialUnit", depotItem.getMaterialId().getUnit()); 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("prevSum", prevSum);
item.put("InSum", InSum); item.put("InSum", InSum);
item.put("OutSum", OutSum); item.put("OutSum", OutSum);