yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改单车预提推凭证7

zhanglei
fanzongzhe0036 5 months ago
parent
d7667e5626
commit
f2498cd945
1 changed files with 42 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

32
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java
View File

@ -495,7 +495,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
scmVehRebateService.updateOnceCheckState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 1); scmVehRebateService.updateOnceCheckState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 1);
} }
pushVehRebateWithVoucher(bv.getBusinessSid(),"0"); //推送返利核对凭证 pushVehRebateWithVoucher(bv.getBusinessSid(), "0"); //推送返利核对凭证
} }
return rb.success().setData(resultBean.getData()); return rb.success().setData(resultBean.getData());
} else { } else {
@ -689,14 +689,26 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
//确认调整时 //确认调整时
if (StringUtils.isNotBlank(rebate.getIsAdjustment())) { if (StringUtils.isNotBlank(rebate.getIsAdjustment())) {
if (rebate.getIsAdjustment().equals("是")) { if (rebate.getIsAdjustment().equals("是")) {
if (StringUtils.isNotBlank(rebate.getAdjustmentMoney())) { BigDecimal treatAdjustmentMoney = BigDecimal.ZERO;
BigDecimal adMoney = new BigDecimal(rebate.getAdjustmentMoney()); BigDecimal onceTreatCost = BigDecimal.ZERO;
if (adMoney.compareTo(BigDecimal.ZERO) != 0) { BigDecimal secondTreatCost = BigDecimal.ZERO;
BigDecimal expectTreatCost = BigDecimal.ZERO;
if (null != rebate.getOnceTreatCost()) {
onceTreatCost = rebate.getOnceTreatCost();
}
if (null != rebate.getSecondTreatCost()) {
secondTreatCost = rebate.getSecondTreatCost();
}
if (null != rebate.getExpectTreatCost()) {
expectTreatCost = rebate.getExpectTreatCost();
}
treatAdjustmentMoney = onceTreatCost.add(secondTreatCost).subtract(expectTreatCost);
if (treatAdjustmentMoney.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail1 = new GeneralVoucher.GeneralVoucherDetail(); GeneralVoucher.GeneralVoucherDetail voucherDetail1 = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail1.setTimeFlag(finalSummaryTag); voucherDetail1.setTimeFlag(finalSummaryTag);
voucherDetail1.setDeptCode(deptCode); //部门编码赋值 voucherDetail1.setDeptCode(deptCode); //部门编码赋值
voucherDetail1.setManufacturer(gysCode); voucherDetail1.setManufacturer(gysCode);
voucherDetail1.setAmount(adMoney); voucherDetail1.setAmount(treatAdjustmentMoney);
String palceGenDate = rebate.getPalceGenDate(); String palceGenDate = rebate.getPalceGenDate();
String[] palceGenDateSplit = palceGenDate.split("-"); String[] palceGenDateSplit = palceGenDate.split("-");
String y2 = palceGenDateSplit[0];//所属年份 String y2 = palceGenDateSplit[0];//所属年份
@ -710,15 +722,13 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
GeneralVoucher.GeneralVoucherDetail voucherDetail2 = new GeneralVoucher.GeneralVoucherDetail(); GeneralVoucher.GeneralVoucherDetail voucherDetail2 = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail2.setTimeFlag(finalSummaryTag); voucherDetail2.setTimeFlag(finalSummaryTag);
voucherDetail2.setCustomerCode("DZFCJFL"); //客户编码 voucherDetail2.setCustomerCode("DZFCJFL"); //客户编码
voucherDetail2.setAmount(adMoney); voucherDetail2.setAmount(treatAdjustmentMoney);
voucherDetail2.setDeptCode(deptCode); //部门编码赋值 voucherDetail2.setDeptCode(deptCode); //部门编码赋值
voucherDetail2.setManufacturer(gysCode); voucherDetail2.setManufacturer(gysCode);
voucherDetail2.setSceneCode("2181.07.00"); voucherDetail2.setSceneCode("2181.07.00");
voucherDetail2.setRemarks("预留费用调整"); voucherDetail2.setRemarks("预留费用调整");
voucherDetails.add(voucherDetail2); voucherDetails.add(voucherDetail2);
} }
}
if (null != rebate.getDiffAmount()) { if (null != rebate.getDiffAmount()) {
BigDecimal esRebate = rebate.getDiffAmount(); BigDecimal esRebate = rebate.getDiffAmount();
if (esRebate.compareTo(BigDecimal.ZERO) != 0) { if (esRebate.compareTo(BigDecimal.ZERO) != 0) {
@ -1021,7 +1031,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
List<ScmVehrebateCheckapplydetailDetailsVo> scmWhenVehrebateCheckapplydetailDetails = scmVehrebateCheckapplyDetailsVo.getScmWhenVehrebateCheckapplydetailDetails(); List<ScmVehrebateCheckapplydetailDetailsVo> scmWhenVehrebateCheckapplydetailDetails = scmVehrebateCheckapplyDetailsVo.getScmWhenVehrebateCheckapplydetailDetails();
Map<String, Object> dataMap = new HashMap<String, Object>(); Map<String, Object> dataMap = new HashMap<String, Object>();
//标题 //标题
dataMap.put("title",scmVehrebateCheckapplyDetailsVo.getCheckApply() + "单车返利核对审批"); dataMap.put("title", scmVehrebateCheckapplyDetailsVo.getCheckApply() + "单车返利核对审批");
//分公司 //分公司
dataMap.put("useOrgName", scmVehrebateCheckapplyDetailsVo.getCreateOrgName()); dataMap.put("useOrgName", scmVehrebateCheckapplyDetailsVo.getCreateOrgName());
//创建部门 //创建部门
@ -1145,11 +1155,11 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
List<AppVehrebateCheckapplydetailDetailsVo> when = scmVehrebateCheckapplydetailService.fetchByMainSid(sid); List<AppVehrebateCheckapplydetailDetailsVo> when = scmVehrebateCheckapplydetailService.fetchByMainSid(sid);
List<AppVehrebateCheckapplydetailDetailsVo> last = scmVehrebateCheckapplydetailService.fetchByMainSid(sid); List<AppVehrebateCheckapplydetailDetailsVo> last = scmVehrebateCheckapplydetailService.fetchByMainSid(sid);
for (AppVehrebateCheckapplydetailDetailsVo appVehrebateCheckapplydetailDetailsVo : when) { for (AppVehrebateCheckapplydetailDetailsVo appVehrebateCheckapplydetailDetailsVo : when) {
List<AppVehrebateCheckapplydetailDetailssVo> type = scmVehrebateCheckapplydetailService.fetchByMainSidType(sid,appVehrebateCheckapplydetailDetailsVo.getPurchaseSystemName(),appVehrebateCheckapplydetailDetailsVo.getBrandName()); List<AppVehrebateCheckapplydetailDetailssVo> type = scmVehrebateCheckapplydetailService.fetchByMainSidType(sid, appVehrebateCheckapplydetailDetailsVo.getPurchaseSystemName(), appVehrebateCheckapplydetailDetailsVo.getBrandName());
appVehrebateCheckapplydetailDetailsVo.setDetails(type); appVehrebateCheckapplydetailDetailsVo.setDetails(type);
} }
for (AppVehrebateCheckapplydetailDetailsVo appVehrebateCheckapplydetailDetailsVo : last) { for (AppVehrebateCheckapplydetailDetailsVo appVehrebateCheckapplydetailDetailsVo : last) {
List<AppVehrebateCheckapplydetailDetailssVo> date = scmVehrebateCheckapplydetailService.fetchByMainSidDate(sid,appVehrebateCheckapplydetailDetailsVo.getPurchaseSystemName(),appVehrebateCheckapplydetailDetailsVo.getBrandName()); List<AppVehrebateCheckapplydetailDetailssVo> date = scmVehrebateCheckapplydetailService.fetchByMainSidDate(sid, appVehrebateCheckapplydetailDetailsVo.getPurchaseSystemName(), appVehrebateCheckapplydetailDetailsVo.getBrandName());
appVehrebateCheckapplydetailDetailsVo.setDetails(date); appVehrebateCheckapplydetailDetailsVo.setDetails(date);
} }
appVehrebateCheckapplyDetailsVo.setScmWhenVehrebateCheckapplydetailDetails(when); appVehrebateCheckapplyDetailsVo.setScmWhenVehrebateCheckapplydetailDetails(when);

Write Preview
Loading…
Cancel
Save