Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
ce8037ec
Commit
ce8037ec
authored
Sep 22, 2017
by
季圣华
Browse files
单据中的结算账户的查看bug优化
parent
695bdf7d
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/main/java/com/jsh/action/basic/AccountAction.java
View file @
ce8037ec
...
@@ -305,7 +305,10 @@ public class AccountAction extends BaseAction<AccountModel>
...
@@ -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
);
...
...
src/main/java/com/jsh/action/materials/DepotHeadAction.java
View file @
ce8037ec
...
@@ -194,7 +194,12 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
...
@@ -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
());
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment