From 4740f30d088e1c669b0b1d3bd8c665be7a19b080 Mon Sep 17 00:00:00 2001
From: Harry Yang <i.take.today@gmail.com>
Date: Wed, 28 Dec 2022 18:16:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=20=E8=8E=B7=E5=8F=96=E9=A2=84=E7=AE=97=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../work/controller/backend/ProcessController.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
index 83d0380..1cb6f26 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java
@@ -47,7 +47,6 @@ import cn.palmte.work.config.activiti.ActProjectTypeEnum;
 import cn.palmte.work.model.Admin;
 import cn.palmte.work.model.DeptRepository;
 import cn.palmte.work.model.Project;
-import cn.palmte.work.model.ProjectBudgetCostDetail;
 import cn.palmte.work.model.ProjectBudgetIncomeDetail;
 import cn.palmte.work.model.ProjectRepository;
 import cn.palmte.work.model.ProjectTaskRecord;
@@ -58,6 +57,7 @@ import cn.palmte.work.model.enums.ProcessType;
 import cn.palmte.work.model.enums.ProcurementMode;
 import cn.palmte.work.model.enums.ProjectType;
 import cn.palmte.work.model.enums.SealType;
+import cn.palmte.work.model.process.ProcurementDetail;
 import cn.palmte.work.model.process.BudgetPurchaseAmount;
 import cn.palmte.work.model.process.BudgetPurchaseDetail;
 import cn.palmte.work.model.process.ProcessAttachment;
@@ -67,8 +67,8 @@ import cn.palmte.work.model.process.ProjectProcessRepository;
 import cn.palmte.work.model.process.SaleContract;
 import cn.palmte.work.model.process.SealTypeArray;
 import cn.palmte.work.model.process.SupplierMaterial;
-import cn.palmte.work.model.process.form.BudgetPurchaseAmountForm;
-import cn.palmte.work.model.process.form.BudgetPurchaseDetailForm;
+import cn.palmte.work.model.process.BudgetPurchaseAmountModel;
+import cn.palmte.work.model.process.BudgetPurchaseDetailModel;
 import cn.palmte.work.model.process.form.ProcessCreationForm;
 import cn.palmte.work.model.process.form.ProcessQueryForm;
 import cn.palmte.work.model.process.form.ProcessUpdateForm;
@@ -252,7 +252,7 @@ public class ProcessController {
     public String terminalCustomer;
 
     public List<ProjectBudgetIncomeDetail> incomeDetails;
-    public List<ProjectBudgetCostDetail> procurementDetails;
+    public List<ProcurementDetail> procurementDetails;
 
     // FIXME 垫资
     // 是否垫资
@@ -286,8 +286,8 @@ public class ProcessController {
 
     BigDecimal repaidAmount = getRepaidAmount(id);
     // 可以在对应表数据查询 是否存在再启用
+    List<ProcurementDetail> procurementDetails = processService.getProcurementDetails(id);
     List<ProjectBudgetIncomeDetail> incomeDetails = projectBudgetService.getBudgetIncomeDetail(project);
-    List<ProjectBudgetCostDetail> procurementDetails = projectBudgetService.getBudgetCostDetail(project);
     return ProjectReturnValue.builder()
             .isPrepaid(isPrepaid(project))
             .projectId(project.getId())
@@ -402,7 +402,7 @@ public class ProcessController {
       }
 
       if (!CollectionUtils.isEmpty(form.getPurchaseAmount())) {
-        for (BudgetPurchaseAmountForm amountForm : form.getPurchaseAmount()) {
+        for (BudgetPurchaseAmountModel amountForm : form.getPurchaseAmount()) {
           // 保存 成本明细数量
           BudgetPurchaseAmount amountEntity = new BudgetPurchaseAmount();
           BeanUtils.copyProperties(amountForm, amountEntity, "details");
@@ -415,7 +415,7 @@ public class ProcessController {
           // 保存成本对应的 明细
 
           if (!CollectionUtils.isEmpty(amountForm.getDetails())) {
-            for (BudgetPurchaseDetailForm detail : amountForm.getDetails()) {
+            for (BudgetPurchaseDetailModel detail : amountForm.getDetails()) {
               BudgetPurchaseDetail purchaseDetail = new BudgetPurchaseDetail();
               BeanUtils.copyProperties(detail, purchaseDetail, "details");