From a6734fd6bd747ead0207bd1f4a983d1da34e1f1b Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Fri, 30 Dec 2022 10:25:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=87=87=E8=B4=AD=E6=B8=85?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/palmte/work/service/ProjectProcessService.java | 2 +- src/main/resources/sql/2.0.sql | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/palmte/work/service/ProjectProcessService.java b/src/main/java/cn/palmte/work/service/ProjectProcessService.java index 1a0c201..e315244 100644 --- a/src/main/java/cn/palmte/work/service/ProjectProcessService.java +++ b/src/main/java/cn/palmte/work/service/ProjectProcessService.java @@ -217,7 +217,7 @@ public class ProjectProcessService { if (processId != null) { // 根据 processId 确定唯一的 BudgetPurchaseAmount 用作获取详情 , 可能还未创建 - BudgetPurchaseAmount purchaseAmount = getPurchaseAmount(projectId, processId); + BudgetPurchaseAmount purchaseAmount = getPurchaseAmount(costDetail.getId(), processId); if (purchaseAmount != null) { Integer amountId = purchaseAmount.getId(); List purchaseDetails = getBudgetPurchaseDetails(amountId); diff --git a/src/main/resources/sql/2.0.sql b/src/main/resources/sql/2.0.sql index ca73503..5028cca 100644 --- a/src/main/resources/sql/2.0.sql +++ b/src/main/resources/sql/2.0.sql @@ -83,8 +83,9 @@ create table procurement_contract_budget_purchase_amount UNIQUE key (process_id, budget_cost_id) ) comment '采购合同流程预算采购明细的数量记录'; -alter table procurement_contract_budget_purchase_amount - add amount decimal(11, 2) comment '总共要采购数量' after id; +alter table procurement_contract_budget_purchase_detail + add budget_cost_id int not null comment '成本ID' +; create table procurement_contract_budget_purchase_detail (