Commit d3f7e572 by jianshuqin

申请费用计划单 增加所属账期和所属项目

parent dc341134
...@@ -3,6 +3,7 @@ package com.bailuntec.cost.api.dto; ...@@ -3,6 +3,7 @@ package com.bailuntec.cost.api.dto;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
/** /**
* 接收到的推送物流单 * 接收到的推送物流单
...@@ -17,6 +18,8 @@ public class LogisticsCostDto { ...@@ -17,6 +18,8 @@ public class LogisticsCostDto {
private String costRemark; // 费用单备注 private String costRemark; // 费用单备注
private String costReason; // 付款理由 private String costReason; // 付款理由
private String typeNo; //费用类别编号 private String typeNo; //费用类别编号
private String project; //所属项目
private Date projectDate; //所属账期
//费用来源 1-默认 2-WMS 3-调拨系统 //费用来源 1-默认 2-WMS 3-调拨系统
private String sourceFrom; private String sourceFrom;
......
...@@ -146,10 +146,16 @@ public class CostApiServiceImpl implements CostApiService { ...@@ -146,10 +146,16 @@ public class CostApiServiceImpl implements CostApiService {
costDomain.setCreateTime(new Date()); costDomain.setCreateTime(new Date());
} }
costDomain.setCostTemplateIdByFrom(); costDomain.setCostTemplateIdByFrom();
if(costForm != 1){
costDomain.setProject(logisticsCostDto.getProject());
costDomain.setProjectDate(logisticsCostDto.getProjectDate());
}
costDao.insert(costDomain); costDao.insert(costDomain);
if (costForm == 1) { if (costForm == 1) {
CostDetailDomain costDetailDomain = new CostDetailDomain(); CostDetailDomain costDetailDomain = new CostDetailDomain();
BeanUtils.copyProperties(costDomain, costDetailDomain); BeanUtils.copyProperties(costDomain, costDetailDomain);
costDetailDomain.setProject(logisticsCostDto.getProject());
costDetailDomain.setProjectDate(logisticsCostDto.getProjectDate());
costDetailDomain.setDetailNo(costNo + "-1"); costDetailDomain.setDetailNo(costNo + "-1");
costDetailDao.insert(costDetailDomain); costDetailDao.insert(costDetailDomain);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment