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

给计量单位表修改比例的字段类型，给系统参数表增加金额审核启用标记，给单据增加来源字段

Browse Source
This commit is contained in:
季圣华
2023-03-09 00:01:50 +08:00
parent 00cabc2612
commit 61d9d8704f
28 changed files with 608 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
jshERP-boot/src/main/java/com/jsh/erp/controller/AccountController.java
View File

@@ -9,6 +9,7 @@ import com.jsh.erp.datasource.vo.AccountVo4InOutList;
import com.jsh.erp.datasource.vo.AccountVo4List;
import com.jsh.erp.exception.BusinessRunTimeException;
import com.jsh.erp.service.account.AccountService;
import com.jsh.erp.service.systemConfig.SystemConfigService;
import com.jsh.erp.utils.BaseResponseInfo;
import com.jsh.erp.utils.ErpInfo;
import io.swagger.annotations.Api;
@@ -39,6 +40,9 @@ public class AccountController {
@Resource
private AccountService accountService;
@Resource
private SystemConfigService systemConfigService;
/**
* 查找结算账户信息-下拉框
* @param request
@@ -117,12 +121,13 @@ public class AccountController {
//存放数据json数组
JSONArray dataArray = new JSONArray();
if (null != dataList) {
Boolean apprFlag = systemConfigService.getAmountApprovalFlag();
for (AccountVo4InOutList aEx : dataList) {
String type = aEx.getType().replace("其它", "");
aEx.setType(type);
String timeStr = aEx.getOperTime().toString();
BigDecimal balance = accountService.getAccountSum(accountId, timeStr, "date").add(accountService.getAccountSumByHead(accountId, timeStr, "date"))
.add(accountService.getAccountSumByDetail(accountId, timeStr, "date")).add(accountService.getManyAccountSum(accountId, timeStr, "date")).add(initialAmount);
BigDecimal balance = accountService.getAccountSum(accountId, timeStr, "date", apprFlag).add(accountService.getAccountSumByHead(accountId, timeStr, "date", apprFlag))
.add(accountService.getAccountSumByDetail(accountId, timeStr, "date", apprFlag)).add(accountService.getManyAccountSum(accountId, timeStr, "date", apprFlag)).add(initialAmount);
aEx.setBalance(balance);
aEx.setAccountId(accountId);
dataArray.add(aEx);