mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复 保存 采购合同 已采购数量 更新问题

master
Harry Yang 2022-12-30 16:22:13 +08:00
parent 721c1d52a7
commit 9093fab194
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/palmte/work/controller/backend/ProcessController.java
View File

@ -428,6 +428,8 @@ public class ProcessController {
purchaseAmount.setAmount(amountForm.amount);
purchaseAmount.setBudgetCostId(amountForm.budgetCostId);
purchaseAmount.setAmountCurrent(amountForm.amountCurrent);
// 更新到数据库
purchaseAmount.setAmountAlready(amountAlready);
// TODO 提交模式才计算 剩余
if (form.getStatus() == ProcessStatus.to_be_audit) {

6
src/main/java/cn/palmte/work/service/ProjectProcessService.java
View File

@ -221,7 +221,11 @@ public class ProjectProcessService {
detail.setBudgetCostId(costDetail.getId());
detail.setCategory(getCategory(costDetail));
detail.setAmountLeft(amount.getAmountLeft());
detail.setAmountAlready(amount.getAmountAlready());
BigDecimal amountAlready = amount.getAmountAlready();
if (amountAlready == null) {
amountAlready = getAmountAlready(amount.getBudgetCostId());
}
detail.setAmountAlready(amountAlready);
detail.setAmountCurrent(amount.getAmountCurrent());
ret.add(detail);
}