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-09-22 23:10:32 +08:00
parent 695bdf7dfc
commit ce8037ec58
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/jsh/action/basic/AccountAction.java
View File

@@ -305,7 +305,10 @@ public class AccountAction extends BaseAction<AccountModel>
item.put("initialAmount", account.getInitialAmount()); item.put("initialAmount", account.getInitialAmount());
String monthTime = Tools.getCurrentMonth(); String monthTime = Tools.getCurrentMonth();
Double thisMonthAmount = getAccountSum(account.getId(), monthTime) + getAccountSumByHead(account.getId(), monthTime) +getAccountSumByDetail(account.getId(), monthTime); Double thisMonthAmount = getAccountSum(account.getId(), monthTime) + getAccountSumByHead(account.getId(), monthTime) +getAccountSumByDetail(account.getId(), monthTime);
String thisMonthAmountFmt=df.format(thisMonthAmount); String thisMonthAmountFmt = "0";
if(thisMonthAmount!=0){
thisMonthAmountFmt = df.format(thisMonthAmount);
}
item.put("thisMonthAmount", thisMonthAmountFmt); //本月发生额 item.put("thisMonthAmount", thisMonthAmountFmt); //本月发生额
Double currentAmount = getAccountSum(account.getId(),"") + getAccountSumByHead(account.getId(), "") + getAccountSumByDetail(account.getId(), "") + account.getInitialAmount(); Double currentAmount = getAccountSum(account.getId(),"") + getAccountSumByHead(account.getId(), "") + getAccountSumByDetail(account.getId(), "") + account.getInitialAmount();
String currentAmountFmt=df.format(currentAmount); String currentAmountFmt=df.format(currentAmount);

7
src/main/java/com/jsh/action/materials/DepotHeadAction.java
View File

@@ -194,7 +194,12 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
if(model.getOrganId()!=null){depotHead.setOrganId(new Supplier(model.getOrganId()));} if(model.getOrganId()!=null){depotHead.setOrganId(new Supplier(model.getOrganId()));}
if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));} if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));}
depotHead.setSalesman(model.getSalesman()); depotHead.setSalesman(model.getSalesman());
if(model.getAccountId()!=null){depotHead.setAccountId(new Account(model.getAccountId()));} if(model.getAccountId()!=null){
depotHead.setAccountId(new Account(model.getAccountId()));
}
else {
depotHead.setAccountId(null);
}
depotHead.setChangeAmount(model.getChangeAmount()); depotHead.setChangeAmount(model.getChangeAmount());
depotHead.setAccountIdList(model.getAccountIdList()); depotHead.setAccountIdList(model.getAccountIdList());
depotHead.setAccountMoneyList(model.getAccountMoneyList()); depotHead.setAccountMoneyList(model.getAccountMoneyList());