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

修改单车预提推凭证5

master
fanzongzhe0036 3 months ago
parent
9aaf9a7a21
commit
bb288c2bf2
2 changed files with 40 additions and 12 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. 50
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  2. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java

50
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
View File

@ -264,8 +264,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
bennian = bennian.add(amount);
}
total = total.add(amount);
deptNo = voucherDetail.getDeptCode();
manufacturer = voucherDetail.getManufacturer();
if (StringUtils.isNotBlank(voucherDetail.getDeptCode())) {
deptNo = voucherDetail.getDeptCode();
}
if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) {
manufacturer = voucherDetail.getManufacturer();
}
timeFlag = voucherDetail.getTimeFlag();
}
if (shangnian.compareTo(BigDecimal.ZERO) != 0) {
@ -402,12 +406,17 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
String timeFlag = "";
List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
if (!voucherDetails.isEmpty()) {
for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
timeFlag = voucherDetail.getTimeFlag();
if (!voucherDetail.getRemarks().equals("金融贴息")) {
deptNo = voucherDetail.getDeptCode();
if (StringUtils.isNotBlank(voucherDetail.getDeptCode())) {
deptNo = voucherDetail.getDeptCode();
}
}
if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) {
manufacturer = voucherDetail.getManufacturer();
}
manufacturer = voucherDetail.getManufacturer();
if (voucherDetail.getRemarks().equals("金融贴息")) {
if (voucherDetail.getSceneCode().equals("1161.01.16")) {
cjwdxJR = cjwdxJR.add(voucherDetail.getAmount());
@ -525,6 +534,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
}
log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
return voucherService.saveVoucher(newVoucher);
}
@Override
@ -549,8 +559,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
if (!voucherDetails.isEmpty()) {
for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
deptNo = voucherDetail.getDeptCode();
manufacturer = voucherDetail.getManufacturer();
if (StringUtils.isNotBlank(voucherDetail.getDeptCode())) {
deptNo = voucherDetail.getDeptCode();
}
if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) {
manufacturer = voucherDetail.getManufacturer();
}
timeFlag = voucherDetail.getTimeFlag();
if (voucherDetail.getSceneCode().equals("1161.02.15")) {
snfl = snfl.add(voucherDetail.getAmount());
@ -639,8 +653,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
if (!voucherDetails.isEmpty()) {
for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
timeFlag = voucherDetail.getTimeFlag();
deptNo = voucherDetail.getDeptCode();
manufacturer = voucherDetail.getManufacturer();
if (StringUtils.isNotBlank(voucherDetail.getDeptCode())) {
deptNo = voucherDetail.getDeptCode();
}
if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) {
manufacturer = voucherDetail.getManufacturer();
}
if (!voucherDetail.getType().equals("行销活动")) {
if (voucherDetail.getRemarks().equals("返利上传")) {
if (voucherDetail.getSceneCode().equals("1161.01.16")) {
@ -856,8 +874,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
if (!voucherDetails.isEmpty()) {
for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
timeFlag = voucherDetail.getTimeFlag();
deptNo = voucherDetail.getDeptCode();
manufacturer = voucherDetail.getManufacturer();
if (StringUtils.isNotBlank(voucherDetail.getDeptCode())) {
deptNo = voucherDetail.getDeptCode();
}
if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) {
manufacturer = voucherDetail.getManufacturer();
}
if (voucherDetail.getSceneCode().equals("1161.02.15")) {
sn = sn.add(voucherDetail.getAmount());
}
@ -926,8 +948,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
if (!voucherDetails.isEmpty()) {
for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
timeFlag = voucherDetail.getTimeFlag();
deptNo = voucherDetail.getDeptCode();
manufacturer = voucherDetail.getManufacturer();
if (StringUtils.isNotBlank(voucherDetail.getDeptCode())) {
deptNo = voucherDetail.getDeptCode();
}
if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) {
manufacturer = voucherDetail.getManufacturer();
}
BigDecimal amount = voucherDetail.getAmount();
if (voucherDetail.getRemarks().equals("返利上传")) {
if (voucherDetail.getSceneCode().equals("1161.01.16")) {

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

@ -711,6 +711,8 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
voucherDetail2.setTimeFlag(finalSummaryTag);
voucherDetail2.setCustomerCode("DZFCJFL"); //客户编码
voucherDetail2.setAmount(adMoney);
voucherDetail2.setDeptCode(deptCode); //部门编码赋值
voucherDetail2.setManufacturer(gysCode);
voucherDetail2.setSceneCode("2181.07.00");
voucherDetail2.setRemarks("预留费用调整");
voucherDetails.add(voucherDetail2);

Write Preview
Loading…
Cancel
Save