diff --git a/src/main/java/cn/palmte/work/model/process/BudgetPurchaseAmount.java b/src/main/java/cn/palmte/work/model/process/BudgetPurchaseAmount.java index 4371b8a..1bc0734 100644 --- a/src/main/java/cn/palmte/work/model/process/BudgetPurchaseAmount.java +++ b/src/main/java/cn/palmte/work/model/process/BudgetPurchaseAmount.java @@ -31,6 +31,8 @@ public class BudgetPurchaseAmount implements Serializable { @GenericGenerator(name = "persistenceGenerator", strategy = "increment") private Integer id; + // TODO 撤回的时候 amountAlready 数据一致问题 + // 已采购数量 private BigDecimal amountAlready; diff --git a/src/main/java/cn/palmte/work/model/process/BudgetPurchaseDetail.java b/src/main/java/cn/palmte/work/model/process/BudgetPurchaseDetail.java index 48d0838..4d1cdb5 100644 --- a/src/main/java/cn/palmte/work/model/process/BudgetPurchaseDetail.java +++ b/src/main/java/cn/palmte/work/model/process/BudgetPurchaseDetail.java @@ -44,13 +44,13 @@ public class BudgetPurchaseDetail implements Serializable { private String spec; // 对应采购数目 - private Integer procurementAmount; + private BigDecimal procurementAmount; // 采购单价 private BigDecimal procurementPrice; // 含税总金额(元) - private String totalTaxInclude; + private BigDecimal totalTaxInclude; private Integer processId; diff --git a/src/main/java/cn/palmte/work/model/process/BudgetPurchaseDetailModel.java b/src/main/java/cn/palmte/work/model/process/BudgetPurchaseDetailModel.java index 4acd604..995733d 100644 --- a/src/main/java/cn/palmte/work/model/process/BudgetPurchaseDetailModel.java +++ b/src/main/java/cn/palmte/work/model/process/BudgetPurchaseDetailModel.java @@ -26,12 +26,12 @@ public class BudgetPurchaseDetailModel { private String spec; // 对应采购数目 - private Integer procurementAmount; + private BigDecimal procurementAmount; // 采购单价 private BigDecimal procurementPrice; // 含税总金额(元) - private String totalTaxInclude; + private BigDecimal totalTaxInclude; } diff --git a/src/main/resources/sql/2.0.sql b/src/main/resources/sql/2.0.sql index ee10fb5..d1eebf7 100644 --- a/src/main/resources/sql/2.0.sql +++ b/src/main/resources/sql/2.0.sql @@ -88,7 +88,7 @@ create table procurement_contract_budget_purchase_detail manufacturer_name varchar(255) null comment '设备厂商名称', purchase_list varchar(255) null comment '对应采购清单', spec varchar(255) null comment '规格型号', - procurement_amount int null comment '对应采购数目', + procurement_amount decimal(11, 2) null comment '对应采购数目', procurement_price decimal(19, 5) null comment '采购单价', total_tax_include decimal(19, 5) null comment '含税总金额(元)',