yinq
/
hwbm-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.0.36.0：

Browse Source 
预算相关domain数值类型的由Long改为BigDecimal
dev
xs 1 month ago
parent dfad1177ee
commit 0e5f92055f
10 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File

5
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpBudgetDetail.java
Unescape Escape View File

@ -6,6 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal;
/** /**
* 项目预算详情对象 erp_budget_detail * 项目预算详情对象 erp_budget_detail
@ -44,12 +45,12 @@ public class ErpBudgetDetail{
/** /**
* 预算成本(元) * 预算成本(元)
*/ */
private Long budgetCost; private BigDecimal budgetCost;
/** /**
* 降成本预算成本(元) * 降成本预算成本(元)
*/ */
private Long reduceBudgetCost; private BigDecimal reduceBudgetCost;
/** /**
* 参考项目ID * 参考项目ID

13
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpBudgetInfo.java
Unescape Escape View File

@ -6,6 +6,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.io.Serial; import java.io.Serial;
import java.math.BigDecimal;
/** /**
* 项目预算对象 erp_budget_info * 项目预算对象 erp_budget_info
@ -90,32 +91,32 @@ public class ErpBudgetInfo extends TenantEntity {
/** /**
* 合同额(元) * 合同额(元)
*/ */
private Long contractAmount; private BigDecimal contractAmount;
/** /**
* 合同净额(元) * 合同净额(元)
*/ */
private Long netContractAmount; private BigDecimal netContractAmount;
/** /**
* 预算成本(元) * 预算成本(元)
*/ */
private Long budgetCost; private BigDecimal budgetCost;
/** /**
* 预算毛利率，乘以100保存（如1%,保存1） * 预算毛利率，乘以100保存（如1%,保存1）
*/ */
private Long budgetRate; private BigDecimal budgetRate;
/** /**
* 降成本后预算成本(元) * 降成本后预算成本(元)
*/ */
private Long reduceBudgetCost; private BigDecimal reduceBudgetCost;
/** /**
* 降成本后预算毛利率 * 降成本后预算毛利率
*/ */
private Long reduceBudgetRate; private BigDecimal reduceBudgetRate;
/** /**
* 项目预算期间 * 项目预算期间

8
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpBudgetMaterialCost.java
Unescape Escape View File

@ -40,22 +40,22 @@ public class ErpBudgetMaterialCost extends TenantEntity {
/** /**
* 物料ID，关联base_material_info * 物料ID，关联base_material_info
*/ */
private Long materielId; private Long materialId;
/** /**
* SAP物料编码 * SAP物料编码
*/ */
private String materielCode; private String materialCode;
/** /**
* SAP物料名称 * SAP物料名称
*/ */
private String materielName; private String materialName;
/** /**
* 销售物料ID? * 销售物料ID?
*/ */
private Long relationMaterielId; private Long relationMaterialId;
/** /**
* 单位,关联base_unit_info * 单位,关联base_unit_info

6
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpBudgetDetailBo.java
Unescape Escape View File

@ -9,6 +9,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import jakarta.validation.constraints.*;
import java.math.BigDecimal;
/** /**
* 项目预算详情业务对象 erp_budget_detail * 项目预算详情业务对象 erp_budget_detail
* *
@ -46,12 +48,12 @@ public class ErpBudgetDetailBo {
/** /**
* 预算成本(元) * 预算成本(元)
*/ */
private Long budgetCost; private BigDecimal budgetCost;
/** /**
* 降成本预算成本(元) * 降成本预算成本(元)
*/ */
private Long reduceBudgetCost; private BigDecimal reduceBudgetCost;
/** /**
* 参考项目ID * 参考项目ID

24
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpBudgetInfoBo.java
Unescape Escape View File

@ -1,7 +1,6 @@
package org.dromara.oa.erp.domain.bo; package org.dromara.oa.erp.domain.bo;
import org.dromara.oa.erp.domain.ErpBudgetDetail; import org.dromara.oa.erp.domain.*;
import org.dromara.oa.erp.domain.ErpBudgetInfo;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
@ -9,8 +8,8 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import jakarta.validation.constraints.*;
import org.dromara.oa.erp.domain.ErpBudgetMaterialCost;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
/** /**
@ -97,32 +96,32 @@ public class ErpBudgetInfoBo extends BaseEntity {
/** /**
* 合同额(元) * 合同额(元)
*/ */
private Long contractAmount; private BigDecimal contractAmount;
/** /**
* 合同净额(元) * 合同净额(元)
*/ */
private Long netContractAmount; private BigDecimal netContractAmount;
/** /**
* 预算成本(元) * 预算成本(元)
*/ */
private Long budgetCost; private BigDecimal budgetCost;
/** /**
* 预算毛利率，乘以100保存（如1%,保存1） * 预算毛利率，乘以100保存（如1%,保存1）
*/ */
private Long budgetRate; private BigDecimal budgetRate;
/** /**
* 降成本后预算成本(元) * 降成本后预算成本(元)
*/ */
private Long reduceBudgetCost; private BigDecimal reduceBudgetCost;
/** /**
* 降成本后预算毛利率 * 降成本后预算毛利率
*/ */
private Long reduceBudgetRate; private BigDecimal reduceBudgetRate;
/** /**
* 项目预算期间 * 项目预算期间
@ -168,4 +167,11 @@ public class ErpBudgetInfoBo extends BaseEntity {
private List<ErpBudgetMaterialCost> erpBudgetMaterialCostList; private List<ErpBudgetMaterialCost> erpBudgetMaterialCostList;
private List<ErpBudgetLaborCost> erpBudgetLaborCostList;
private List<ErpBudgetInstallCost> erpBudgetInstallCostList;
private List<ErpBudgetTravelCost> erpBudgetTravelCostList;
private List<ErpBudgetOtherCost> erpBudgetOtherCostList;
} }

8
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpBudgetMaterialCostBo.java
Unescape Escape View File

@ -40,22 +40,22 @@ public class ErpBudgetMaterialCostBo extends BaseEntity {
/** /**
* 物料ID，关联base_material_info * 物料ID，关联base_material_info
*/ */
private Long materielId; private Long materialId;
/** /**
* SAP物料编码 * SAP物料编码
*/ */
private String materielCode; private String materialCode;
/** /**
* SAP物料名称 * SAP物料名称
*/ */
private String materielName; private String materialName;
/** /**
* 销售物料ID? * 销售物料ID?
*/ */
private Long relationMaterielId; private Long relationMaterialId;
/** /**
* 单位,关联base_unit_info * 单位,关联base_unit_info

5
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpBudgetDetailVo.java
Unescape Escape View File

@ -10,6 +10,7 @@ import lombok.Data;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@ -56,13 +57,13 @@ public class ErpBudgetDetailVo implements Serializable {
* 预算成本(元) * 预算成本(元)
*/ */
@ExcelProperty(value = "预算成本(元)") @ExcelProperty(value = "预算成本(元)")
private Long budgetCost; private BigDecimal budgetCost;
/** /**
* 降成本预算成本(元) * 降成本预算成本(元)
*/ */
@ExcelProperty(value = "降成本预算成本(元)") @ExcelProperty(value = "降成本预算成本(元)")
private Long reduceBudgetCost; private BigDecimal reduceBudgetCost;
/** /**
* 参考项目ID * 参考项目ID

13
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpBudgetInfoVo.java
Unescape Escape View File

@ -10,6 +10,7 @@ import lombok.Data;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@ -112,38 +113,38 @@ public class ErpBudgetInfoVo implements Serializable {
* 合同额(元) * 合同额(元)
*/ */
@ExcelProperty(value = "合同额(元)") @ExcelProperty(value = "合同额(元)")
private Long contractAmount; private BigDecimal contractAmount;
/** /**
* 合同净额(元) * 合同净额(元)
*/ */
@ExcelProperty(value = "合同净额(元)") @ExcelProperty(value = "合同净额(元)")
private Long netContractAmount; private BigDecimal netContractAmount;
/** /**
* 预算成本(元) * 预算成本(元)
*/ */
@ExcelProperty(value = "预算成本(元)") @ExcelProperty(value = "预算成本(元)")
private Long budgetCost; private BigDecimal budgetCost;
/** /**
* 预算毛利率，乘以100保存（如1%,保存1） * 预算毛利率，乘以100保存（如1%,保存1）
*/ */
@ExcelProperty(value = "预算毛利率，乘以100保存", converter = ExcelDictConvert.class) @ExcelProperty(value = "预算毛利率，乘以100保存", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "如=1%,保存1") @ExcelDictFormat(readConverterExp = "如=1%,保存1")
private Long budgetRate; private BigDecimal budgetRate;
/** /**
* 降成本后预算成本(元) * 降成本后预算成本(元)
*/ */
@ExcelProperty(value = "降成本后预算成本(元)") @ExcelProperty(value = "降成本后预算成本(元)")
private Long reduceBudgetCost; private BigDecimal reduceBudgetCost;
/** /**
* 降成本后预算毛利率 * 降成本后预算毛利率
*/ */
@ExcelProperty(value = "降成本后预算毛利率") @ExcelProperty(value = "降成本后预算毛利率")
private Long reduceBudgetRate; private BigDecimal reduceBudgetRate;
/** /**
* 项目预算期间 * 项目预算期间

8
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpBudgetMaterialCostVo.java
Unescape Escape View File

@ -50,25 +50,25 @@ public class ErpBudgetMaterialCostVo implements Serializable {
* 物料ID，关联base_material_info * 物料ID，关联base_material_info
*/ */
@ExcelProperty(value = "物料ID，关联base_material_info") @ExcelProperty(value = "物料ID，关联base_material_info")
private Long materielId; private Long materialId;
/** /**
* SAP物料编码 * SAP物料编码
*/ */
@ExcelProperty(value = "SAP物料编码") @ExcelProperty(value = "SAP物料编码")
private String materielCode; private String materialCode;
/** /**
* SAP物料名称 * SAP物料名称
*/ */
@ExcelProperty(value = "SAP物料名称") @ExcelProperty(value = "SAP物料名称")
private String materielName; private String materialName;
/** /**
* 销售物料ID? * 销售物料ID?
*/ */
@ExcelProperty(value = "销售物料ID?") @ExcelProperty(value = "销售物料ID?")
private Long relationMaterielId; private Long relationMaterialId;
/** /**
* 单位,关联base_unit_info * 单位,关联base_unit_info

3
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectChangeServiceImpl.java
Unescape Escape View File

@ -450,8 +450,7 @@ public class ErpProjectChangeServiceImpl implements IErpProjectChangeService {
ErpProjectChangeBudget budget = new ErpProjectChangeBudget(); ErpProjectChangeBudget budget = new ErpProjectChangeBudget();
budget.setBudgetDetailId(detail.getBudgetDetailId()); budget.setBudgetDetailId(detail.getBudgetDetailId());
budget.setSubjectName(detail.getBudgetItem()); budget.setSubjectName(detail.getBudgetItem());
//xins的预算表数据库是decimal，实体类ErpBudgetDetail却是Long，所以这里需要转换一下 BigDecimal budgetCost = detail.getBudgetCost();
BigDecimal budgetCost = BigDecimal.valueOf(detail.getBudgetCost());
budget.setBudgetBefore(budgetCost); budget.setBudgetBefore(budgetCost);
budget.setBudgetAfter(budgetCost); // 默认值 budget.setBudgetAfter(budgetCost); // 默认值
budget.setAmountUsed(BigDecimal.ZERO); // 默认已使用金额为0 budget.setAmountUsed(BigDecimal.ZERO); // 默认已使用金额为0

Write Preview
Loading…
Cancel
Save