Commit 8c80d2b8 by liyanlin

fix

parent 2e74977b
...@@ -16,6 +16,7 @@ public class LogisticsCostDto { ...@@ -16,6 +16,7 @@ public class LogisticsCostDto {
private String currency; // 币种 private String currency; // 币种
private String costRemark; // 费用单备注 private String costRemark; // 费用单备注
private String costReason; // 付款理由 private String costReason; // 付款理由
private String typeNo; //费用类别编号
//费用来源 1-默认 2-WMS 3-调拨系统 //费用来源 1-默认 2-WMS 3-调拨系统
private String sourceFrom; private String sourceFrom;
......
...@@ -160,6 +160,32 @@ public class CostController { ...@@ -160,6 +160,32 @@ public class CostController {
return resp; return resp;
} }
/**
* 批量提交费用单
* @param costNos
* @return
*/
@ApiOperation("提交费用单")
@PostMapping("batchSubmitAudit")
public UpdateCostResp batchSubmitAudit(@RequestParam(name = "costNos") List<String> costNos) {
for (String costNo : costNos) {
costService = CostServiceFactory.getCostService(costNo);
CostDomain costDomain = costService.getCostByCostNo(costNo);
CostContext costContext = new CostContext(costNo, costDomain.getCreateUserid());
costContext.setCostState(unSubmitState);
costContext.handle();
}
UpdateCostResp resp = new UpdateCostResp();
resp.setMsg("success");
resp.setUpdate(1);
return resp;
}
@ApiOperation("根据费用计划查询") @ApiOperation("根据费用计划查询")
@PostMapping("/getCostByCostPlanNo") @PostMapping("/getCostByCostPlanNo")
public GetCostByCostPlanNoResp getCostByCostPlanNo(@RequestParam String costPlanNo) { public GetCostByCostPlanNoResp getCostByCostPlanNo(@RequestParam String costPlanNo) {
......
...@@ -69,8 +69,14 @@ public class CostApiServiceImpl implements CostApiService { ...@@ -69,8 +69,14 @@ public class CostApiServiceImpl implements CostApiService {
costDomain.setCostStatus(0); costDomain.setCostStatus(0);
costDomain.setCostRemark(logisticsCostDto.getCostRemark() + "【WMS系统推送】"); costDomain.setCostRemark(logisticsCostDto.getCostRemark() + "【WMS系统推送】");
costDomain.setCostReason(logisticsCostDto.getCostReason()); costDomain.setCostReason(logisticsCostDto.getCostReason());
CostTypeDomain costTypeDomain = null;
CostTypeDomain costTypeDomain = costTypeDao.selectByNameAndType("物流费", CostTypeDomain.FEE_TYPE); if(logisticsCostDto.getTypeNo() == null || logisticsCostDto.getTypeNo().isEmpty()) {
costTypeDomain = costTypeDao.selectByNameAndType("物流费", CostTypeDomain.FEE_TYPE);
}
else
{
costTypeDomain = costTypeDao.selectByNo(logisticsCostDto.getTypeNo());
}
costDomain.setCostType(costTypeDomain); costDomain.setCostType(costTypeDomain);
costDomain.setCompanyName("香港百伦科技有限公司"); costDomain.setCompanyName("香港百伦科技有限公司");
......
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