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

修改推凭证2

master
fanzongzhe0036 3 months ago
parent
98877d245d
commit
f9b489b0f4
4 changed files with 41 additions and 81 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java
  2. 72
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
  3. 5
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java
  4. 42
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java
View File

@ -66,8 +66,7 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl
@Override
public ResultBean rePushVoucher(String sid) {
ResultBean rb = ResultBean.fireFail();
Map<String,Integer> mapCheckState = new HashMap<>(); //当时提时交的上传状态 0代表1次提交，1代表二次提交
scmSpecialrebateCheckapplyService.pushSpecialRebateWithVoucher(sid, "1",mapCheckState);
scmSpecialrebateCheckapplyService.pushSpecialRebateWithVoucher(sid);
return rb.success();
}

72
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
View File

@ -446,9 +446,8 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
/**
* 推送单车返利核对凭证
*
* @param sid,tag (0代表核对申请通过推送，1代表重推功能)
*/
public void pushSpecialRebateWithVoucher(String sid, String tag, Map<String, Integer> mapCheckState) {
public void pushSpecialRebateWithVoucher(String sid) {
String format = scmVehRebateWithApplyService.returnBusDate(new Date());
String summaryTag = "";//摘要前缀
ScmSpecialrebateCheckapply entity = fetchBySid(sid);
@ -457,29 +456,20 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
summaryTag = entity.getCheckApply();
}
}
List<ScmSpecialRebate> scmVehRebates = new ArrayList<>();
List<ScmSpecialrebateCheckapplydetailVo> scmVehrebateCheckapplydetailVos = scmSpecialrebateCheckapplydetailService.selByMainSid(sid);
if (!scmVehrebateCheckapplydetailVos.isEmpty()) {
for (ScmSpecialrebateCheckapplydetailVo s : scmVehrebateCheckapplydetailVos) {
ScmSpecialRebate v = scmSpecialRebateService.fetchBySid(s.getSpecialRebateSid());
if (null != v) {
scmVehRebates.add(v);
}
}
}
List<ScmSpecialrebateCheckapplydetailVo> scmVehRebates = scmSpecialrebateCheckapplydetailService.selByMainSid(sid);
//按照采购系统分组
if (!scmVehRebates.isEmpty()) {
Map<String, List<ScmSpecialRebate>> map = scmVehRebates.stream().collect(Collectors.groupingBy(ScmSpecialRebate::getPurchaseSystemSid));
Map<String, List<ScmSpecialrebateCheckapplydetailVo>> map = scmVehRebates.stream().collect(Collectors.groupingBy(ScmSpecialrebateCheckapplydetailVo::getPurchaseSystemSid));
String finalSummaryTag = summaryTag;
String[] split = finalSummaryTag.split("年");
String y1 = split[0]; //预提申请标题年份
for (Map.Entry<String, List<ScmSpecialRebate>> entry : map.entrySet()) {
List<ScmSpecialRebate> v = entry.getValue();
for (Map.Entry<String, List<ScmSpecialrebateCheckapplydetailVo>> entry : map.entrySet()) {
List<ScmSpecialrebateCheckapplydetailVo> v = entry.getValue();
GeneralVoucher generalVoucher = new GeneralVoucher();
generalVoucher.setBussDate(format);
List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
if (!v.isEmpty()) {
for (ScmSpecialRebate rebate : v) {
for (ScmSpecialrebateCheckapplydetailVo rebate : v) {
BigDecimal yt = BigDecimal.ZERO;//预提
BigDecimal ytfl = BigDecimal.ZERO;//其中返利
BigDecimal ytqzzz = BigDecimal.ZERO;//其中支出费用
@ -535,29 +525,26 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
if (null != rebate.getSecondItureCost()) {
efpzc = rebate.getSecondItureCost();
}
if (null != rebate.getTempItureCost()) {
edfpzc = rebate.getTempItureCost();
}
if (null != rebate.getSecondTreatCost()) {
efpdzf = rebate.getSecondTreatCost();
}
if (null != rebate.getTempTreatCost()) {
edfpdzf = rebate.getTempTreatCost();
}
if (null != rebate.getSecondSuppCost()) {
efpdd = rebate.getSecondSuppCost();
}
if (null != rebate.getTempSuppCost()) {
edfpdd = rebate.getTempSuppCost();
}
// if (null != rebate.getTempItureCost()) {
// edfpzc = rebate.getTempItureCost();
// }
// if (null != rebate.getSecondTreatCost()) {
// efpdzf = rebate.getSecondTreatCost();
// }
// if (null != rebate.getTempTreatCost()) {
// edfpdzf = rebate.getTempTreatCost();
// }
// if (null != rebate.getSecondSuppCost()) {
// efpdd = rebate.getSecondSuppCost();
// }
// if (null != rebate.getTempSuppCost()) {
// edfpdd = rebate.getTempSuppCost();
// }
efpfl = esc.subtract(efpzc).subtract(efpdzf).subtract(efpdd);
edfpfl = ydqd.subtract(edfpzc).subtract(edfpdzf).subtract(edfpdd);
Integer onceState = 0;
if (tag.equals("0") && mapCheckState.size() > 0) {
onceState = mapCheckState.get(rebate.getSid());
}
if (StringUtils.isNotBlank(rebate.getUseOrgSid())) {
String useOrgSid = rebate.getUseOrgSid();
Integer onceState = rebate.getOnceCheckState();
if (StringUtils.isNotBlank(entity.getUseOrgSid())) {
String useOrgSid = entity.getUseOrgSid();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
if (null != organizationVo) {
generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
@ -584,7 +571,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
}
}
if (!rebate.getRebateTypeValue().equals("行销政策")) {
if (onceState.intValue() == 2 || tag.equals("1")) {
if (onceState.intValue() == 0) {
//没有进行过核对申请
if (ysc.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
@ -718,7 +705,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
}
}
} else {
if (onceState.intValue() == 2 || tag.equals("1")) {
if (onceState.intValue() == 0) {
//没有进行过核对申请
if (ysc.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
@ -898,11 +885,6 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
Map<String, Integer> mapCheckState = new HashMap<>();
for (ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo : scmSpecialrebateCheckapplydetailVos) {
ScmSpecialRebate scmSpecialRebate = scmSpecialRebateService.fetchBySid(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid());
if (scmSpecialRebate.getOnceCheckState().intValue() == 1) {
mapCheckState.put(scmSpecialRebate.getSid(), 1);
} else {
mapCheckState.put(scmSpecialRebate.getSid(), 2);
}
if ("是".equals(scmSpecialRebate.getIsAdjustment())) {
scmSpecialRebateService.updateState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 4);
scmSpecialRebateService.updateAdjustmentState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 1);
@ -912,7 +894,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
scmSpecialRebateService.updateOnceCheckState(scmSpecialrebateCheckapplydetailVo.getSpecialRebateSid(), 1);
}
pushSpecialRebateWithVoucher(bv.getBusinessSid(), "0", mapCheckState);
pushSpecialRebateWithVoucher(bv.getBusinessSid());
}
return rb.success().setData(resultBean.getData());
} else {

5
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java
View File

@ -47,9 +47,7 @@ import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* Project: anrui-scm(单车返利核对) <br/>
@ -79,8 +77,7 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign {
@Override
public ResultBean rePushVoucher(String sid) {
ResultBean rb = ResultBean.fireFail();
Map<String,Integer> map = new HashMap<>();
scmVehrebateCheckapplyService.pushVehRebateWithVoucher(sid,"1",map);
scmVehrebateCheckapplyService.pushVehRebateWithVoucher(sid);
return rb.success();
}

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

@ -486,14 +486,8 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
List<ScmVehrebateCheckapplydetailVo> scmVehrebateCheckapplydetailVos = scmVehrebateCheckapplydetailService.selByMainSid(bv.getBusinessSid());
Map<String, Integer> mapCheckState = new HashMap<>(); //当时提时交的上传状态 0代表1次提交，1代表二次提交
for (ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo : scmVehrebateCheckapplydetailVos) {
ScmVehRebate scmVehRebate = scmVehRebateService.fetchBySid(scmVehrebateCheckapplydetailVo.getVehRebateSid());
if (scmVehRebate.getOnceCheckState().intValue() == 1) {
mapCheckState.put(scmVehRebate.getSid(), 1);
} else {
mapCheckState.put(scmVehRebate.getSid(), 2);
}
if ("是".equals(scmVehRebate.getIsAdjustment())) {
scmVehRebateService.updateState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 4);
scmVehRebateService.updateAdjustmentState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 1);
@ -502,7 +496,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
}
scmVehRebateService.updateOnceCheckState(scmVehrebateCheckapplydetailVo.getVehRebateSid(), 1);
}
pushVehRebateWithVoucher(bv.getBusinessSid(), "0", mapCheckState); //推送返利核对凭证
pushVehRebateWithVoucher(bv.getBusinessSid()); //推送返利核对凭证
}
return rb.success().setData(resultBean.getData());
} else {
@ -515,7 +509,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
*
* @param sid,tag (0代表核对申请通过推送，1代表重推功能)
*/
public void pushVehRebateWithVoucher(String sid, String tag, Map<String, Integer> mapCheckState) {
public void pushVehRebateWithVoucher(String sid) {
String format = scmVehRebateWithApplyService.returnBusDate(new Date());
String summaryTag = "";//摘要前缀
ScmVehrebateCheckapply entity = fetchBySid(sid);
@ -524,24 +518,15 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
summaryTag = entity.getCheckApply();
}
}
List<ScmVehRebate> scmVehRebates = new ArrayList<>();
List<ScmVehrebateCheckapplydetailVo> scmVehrebateCheckapplydetailVos = scmVehrebateCheckapplydetailService.selByMainSid(sid);
if (!scmVehrebateCheckapplydetailVos.isEmpty()) {
for (ScmVehrebateCheckapplydetailVo s : scmVehrebateCheckapplydetailVos) {
ScmVehRebate v = scmVehRebateService.fetchBySid(s.getVehRebateSid());
if (null != v) {
scmVehRebates.add(v);
}
}
}
List<ScmVehrebateCheckapplydetailVo> scmVehRebates = scmVehrebateCheckapplydetailService.selByMainSid(sid);
//按照采购系统分组
if (!scmVehRebates.isEmpty()) {
Map<String, List<ScmVehRebate>> map = scmVehRebates.stream().collect(Collectors.groupingBy(ScmVehRebate::getPurchaseSystemSid));
Map<String, List<ScmVehrebateCheckapplydetailVo>> map = scmVehRebates.stream().collect(Collectors.groupingBy(ScmVehrebateCheckapplydetailVo::getPurchaseSystemSid));
String finalSummaryTag = summaryTag;
String[] split = finalSummaryTag.split("年");
String y1 = split[0]; //预提申请标题年份
for (Map.Entry<String, List<ScmVehRebate>> entry : map.entrySet()) {
List<ScmVehRebate> v = entry.getValue();
for (Map.Entry<String, List<ScmVehrebateCheckapplydetailVo>> entry : map.entrySet()) {
List<ScmVehrebateCheckapplydetailVo> v = entry.getValue();
GeneralVoucher generalVoucher = new GeneralVoucher();
generalVoucher.setBussDate(format);
List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
@ -549,17 +534,14 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
costAdjustmentsBill.setBussDate(format);
List<CostAdjustmentsBill.CostAdjustmentsBillDetailDto> resultDetails = new ArrayList<>();
if (!v.isEmpty()) {
for (ScmVehRebate rebate : v) {
for (ScmVehrebateCheckapplydetailVo rebate : v) {
String useOrgCode = "";
String deptCode = ""; //采购系统部门编码
String salesDeptCode = ""; //销售部门编码
String customerCode = ""; //出库单客户编码
String vinCode = ""; //物料
String gysCode = ""; //供应商
Integer checkState = 0;
if (tag.equals("0") && mapCheckState.size() > 0) {
checkState = mapCheckState.get(rebate.getSid());
}
Integer checkState = rebate.getOnceCheckState();
SysOrganizationVo data = sysOrganizationFeign.fetchBySid(rebate.getPurchaseSystemSid()).getData();
if (null != data) {
deptCode = data.getOrgCode();
@ -585,8 +567,8 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
customerCode = customerCwNo;
}
if (StringUtils.isNotBlank(rebate.getUseOrgSid())) {
String useOrgSid = rebate.getUseOrgSid();
if (StringUtils.isNotBlank(entity.getUseOrgSid())) {
String useOrgSid = entity.getUseOrgSid();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
if (null != organizationVo) {
generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
@ -596,7 +578,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
}
if (!rebate.getRebateTypeValue().equals("金融贴息")) {
if (checkState.intValue() == 2 || tag.equals("1")) {
if (checkState.intValue() == 0) {
//没有进行过核对申请
BigDecimal oneMoney = BigDecimal.ZERO;//一次上传金额
BigDecimal yicifanli = BigDecimal.ZERO;//一次应收返利返利
@ -753,7 +735,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
} else {
if (checkState.intValue() == 2 || tag.equals("1")) {
if (checkState.intValue() == 0) {
//没有进行过核对申请
BigDecimal oneMoney = BigDecimal.ZERO;//一次上传金额
if (StringUtils.isNotBlank(rebate.getUploadMoney())) {

Write Preview
Loading…
Cancel
Save