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

修改专项核对凭证为行销政策

zhanglei
fanzongzhe0036 3 months ago
parent
4889efa3ac
commit
8aa855caa0
3 changed files with 15 additions and 15 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. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  2. 26
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java
  3. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java

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

@ -659,7 +659,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) { if (StringUtils.isNotBlank(voucherDetail.getManufacturer())) {
manufacturer = voucherDetail.getManufacturer(); manufacturer = voucherDetail.getManufacturer();
} }
if (!voucherDetail.getType().equals("行销活动")) { if (!voucherDetail.getType().equals("行销政策")) {
if (voucherDetail.getRemarks().equals("返利上传")) { if (voucherDetail.getRemarks().equals("返利上传")) {
if (voucherDetail.getSceneCode().equals("1161.01.16")) { if (voucherDetail.getSceneCode().equals("1161.01.16")) {
cjfl = cjfl.add(voucherDetail.getAmount()); cjfl = cjfl.add(voucherDetail.getAmount());

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

@ -511,7 +511,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
} }
} }
} }
if (!rebate.getRebateTypeValue().equals("行销活动")) { if (!rebate.getRebateTypeValue().equals("行销政策")) {
if (onceState.intValue() == 2 || tag.equals("1")) { if (onceState.intValue() == 2 || tag.equals("1")) {
//没有进行过核对申请 //没有进行过核对申请
BigDecimal oneMoney = BigDecimal.ZERO;//一次上传金额 BigDecimal oneMoney = BigDecimal.ZERO;//一次上传金额
@ -710,7 +710,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
feiyong = oneMoney.subtract(yicidaizhifu).subtract(yizhichufeiyong).subtract(yicididing); feiyong = oneMoney.subtract(yicidaizhifu).subtract(yizhichufeiyong).subtract(yicididing);
if (oneMoney.compareTo(BigDecimal.ZERO) != 0) { if (oneMoney.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setType("行销活动"); voucherDetail.setType("行销政策");
voucherDetail.setTimeFlag(finalSummaryTag); voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setSceneCode("1161.01.16"); voucherDetail.setSceneCode("1161.01.16");
voucherDetail.setDeptCode(deptCode); //部门编码赋值 voucherDetail.setDeptCode(deptCode); //部门编码赋值
@ -721,7 +721,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
} }
if (yicidaizhifu.compareTo(BigDecimal.ZERO) != 0) { if (yicidaizhifu.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setType("行销活动"); voucherDetail.setType("行销政策");
voucherDetail.setTimeFlag(finalSummaryTag); voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setCustomerCode("DZFCJFL"); voucherDetail.setCustomerCode("DZFCJFL");
voucherDetail.setSceneCode("2181.07.00"); voucherDetail.setSceneCode("2181.07.00");
@ -733,7 +733,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
if (yizhichufeiyong.compareTo(BigDecimal.ZERO) != 0) { if (yizhichufeiyong.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag); voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setType("行销活动"); voucherDetail.setType("行销政策");
voucherDetail.setDeptCode(deptCode); //部门编码赋值 voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode); voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(yizhichufeiyong); voucherDetail.setAmount(yizhichufeiyong);
@ -744,7 +744,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
if (yicididing.compareTo(BigDecimal.ZERO) != 0) { if (yicididing.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag); voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setType("行销活动"); voucherDetail.setType("行销政策");
voucherDetail.setDeptCode(deptCode); //部门编码赋值 voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode); voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(yicididing); voucherDetail.setAmount(yicididing);
@ -755,7 +755,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
if (feiyong.compareTo(BigDecimal.ZERO) != 0) { if (feiyong.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag); voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setType("行销活动"); voucherDetail.setType("行销政策");
voucherDetail.setDeptCode(deptCode); //部门编码赋值 voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setAmount(feiyong); voucherDetail.setAmount(feiyong);
voucherDetail.setSceneCode("6401.14"); voucherDetail.setSceneCode("6401.14");
@ -783,7 +783,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
erfeiyong = twoMoney.subtract(ercidaizhifu).subtract(erzhichufeiyong).subtract(ercididing); erfeiyong = twoMoney.subtract(ercidaizhifu).subtract(erzhichufeiyong).subtract(ercididing);
if (twoMoney.compareTo(BigDecimal.ZERO) != 0) { if (twoMoney.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setType("行销活动"); voucherDetail.setType("行销政策");
voucherDetail.setTimeFlag(finalSummaryTag); voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setSceneCode("1161.01.16"); voucherDetail.setSceneCode("1161.01.16");
voucherDetail.setDeptCode(deptCode); //部门编码赋值 voucherDetail.setDeptCode(deptCode); //部门编码赋值
@ -794,7 +794,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
} }
if (ercidaizhifu.compareTo(BigDecimal.ZERO) != 0) { if (ercidaizhifu.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setType("行销活动"); voucherDetail.setType("行销政策");
voucherDetail.setTimeFlag(finalSummaryTag); voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setCustomerCode("DZFCJFL"); voucherDetail.setCustomerCode("DZFCJFL");
voucherDetail.setSceneCode("2181.07.00"); voucherDetail.setSceneCode("2181.07.00");
@ -806,7 +806,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
if (erzhichufeiyong.compareTo(BigDecimal.ZERO) != 0) { if (erzhichufeiyong.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag); voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setType("行销活动"); voucherDetail.setType("行销政策");
voucherDetail.setDeptCode(deptCode); //部门编码赋值 voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode); voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(erzhichufeiyong); voucherDetail.setAmount(erzhichufeiyong);
@ -817,7 +817,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
if (ercididing.compareTo(BigDecimal.ZERO) != 0) { if (ercididing.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag); voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setType("行销活动"); voucherDetail.setType("行销政策");
voucherDetail.setDeptCode(deptCode); //部门编码赋值 voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setManufacturer(gysCode); voucherDetail.setManufacturer(gysCode);
voucherDetail.setAmount(ercididing); voucherDetail.setAmount(ercididing);
@ -828,7 +828,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
if (erfeiyong.compareTo(BigDecimal.ZERO) != 0) { if (erfeiyong.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail(); GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail.setTimeFlag(finalSummaryTag); voucherDetail.setTimeFlag(finalSummaryTag);
voucherDetail.setType("行销活动"); voucherDetail.setType("行销政策");
voucherDetail.setDeptCode(deptCode); //部门编码赋值 voucherDetail.setDeptCode(deptCode); //部门编码赋值
voucherDetail.setAmount(erfeiyong); voucherDetail.setAmount(erfeiyong);
voucherDetail.setSceneCode("6401.14"); voucherDetail.setSceneCode("6401.14");
@ -851,7 +851,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
if (daizhifuchaMoney.compareTo(BigDecimal.ZERO) != 0) { if (daizhifuchaMoney.compareTo(BigDecimal.ZERO) != 0) {
GeneralVoucher.GeneralVoucherDetail voucherDetail1 = new GeneralVoucher.GeneralVoucherDetail(); GeneralVoucher.GeneralVoucherDetail voucherDetail1 = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail1.setTimeFlag(finalSummaryTag); voucherDetail1.setTimeFlag(finalSummaryTag);
voucherDetail1.setType("行销活动"); voucherDetail1.setType("行销政策");
voucherDetail1.setDeptCode(deptCode); voucherDetail1.setDeptCode(deptCode);
voucherDetail1.setManufacturer(gysCode); voucherDetail1.setManufacturer(gysCode);
voucherDetail1.setAmount(daizhifuchaMoney); voucherDetail1.setAmount(daizhifuchaMoney);
@ -860,7 +860,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
voucherDetails.add(voucherDetail1); voucherDetails.add(voucherDetail1);
GeneralVoucher.GeneralVoucherDetail voucherDetail2 = new GeneralVoucher.GeneralVoucherDetail(); GeneralVoucher.GeneralVoucherDetail voucherDetail2 = new GeneralVoucher.GeneralVoucherDetail();
voucherDetail2.setTimeFlag(finalSummaryTag); voucherDetail2.setTimeFlag(finalSummaryTag);
voucherDetail2.setType("行销活动"); voucherDetail2.setType("行销政策");
voucherDetail2.setDeptCode(deptCode); voucherDetail2.setDeptCode(deptCode);
voucherDetail2.setAmount(daizhifuchaMoney); voucherDetail2.setAmount(daizhifuchaMoney);
voucherDetail2.setSceneCode("6401.14"); voucherDetail2.setSceneCode("6401.14");

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java
View File

@ -475,7 +475,7 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService<ScmSpec
List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>(); List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
if (!v.isEmpty()) { if (!v.isEmpty()) {
for (ScmSpecialRebate rebate : v) { for (ScmSpecialRebate rebate : v) {
if (!rebate.getRebateTypeValue().equals("行销活动")) { if (!rebate.getRebateTypeValue().equals("行销政策")) {
if (StringUtils.isNotBlank(rebate.getUseOrgSid())) { if (StringUtils.isNotBlank(rebate.getUseOrgSid())) {
String useOrgSid = rebate.getUseOrgSid(); String useOrgSid = rebate.getUseOrgSid();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();

Write Preview
Loading…
Cancel
Save