Browse Source

[feat]

修改生产订单的含税成本和不含税成本,数据库由double->decimal
生产订单实体类 由Long->BigDecimal
生产转采购计划后端接口修改对应的set方法
dev
liuxiaoxu 3 months ago
parent
commit
ae4c50e316
  1. 4
      ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchasePlanServiceImpl.java
  2. 29
      ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeOrder.java

4
ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchasePlanServiceImpl.java

@ -423,8 +423,8 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService
//添加数量合计 //添加数量合计
purchasePlan.setMaterialSum((long) purchasePlanMaterialSum); purchasePlan.setMaterialSum((long) purchasePlanMaterialSum);
purchasePlan.setNoRmbSum(new BigDecimal(sysMakeOrder.getNoRate())); purchasePlan.setNoRmbSum(sysMakeOrder.getNoRate());
purchasePlan.setRmbSum(new BigDecimal(sysMakeOrder.getRate())); purchasePlan.setRmbSum(sysMakeOrder.getRate());
purchasePlan.setApplyUser(sysMakeOrder.getSalesman()); purchasePlan.setApplyUser(sysMakeOrder.getSalesman());
purchasePlan.setCreateBy(ShiroUtils.getLoginName()); purchasePlan.setCreateBy(ShiroUtils.getLoginName());
purchasePlan.setCreateTime(DateUtils.getNowDate()); purchasePlan.setCreateTime(DateUtils.getNowDate());

29
ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysMakeOrder.java

@ -5,6 +5,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import java.math.BigDecimal;
/** /**
* 生产订单对象 sys_makeorder * 生产订单对象 sys_makeorder
* *
@ -78,11 +80,11 @@ public class SysMakeOrder extends BaseEntity
/** 不含税生产成本(RMB) */ /** 不含税生产成本(RMB) */
@Excel(name = "不含税生产成本(RMB)") @Excel(name = "不含税生产成本(RMB)")
private Long noRate; private BigDecimal noRate;
/** 含税生产成本(RMB) */ /** 含税生产成本(RMB) */
@Excel(name = "含税生产成本(RMB)") @Excel(name = "含税生产成本(RMB)")
private Long rate; private BigDecimal rate;
/** 使用状态 */ /** 使用状态 */
private String delFlag; private String delFlag;
@ -236,25 +238,24 @@ public class SysMakeOrder extends BaseEntity
{ {
return eceiptNum; return eceiptNum;
} }
public void setNoRate(Long noRate)
{
this.noRate = noRate;
}
public Long getNoRate() public BigDecimal getNoRate() {
{
return noRate; return noRate;
} }
public void setRate(Long rate)
{ public void setNoRate(BigDecimal noRate) {
this.rate = rate; this.noRate = noRate;
} }
public Long getRate() public BigDecimal getRate() {
{
return rate; return rate;
} }
public void setDelFlag(String delFlag)
public void setRate(BigDecimal rate) {
this.rate = rate;
}
public void setDelFlag(String delFlag)
{ {
this.delFlag = delFlag; this.delFlag = delFlag;
} }

Loading…
Cancel
Save