Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/PayApplyTrailerQuery.java

@@ -29,6 +29,8 @@ import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class PayApplyTrailerQuery implements Query {
 
@@ -42,4 +44,5 @@ public class PayApplyTrailerQuery implements Query {
 	private String customerName;
 
 	private String useOrgSid;
+	private List<String> sids;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstall/PayApplyTopQuery.java

@@ -29,6 +29,8 @@ import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class PayApplyTopQuery implements Query {
 
@@ -40,4 +42,5 @@ public class PayApplyTopQuery implements Query {
 	private String customerName;
 
 	private String useOrgSid;
+	private List<String> sids;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml

@@ -111,9 +111,18 @@
     <select id="payApply" resultType="com.yxt.anrui.base.api.basetrailer.PayApplyTrailerVo">
         SELECT btm.trailerTypeValue,
         CONCAT(
+        '长',
         btm.appearanceSizeLong,
+        'mm，',
+        '宽',
         btm.appearanceSizeWide,
-        btm.appearanceSizeHigh
+        'mm，',
+        '高',
+        btm.appearanceSizeHigh,
+        'mm，',
+        '总高',
+        btm.appearanceSizeTotalHigh,
+        'mm'
         ) AS size,
         bt.vinNo,
         bt.sid AS trailerSid,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -302,17 +302,17 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         String trailerTypeKey = baseTrailerModelDetailsVo.getTrailerTypeKey();
         BigDecimal appearanceSizeLong = new BigDecimal(baseTrailerModelDetailsVo.getAppearanceSizeLong()).divide(new BigDecimal("1000"));
         String orderSid = busSalesOrderVehicleFeign.selectOneByVehSidAndNotStop(vehSid).getData();
-        if (StringUtils.isNotBlank(orderSid)){
+        if (StringUtils.isNotBlank(orderSid)) {
             List<BusSalesOrderTrailerDetailsVo> data = busSalesOrderTrailerFeign.fetchDetailsByOrderSid(orderSid).getData();
-            if (data != null && data.size() > 0){
+            if (data != null && data.size() > 0) {
                 Boolean tg = false;
                 for (BusSalesOrderTrailerDetailsVo datum : data) {
-                    if (datum.getAppearanceSizeLong().compareTo(appearanceSizeLong) == 0 && datum.getTrailerTypeKey().equals(trailerTypeKey)){
+                    if (datum.getAppearanceSizeLong().compareTo(appearanceSizeLong) == 0 && datum.getTrailerTypeKey().equals(trailerTypeKey)) {
                         tg = true;
                         break;
                     }
                 }
-                if (!tg){
+                if (!tg) {
                     return rb.setMsg("该挂车类型和外廓长与绑定的主车销售订单中挂车类型和外廓长不一致，无法入库");
                 }
             }
@@ -928,7 +928,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         baseTrailer.setIssueDate(DateUtil.formatDate(new Date()));
         saveOrUpdate(baseTrailer);
         Integer count = finBillTrailerFeign.fetchByGcVinNo(baseTrailer.getVinNo(), finBillApplicationDetailsVo.getSid()).getData();
-        if (count == 0){
+        if (count == 0) {
             FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
             finVehicleInvoiceDto.setInvoiceTitle(finBillApplicationDetailsVo.getOpenTickUnitName());
             finVehicleInvoiceDto.setContractNo(finBillApplicationDetailsVo.getContractNo());
@@ -976,7 +976,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
 
     public ResultBean<BaseTrailerDetailsVo> fetchByGcVinNoAndVehSid(String gcVinNo, String vehSid) {
         ResultBean rb = ResultBean.fireFail();
-        BaseTrailerDetailsVo baseTrailerDetailsVo = baseMapper.fetchByGcVinNoAndVehSid(gcVinNo,vehSid);
+        BaseTrailerDetailsVo baseTrailerDetailsVo = baseMapper.fetchByGcVinNoAndVehSid(gcVinNo, vehSid);
         return rb.success().setData(baseTrailerDetailsVo);
     }
 
@@ -1001,6 +1001,9 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         if (StringUtils.isNotBlank(query.getTrailerTypeValue())) {
             qw.like("btm.trailerTypeValue", query.getTrailerTypeValue());
         }
+        if (query.getSids().size() > 0) {
+            qw.notIn("bt.sid", query.getSids());
+        }
         IPage<BaseTrailer> page = PagerUtil.queryToPage(pq);
         IPage<PayApplyTrailerVo> pagging = baseMapper.payApply(page, qw);
         PagerVo<PayApplyTrailerVo> p = PagerUtil.pageToVo(pagging, null);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallMapper.xml

@@ -69,9 +69,15 @@
     <select id="payApply" resultType="com.yxt.anrui.base.api.basevehinstall.PayApplyTopVo">
         SELECT bvm.installNameValue,
         CONCAT(
+        '长',
         bvm.wk_long,
+        'mm，',
+        '宽',
         bvm.wk_wide,
-        bvm.wk_high
+        'mm，',
+        '高',
+        bvm.wk_high,
+        'mm'
         ) AS size,
         bv.vinNo,
         bv.sid AS topSid,

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstall/BaseVehinstallService.java

@@ -535,6 +535,9 @@ public class BaseVehinstallService extends MybatisBaseService<BaseVehinstallMapp
         if (StringUtils.isNotBlank(query.getInstallNameValue())) {
             qw.like("bvm.installNameValue", query.getInstallNameValue());
         }
+        if (query.getSids().size() > 0) {
+            qw.notIn("bv.sid", query.getSids());
+        }
         IPage<BaseVehinstall> page = PagerUtil.queryToPage(pq);
         IPage<PayApplyTopVo> pagging = baseMapper.payApply(page, qw);
         PagerVo<PayApplyTopVo> p = PagerUtil.pageToVo(pagging, null);

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java

@@ -27,6 +27,10 @@ package com.yxt.anrui.fin.api.finpaymentapply;
 
 
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
@@ -83,6 +87,10 @@ public class FinPaymentapplyDetailsVo implements Vo {
     private List<FinPaymentapplyDetailVo> detailsList = new ArrayList<>();
 
     private List<FinPaymentapplyVehicleVo> vehicleList = new ArrayList<>();
+
+    private List<FinPaymentapplyTrailerDetailsVo> trailerList;
+    private List<FinPaymentapplyTopDetailsVo> topList;
+
     private String isVeh;
 
     @ApiModelProperty(value = "品牌sid")

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/GeneralVoucher.java

@@ -56,5 +56,7 @@ public class GeneralVoucher {
         public String material;
         @ApiModelProperty("备注")
         public String remarks;
+        @ApiModelProperty("采购系统sid")
+        public String purchaseSystemSid;
     }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -48,7 +48,9 @@ import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailDto;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEveDetailsVo;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo;
 import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto;
@@ -382,6 +384,10 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         List<FinPaymentapplyVehicleVo> vehicleList = finPaymentapplyVehicleService.getVehicleList(sid);
         vo.setDetailsList(detailsList);
         vo.setVehicleList(vehicleList);
+        List<FinPaymentapplyTrailerDetailsVo> finPaymentapplyTrailerDetailsVos = finPaymentapplyTrailerService.fetchByMainSid(sid);
+        List<FinPaymentapplyTopDetailsVo> finPaymentapplyTopDetailsVos = finPaymentapplyTopService.fetchByMainSid(sid);
+        vo.setTrailerList(finPaymentapplyTrailerDetailsVos);
+        vo.setTopList(finPaymentapplyTopDetailsVos);
         return vo;
     }
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopMapper.java

@@ -26,13 +26,20 @@
 package com.yxt.anrui.fin.biz.finpaymentapplytop;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTop;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @Mapper
 public interface FinPaymentapplyTopMapper extends BaseMapper<FinPaymentapplyTop> {
 
-	@Delete("delete from fin_paymentapply_top where applySid = #{dtoSid}")
-	void delByMainSid(String dtoSid);
+    @Delete("delete from fin_paymentapply_top where applySid = #{dtoSid}")
+    void delByMainSid(String dtoSid);
+
+    @Select("select * from fin_paymentapply_top where applySid = #{mainSid}")
+    List<FinPaymentapplyTopDetailsVo> fetchByMainSid(String mainSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytop/FinPaymentapplyTopService.java

@@ -39,6 +39,8 @@ import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
 
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(付款申请) <br/>
  * File: FinPaymentapplyTopService.java <br/>
@@ -64,4 +66,8 @@ public class FinPaymentapplyTopService extends MybatisBaseService<FinPaymentappl
 	public void delByMainSid(String dtoSid) {
 		baseMapper.delByMainSid(dtoSid);
 	}
+
+	public List<FinPaymentapplyTopDetailsVo> fetchByMainSid(String mainSid) {
+		return baseMapper.fetchByMainSid(mainSid);
+	}
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerMapper.java

@@ -26,13 +26,20 @@
 package com.yxt.anrui.fin.biz.finpaymentapplytrailer;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailer;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 @Mapper
 public interface FinPaymentapplyTrailerMapper extends BaseMapper<FinPaymentapplyTrailer> {
 
-	@Delete("delete from fin_paymentapply_trailer where applySid = #{dtoSid}")
-	void delByMainSid(String dtoSid);
+    @Delete("delete from fin_paymentapply_trailer where applySid = #{dtoSid}")
+    void delByMainSid(String dtoSid);
+
+    @Select("select * from fin_paymentapply_trailer where applySid = #{mainSid}")
+    List<FinPaymentapplyTrailerDetailsVo> fetchByMainSid(String mainSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplytrailer/FinPaymentapplyTrailerService.java

@@ -39,6 +39,8 @@ import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto;
 
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(付款申请) <br/>
  * File: FinPaymentapplyTrailerService.java <br/>
@@ -64,4 +66,8 @@ public class FinPaymentapplyTrailerService extends MybatisBaseService<FinPayment
 	public void delByMainSid(String dtoSid) {
 		baseMapper.delByMainSid(dtoSid);
 	}
+
+	public List<FinPaymentapplyTrailerDetailsVo> fetchByMainSid(String mainSid) {
+		return baseMapper.fetchByMainSid(mainSid);
+	}
 }

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

@@ -249,26 +249,49 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
             newVoucher.setBussDate(voucher.getBussDate());
         }
         List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
+        BigDecimal shangnian = BigDecimal.ZERO;//上年
+        BigDecimal bennian = BigDecimal.ZERO;//本年
+        BigDecimal total = BigDecimal.ZERO;//合计
+        String deptNo = "";
+        String manufacturer = "";
+        String timeFlag = "";
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
-                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
-                Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
-                dto1.setSummary(voucherDetail.getTimeFlag() + "单车返利预提预留费用");
-                dto2.setSummary(voucherDetail.getTimeFlag() + "单车返利预提预留费用");
+                BigDecimal amount = voucherDetail.getAmount();
                 if (voucherDetail.getSceneCode().equals("上年")) {
-                    dto1.setSubjectNo("1161.02.15");
+                    shangnian = shangnian.add(amount);
                 } else if (voucherDetail.getSceneCode().equals("本年")) {
-                    dto1.setSubjectNo("1161.01.15");
+                    bennian = bennian.add(amount);
                 }
-                dto2.setSubjectNo("2181.07.00");
-                dto1.setDimensionDept(voucherDetail.getDeptCode());
-                dto1.setManufacturer(voucherDetail.getManufacturer());
-                dto2.setDimensionCustom(voucherDetail.getCustomerCode());
-                dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                dto2.setCredit(String.valueOf(voucherDetail.getAmount()));
+                total = total.add(amount);
+                deptNo = voucherDetail.getDeptCode();
+                manufacturer = voucherDetail.getManufacturer();
+                timeFlag = voucherDetail.getTimeFlag();
+            }
+            if (shangnian.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
+                dto1.setSummary(timeFlag + "单车返利预提预留费用");
+                dto1.setSubjectNo("1161.02.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(shangnian));
                 resultDetails.add(dto1);
-                resultDetails.add(dto2);
             }
+            if (bennian.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
+                dto1.setSummary(timeFlag + "单车返利预提预留费用");
+                dto1.setSubjectNo("1161.01.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(bennian));
+                resultDetails.add(dto1);
+            }
+            Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
+            dto2.setSummary(timeFlag + "单车返利预提预留费用");
+            dto2.setSubjectNo("2181.07.00");
+            dto2.setDimensionCustom("DZFCJFL");
+            dto2.setCredit(String.valueOf(total));
+            resultDetails.add(dto2);
             newVoucher.setResultDetails(resultDetails);
         }
         log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
@@ -366,18 +389,26 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         if (StringUtils.isNotBlank(voucher.getBussDate())) {
             newVoucher.setBussDate(voucher.getBussDate());
         }
+        BigDecimal cjwdx = BigDecimal.ZERO;// 单车厂家未兑现返利
+        BigDecimal shangnian = BigDecimal.ZERO;// 单车上年返利
+        BigDecimal bennian = BigDecimal.ZERO;// 单车本年返利
+        BigDecimal qtdk = BigDecimal.ZERO;// 单车应收厂家返利其他垫款
+        BigDecimal sntz = BigDecimal.ZERO;// 上年返利调整
+        BigDecimal bntz = BigDecimal.ZERO;// 本年返利调整
+        BigDecimal qttz = BigDecimal.ZERO;// 其他应付调整
+        BigDecimal cjwdxJR = BigDecimal.ZERO;// 厂家未兑现返利金融
+        String deptNo = "";
+        String manufacturer = "";
+        String timeFlag = "";
         List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
+                timeFlag = voucherDetail.getTimeFlag();
+                deptNo = voucherDetail.getDeptCode();
+                manufacturer = voucherDetail.getManufacturer();
                 if (voucherDetail.getRemarks().equals("金融贴息")) {
                     if (voucherDetail.getSceneCode().equals("1161.01.16")) {
-                        Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                        dto1.setSummary(voucherDetail.getTimeFlag() + "金融贴息上传");
-                        dto1.setSubjectNo(voucherDetail.getSceneCode());
-                        dto1.setDimensionDept(voucherDetail.getDeptCode());
-                        dto1.setManufacturer(voucherDetail.getManufacturer());
-                        dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                        resultDetails.add(dto1);
+                        cjwdxJR = cjwdxJR.add(voucherDetail.getAmount());
                     }
                     if (voucherDetail.getSceneCode().equals("1161.02.19") || voucherDetail.getSceneCode().equals("1161.01.19")) {
                         Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
@@ -393,48 +424,100 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                 }
                 if (voucherDetail.getRemarks().equals("返利上传")) {
                     if (voucherDetail.getSceneCode().equals("1161.01.16")) {
-                        Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                        dto1.setSummary(voucherDetail.getTimeFlag() + "单车返利上传");
-                        dto1.setSubjectNo(voucherDetail.getSceneCode());
-                        dto1.setDimensionDept(voucherDetail.getDeptCode());
-                        dto1.setManufacturer(voucherDetail.getManufacturer());
-                        dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                        resultDetails.add(dto1);
+                        cjwdx = cjwdx.add(voucherDetail.getAmount());
                     }
-                    if (voucherDetail.getSceneCode().equals("1161.02.15") ||
-                            voucherDetail.getSceneCode().equals("1161.01.15") ||
-                            voucherDetail.getSceneCode().equals("1161.04.00")) {
-                        Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                        dto1.setSummary(voucherDetail.getTimeFlag() + "单车返利上传");
-                        dto1.setSubjectNo(voucherDetail.getSceneCode());
-                        dto1.setDimensionDept(voucherDetail.getDeptCode());
-                        dto1.setManufacturer(voucherDetail.getManufacturer());
-                        dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
-                        resultDetails.add(dto1);
+                    if (voucherDetail.getSceneCode().equals("1161.02.15")) {
+                        shangnian = shangnian.add(voucherDetail.getAmount());
+                    }
+                    if (voucherDetail.getSceneCode().equals("1161.01.15")) {
+                        bennian = bennian.add(voucherDetail.getAmount());
+                    }
+                    if (voucherDetail.getSceneCode().equals("1161.04.00")) {
+                        qtdk = qtdk.add(voucherDetail.getAmount());
                     }
                 }
-
                 if (voucherDetail.getRemarks().equals("预留费用调整")) {
-                    if (voucherDetail.getSceneCode().equals("1161.02.15") || voucherDetail.getSceneCode().equals("1161.01.15")) {
-                        Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                        dto1.setSummary(voucherDetail.getTimeFlag() + "返利上传预留费用调整");
-                        dto1.setSubjectNo(voucherDetail.getSceneCode());
-                        dto1.setDimensionDept(voucherDetail.getDeptCode());
-                        dto1.setManufacturer(voucherDetail.getManufacturer());
-                        dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                        resultDetails.add(dto1);
+                    if (voucherDetail.getSceneCode().equals("1161.02.15")) {
+                        sntz = sntz.add(voucherDetail.getAmount());
+                    }
+                    if (voucherDetail.getSceneCode().equals("1161.01.15")) {
+                        bntz = bntz.add(voucherDetail.getAmount());
                     }
                     if (voucherDetail.getSceneCode().equals("2181.07.00")) {
-                        Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                        dto1.setSummary(voucherDetail.getTimeFlag() + "返利上传预留费用调整");
-                        dto1.setSubjectNo(voucherDetail.getSceneCode());
-                        dto1.setDimensionCustom(voucherDetail.getCustomerCode());
-                        dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
-                        resultDetails.add(dto1);
+                        qttz = qttz.add(voucherDetail.getAmount());
                     }
                 }
-
-
+            }
+            if (cjwdxJR.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "金融贴息上传");
+                dto1.setSubjectNo("1161.01.16");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(cjwdxJR));
+                resultDetails.add(dto1);
+            }
+            if (cjwdx.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "单车返利上传");
+                dto1.setSubjectNo("1161.01.16");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(cjwdx));
+                resultDetails.add(dto1);
+            }
+            if (shangnian.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "单车返利上传");
+                dto1.setSubjectNo("1161.02.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(shangnian));
+                resultDetails.add(dto1);
+            }
+            if (bennian.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "单车返利上传");
+                dto1.setSubjectNo("1161.01.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(bennian));
+                resultDetails.add(dto1);
+            }
+            if (qtdk.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "单车返利上传");
+                dto1.setSubjectNo("1161.04.00");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(qtdk));
+                resultDetails.add(dto1);
+            }
+            if (sntz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "返利上传预留费用调整");
+                dto1.setSubjectNo("1161.02.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(sntz));
+                resultDetails.add(dto1);
+            }
+            if (bntz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "返利上传预留费用调整");
+                dto1.setSubjectNo("1161.01.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(bntz));
+                resultDetails.add(dto1);
+            }
+            if (qttz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "返利上传预留费用调整");
+                dto1.setSubjectNo("2181.07.00");
+                dto1.setDimensionCustom("DZFCJFL");
+                dto1.setCredit(String.valueOf(qttz));
+                resultDetails.add(dto1);
             }
             newVoucher.setResultDetails(resultDetails);
         }
@@ -454,35 +537,65 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         if (StringUtils.isNotBlank(voucher.getBussDate())) {
             newVoucher.setBussDate(voucher.getBussDate());
         }
+        BigDecimal snfl = BigDecimal.ZERO;//上年返利
+        BigDecimal bnfl = BigDecimal.ZERO;//本年返利
+        BigDecimal cjfl = BigDecimal.ZERO;//厂家返利
+        BigDecimal qtfl = BigDecimal.ZERO;//其他应付款
+        String deptNo = "";
+        String manufacturer = "";
+        String timeFlag = "";
         List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
-                if (voucherDetail.getSceneCode().equals("1161.02.15") || voucherDetail.getSceneCode().equals("1161.01.15")) {
-                    Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                    dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利预提");
-                    dto1.setSubjectNo(voucherDetail.getSceneCode());
-                    dto1.setDimensionDept(voucherDetail.getDeptCode());
-                    dto1.setManufacturer(voucherDetail.getManufacturer());
-                    dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                    resultDetails.add(dto1);
+                deptNo = voucherDetail.getDeptCode();
+                manufacturer = voucherDetail.getManufacturer();
+                timeFlag = voucherDetail.getTimeFlag();
+                if (voucherDetail.getSceneCode().equals("1161.02.15")) {
+                    snfl = snfl.add(voucherDetail.getAmount());
+                }
+                if (voucherDetail.getSceneCode().equals("1161.01.15")) {
+                    bnfl = bnfl.add(voucherDetail.getAmount());
                 }
                 if (voucherDetail.getSceneCode().equals("6401.13")) {
-                    Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                    dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利预提");
-                    dto1.setSubjectNo(voucherDetail.getSceneCode());
-                    dto1.setDimensionDept(voucherDetail.getDeptCode());
-                    dto1.setDebit(voucherDetail.getAmount().negate().toString());//转负数
-                    resultDetails.add(dto1);
+                    cjfl = cjfl.add(voucherDetail.getAmount());
                 }
                 if (voucherDetail.getSceneCode().equals("2181.07.00")) {
-                    Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                    dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利预提");
-                    dto1.setSubjectNo(voucherDetail.getSceneCode());
-                    dto1.setDimensionCustom(voucherDetail.getCustomerCode());
-                    dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
-                    resultDetails.add(dto1);
+                    qtfl = qtfl.add(voucherDetail.getAmount());
                 }
-
+            }
+            if (snfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利预提");
+                dto1.setSubjectNo("1161.02.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(snfl));
+                resultDetails.add(dto1);
+            }
+            if (bnfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利预提");
+                dto1.setSubjectNo("1161.01.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(bnfl));
+                resultDetails.add(dto1);
+            }
+            if (cjfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利预提");
+                dto1.setSubjectNo("6401.13");
+                dto1.setDimensionDept(deptNo);
+                dto1.setDebit(cjfl.negate().toString());//转负数
+                resultDetails.add(dto1);
+            }
+            if (qtfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利预提");
+                dto1.setSubjectNo("2181.07.00");
+                dto1.setDimensionCustom("DZFCJFL");
+                dto1.setCredit(String.valueOf(qtfl));
+                resultDetails.add(dto1);
             }
             newVoucher.setResultDetails(resultDetails);
         }
@@ -502,118 +615,217 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         if (StringUtils.isNotBlank(voucher.getBussDate())) {
             newVoucher.setBussDate(voucher.getBussDate());
         }
+        BigDecimal cjflxx = BigDecimal.ZERO;//厂家未兑现行销
+        BigDecimal qtyfxx = BigDecimal.ZERO;//其他应付行销
+        BigDecimal dkxx = BigDecimal.ZERO;//垫款行销
+        BigDecimal qtdkxx = BigDecimal.ZERO;//其他垫款行销
+        BigDecimal srlxx = BigDecimal.ZERO;//收入行销
+        BigDecimal dkxxtz = BigDecimal.ZERO;//垫款行销调整
+        BigDecimal srxxtz = BigDecimal.ZERO;//收入行销调整
+        BigDecimal cjfl = BigDecimal.ZERO;//厂家未兑现
+        BigDecimal snfl = BigDecimal.ZERO;//上年返利
+        BigDecimal bnfl = BigDecimal.ZERO;//本年返利
+        BigDecimal qtdk = BigDecimal.ZERO;//其他垫款
+        BigDecimal snfltz = BigDecimal.ZERO;//上年返利调整
+        BigDecimal bnfltz = BigDecimal.ZERO;//本年返利调整
+        BigDecimal cjfltz = BigDecimal.ZERO;//厂家返利调整
+        BigDecimal qtyftz = BigDecimal.ZERO;//其他应付调整
+        String timeFlag = "";
+        String deptNo = "";
+        String manufacturer = "";
         List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
+                timeFlag = voucherDetail.getTimeFlag();
+                deptNo = voucherDetail.getDeptCode();
+                manufacturer = voucherDetail.getManufacturer();
                 if (!voucherDetail.getType().equals("行销活动")) {
                     if (voucherDetail.getRemarks().equals("返利上传")) {
                         if (voucherDetail.getSceneCode().equals("1161.01.16")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利上传");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setManufacturer(voucherDetail.getManufacturer());
-                            dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
+                            cjfl = cjfl.add(voucherDetail.getAmount());
+                        }
+                        if (voucherDetail.getSceneCode().equals("1161.02.15")) {
+                            snfl = snfl.add(voucherDetail.getAmount());
+                        }
+                        if (voucherDetail.getSceneCode().equals("1161.01.15")) {
+                            bnfl = bnfl.add(voucherDetail.getAmount());
                         }
-                        if (voucherDetail.getSceneCode().equals("1161.02.15") ||
-                                voucherDetail.getSceneCode().equals("1161.01.15") ||
-                                voucherDetail.getSceneCode().equals("1161.04.00")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利上传");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setManufacturer(voucherDetail.getManufacturer());
-                            dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
+                        if (voucherDetail.getSceneCode().equals("1161.04.00")) {
+                            qtdk = qtdk.add(voucherDetail.getAmount());
                         }
                     }
                     if (voucherDetail.getRemarks().equals("返利调整")) {
-                        if (voucherDetail.getSceneCode().equals("1161.02.15") || voucherDetail.getSceneCode().equals("1161.01.15")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利调整");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setManufacturer(voucherDetail.getManufacturer());
-                            dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
+                        if (voucherDetail.getSceneCode().equals("1161.02.15")) {
+                            snfltz = snfltz.add(voucherDetail.getAmount());
+                        }
+                        if (voucherDetail.getSceneCode().equals("1161.01.15")) {
+                            bnfltz = bnfltz.add(voucherDetail.getAmount());
                         }
                         if (voucherDetail.getSceneCode().equals("6401.13")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利调整");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setDebit(voucherDetail.getAmount().negate().toString());
-                            resultDetails.add(dto1);
+                            cjfltz = cjfltz.add(voucherDetail.getAmount());
                         }
                         if (voucherDetail.getSceneCode().equals("2181.07.00")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利调整");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionCustom(voucherDetail.getCustomerCode());
-                            dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
+                            qtyftz = qtyftz.add(voucherDetail.getAmount());
                         }
                     }
                 } else {
                     if (voucherDetail.getRemarks().equals("返利上传")) {
                         if (voucherDetail.getSceneCode().equals("1161.01.16")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "行销返利上传");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setManufacturer(voucherDetail.getManufacturer());
-                            dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
+                            cjflxx = cjflxx.add(voucherDetail.getAmount());
                         }
                         if (voucherDetail.getSceneCode().equals("2181.07.00")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "行销返利上传");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionCustom(voucherDetail.getCustomerCode());
-                            dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
+                            qtyfxx = qtyfxx.add(voucherDetail.getAmount());
+                        }
+                        if (voucherDetail.getSceneCode().equals("1161.03.00")) {
+                            dkxx = dkxx.add(voucherDetail.getAmount());
                         }
-                        if (voucherDetail.getSceneCode().equals("1161.03.00") ||
-                                voucherDetail.getSceneCode().equals("1161.04.00")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "行销返利上传");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setManufacturer(voucherDetail.getManufacturer());
-                            dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
+                        if (voucherDetail.getSceneCode().equals("1161.04.00")) {
+                            qtdkxx = qtdkxx.add(voucherDetail.getAmount());
                         }
                         if (voucherDetail.getSceneCode().equals("6401.14")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "行销返利上传");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setCredit(voucherDetail.getAmount().negate().toString());
-                            resultDetails.add(dto1);
+                            srlxx = srlxx.add(voucherDetail.getAmount());
                         }
                     }
                     if (voucherDetail.getRemarks().equals("返利调整")) {
                         if (voucherDetail.getSceneCode().equals("1161.03.00")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利调整");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setManufacturer(voucherDetail.getManufacturer());
-                            dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
+                            dkxxtz = dkxxtz.add(voucherDetail.getAmount());
                         }
                         if (voucherDetail.getSceneCode().equals("6401.14")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "专项返利调整");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setDebit(voucherDetail.getAmount().negate().toString());
-                            resultDetails.add(dto1);
+                            srxxtz = srxxtz.add(voucherDetail.getAmount());
                         }
                     }
                 }
             }
+            if (cjfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利上传");
+                dto1.setSubjectNo("1161.01.16");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(cjfl));
+                resultDetails.add(dto1);
+            }
+            if (snfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利上传");
+                dto1.setSubjectNo("1161.02.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(snfl));
+                resultDetails.add(dto1);
+            }
+            if (bnfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利上传");
+                dto1.setSubjectNo("1161.01.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(bnfl));
+                resultDetails.add(dto1);
+            }
+            if (qtdk.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利上传");
+                dto1.setSubjectNo("1161.04.00");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(qtdk));
+                resultDetails.add(dto1);
+            }
+            if (snfltz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利调整");
+                dto1.setSubjectNo("1161.02.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(snfltz));
+                resultDetails.add(dto1);
+            }
+            if (bnfltz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利调整");
+                dto1.setSubjectNo("1161.01.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(bnfltz));
+                resultDetails.add(dto1);
+            }
+            if (cjfltz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利调整");
+                dto1.setSubjectNo("6401.13");
+                dto1.setDimensionDept(deptNo);
+                dto1.setDebit(cjfltz.negate().toString());
+                resultDetails.add(dto1);
+            }
+            if (qtyftz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利调整");
+                dto1.setSubjectNo("2181.07.00");
+                dto1.setDimensionCustom("DZFCJFL");
+                dto1.setCredit(String.valueOf(qtyftz));
+                resultDetails.add(dto1);
+            }
+            if (cjflxx.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "行销返利上传");
+                dto1.setSubjectNo("1161.01.16");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(cjflxx));
+                resultDetails.add(dto1);
+            }
+            if (qtyfxx.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "行销返利上传");
+                dto1.setSubjectNo("2181.07.00");
+                dto1.setDimensionCustom("DZFCJFL");
+                dto1.setCredit(String.valueOf(qtyfxx));
+                resultDetails.add(dto1);
+            }
+            if (dkxx.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "行销返利上传");
+                dto1.setSubjectNo("1161.03.00");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(dkxx));
+                resultDetails.add(dto1);
+            }
+            if (qtdkxx.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "行销返利上传");
+                dto1.setSubjectNo("1161.04.00");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(qtdkxx));
+                resultDetails.add(dto1);
+            }
+            if (srlxx.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "行销返利上传");
+                dto1.setSubjectNo("6401.14");
+                dto1.setDimensionDept(deptNo);
+                dto1.setCredit(srlxx.negate().toString());
+                resultDetails.add(dto1);
+            }
+            if (dkxxtz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利调整");
+                dto1.setSubjectNo("1161.03.00");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(dkxxtz));
+                resultDetails.add(dto1);
+            }
+            if (srxxtz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "专项返利调整");
+                dto1.setSubjectNo("6401.14");
+                dto1.setDimensionDept(deptNo);
+                dto1.setDebit(srxxtz.negate().toString());
+                resultDetails.add(dto1);
+            }
             newVoucher.setResultDetails(resultDetails);
         }
         log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
@@ -632,27 +844,54 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         if (StringUtils.isNotBlank(voucher.getBussDate())) {
             newVoucher.setBussDate(voucher.getBussDate());
         }
+        BigDecimal sn = BigDecimal.ZERO; //上年返利
+        BigDecimal bn = BigDecimal.ZERO;//本年返利
+        BigDecimal cd = BigDecimal.ZERO;//承兑贴息
+        String timeFlag = "";
+        String deptNo = "";
+        String manufacturer = "";
         List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
-                if (voucherDetail.getSceneCode().equals("1161.02.15") || voucherDetail.getSceneCode().equals("1161.01.15")) {
-                    Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                    dto1.setSummary(voucherDetail.getTimeFlag() + "回款返利预提");
-                    dto1.setSubjectNo(voucherDetail.getSceneCode());
-                    dto1.setDimensionDept(voucherDetail.getDeptCode());
-                    dto1.setManufacturer(voucherDetail.getManufacturer());
-                    dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                    resultDetails.add(dto1);
+                timeFlag = voucherDetail.getTimeFlag();
+                deptNo = voucherDetail.getDeptCode();
+                manufacturer = voucherDetail.getManufacturer();
+                if (voucherDetail.getSceneCode().equals("1161.02.15")) {
+                    sn = sn.add(voucherDetail.getAmount());
+                }
+                if (voucherDetail.getSceneCode().equals("1161.01.15")) {
+                    bn = bn.add(voucherDetail.getAmount());
                 }
                 if (voucherDetail.getSceneCode().equals("2191.03")) {
-                    Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                    dto1.setSummary(voucherDetail.getTimeFlag() + "回款返利预提");
-                    dto1.setSubjectNo(voucherDetail.getSceneCode());
-                    dto1.setDimensionDept(voucherDetail.getDeptCode());
-                    dto1.setCredit(voucherDetail.getAmount().toString());
-                    resultDetails.add(dto1);
+                    cd = cd.add(voucherDetail.getAmount());
                 }
             }
+            if (sn.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利预提");
+                dto1.setSubjectNo("1161.02.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(sn));
+                resultDetails.add(dto1);
+            }
+            if (bn.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利预提");
+                dto1.setSubjectNo("1161.01.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(bn));
+                resultDetails.add(dto1);
+            }
+            if (cd.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利预提");
+                dto1.setSubjectNo("2191.03");
+                dto1.setDimensionDept(deptNo);
+                dto1.setCredit(cd.toString());
+                resultDetails.add(dto1);
+            }
             newVoucher.setResultDetails(resultDetails);
         }
         log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
@@ -671,59 +910,110 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         if (StringUtils.isNotBlank(voucher.getBussDate())) {
             newVoucher.setBussDate(voucher.getBussDate());
         }
+        BigDecimal cjfl = BigDecimal.ZERO;//厂家未兑现
+        BigDecimal snfl = BigDecimal.ZERO;//上年返利
+        BigDecimal bnfl = BigDecimal.ZERO;//本年返利
+        BigDecimal cjfltz = BigDecimal.ZERO;//厂家返利调整
+        BigDecimal snfltz = BigDecimal.ZERO;//上年返利调整
+        BigDecimal bnfltz = BigDecimal.ZERO;//本年返利调整
+        BigDecimal ndsy = BigDecimal.ZERO;//以前年度损益
+        String timeFlag = "";
+        String deptNo = "";
+        String manufacturer = "";
         List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
         if (!voucherDetails.isEmpty()) {
             for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
-                    if (voucherDetail.getRemarks().equals("返利上传")) {
-                        if (voucherDetail.getSceneCode().equals("1161.01.16")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "回款返利上传");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setManufacturer(voucherDetail.getManufacturer());
-                            dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
-                        }
-                        if (voucherDetail.getSceneCode().equals("1161.02.15") ||
-                                voucherDetail.getSceneCode().equals("1161.01.15")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "回款返利上传");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setManufacturer(voucherDetail.getManufacturer());
-                            dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
-                        }
+                timeFlag = voucherDetail.getTimeFlag();
+                deptNo = voucherDetail.getDeptCode();
+                manufacturer = voucherDetail.getManufacturer();
+                BigDecimal amount = voucherDetail.getAmount();
+                if (voucherDetail.getRemarks().equals("返利上传")) {
+                    if (voucherDetail.getSceneCode().equals("1161.01.16")) {
+                        cjfl = cjfl.add(amount);
                     }
-                    if (voucherDetail.getRemarks().equals("返利调整")) {
-                        if (voucherDetail.getSceneCode().equals("6401.13")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "回款返利上传调整");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setDebit(voucherDetail.getAmount().negate().toString());
-                            resultDetails.add(dto1);
-                        }
-                        if (voucherDetail.getSceneCode().equals("1161.01.15") || voucherDetail.getSceneCode().equals("1161.02.15")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "回款返利上传调整");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setDimensionDept(voucherDetail.getDeptCode());
-                            dto1.setManufacturer(voucherDetail.getManufacturer());
-                            dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
-                        }
-                        if (voucherDetail.getSceneCode().equals("6801")) {
-                            Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
-                            dto1.setSummary(voucherDetail.getTimeFlag() + "回款返利上传调整");
-                            dto1.setSubjectNo(voucherDetail.getSceneCode());
-                            dto1.setCredit(String.valueOf(voucherDetail.getAmount()));
-                            resultDetails.add(dto1);
-                        }
+                    if (voucherDetail.getSceneCode().equals("1161.02.15")) {
+                        snfl = snfl.add(amount);
                     }
-
+                    if (voucherDetail.getSceneCode().equals("1161.01.15")) {
+                        bnfl = bnfl.add(amount);
+                    }
+                }
+                if (voucherDetail.getRemarks().equals("返利调整")) {
+                    if (voucherDetail.getSceneCode().equals("6401.13")) {
+                        cjfltz = cjfltz.add(amount);
+                    }
+                    if (voucherDetail.getSceneCode().equals("1161.01.15")) {
+                        bnfltz = bnfltz.add(amount);
+                    }
+                    if (voucherDetail.getSceneCode().equals("1161.02.15")) {
+                        snfltz = snfltz.add(amount);
+                    }
+                    if (voucherDetail.getSceneCode().equals("6801")) {
+                        ndsy = ndsy.add(amount);
+                    }
+                }
+            }
+            if (cjfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利上传");
+                dto1.setSubjectNo("1161.01.16");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(cjfl));
+                resultDetails.add(dto1);
+            }
+            if (snfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利上传");
+                dto1.setSubjectNo("1161.02.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(snfl));
+                resultDetails.add(dto1);
+            }
+            if (bnfl.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利上传");
+                dto1.setSubjectNo("1161.01.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setCredit(String.valueOf(bnfl));
+                resultDetails.add(dto1);
+            }
+            if (cjfltz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利上传调整");
+                dto1.setSubjectNo("6401.13");
+                dto1.setDimensionDept(deptNo);
+                dto1.setDebit(cjfltz.negate().toString());
+                resultDetails.add(dto1);
+            }
+            if (bnfltz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利上传调整");
+                dto1.setSubjectNo("1161.01.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(bnfltz));
+                resultDetails.add(dto1);
+            }
+            if (snfltz.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利上传调整");
+                dto1.setSubjectNo("1161.02.15");
+                dto1.setDimensionDept(deptNo);
+                dto1.setManufacturer(manufacturer);
+                dto1.setDebit(String.valueOf(snfltz));
+                resultDetails.add(dto1);
+                newVoucher.setResultDetails(resultDetails);
+            }
+            if (ndsy.compareTo(BigDecimal.ZERO) != 0) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto();
+                dto1.setSummary(timeFlag + "回款返利上传调整");
+                dto1.setSubjectNo("6801");
+                dto1.setCredit(String.valueOf(ndsy));
+                resultDetails.add(dto1);
             }
-            newVoucher.setResultDetails(resultDetails);
         }
         log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
         return voucherService.saveVoucher(newVoucher);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/costadjustmentsbill/data_model.json

@@ -18,10 +18,6 @@
   "FACCTPOLICYID": {
     "FNumber": "KJZC01_SYS"
   },
-  "FCurrencyID": {
-    "FNumber": ""
-  },
-  "FAdjustmentReason": "",
   "FAcctgId": "0",
   "FDocumentStatus": "Z",
   "FCreateDate": "@KD_FDATE",

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -723,8 +723,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
             }
             ScmVehRebateExcelInfo importVo = new ScmVehRebateExcelInfo();
             int physicalNumberOfCells = row.getPhysicalNumberOfCells();
-            if (physicalNumberOfCells < 8) {
-                physicalNumberOfCells = 8;
+            if (physicalNumberOfCells < 10) {
+                physicalNumberOfCells = 10;
             }
             for (int i = 0; i < physicalNumberOfCells; i++) {
                 String trim = new String();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

@@ -38,7 +38,6 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusOrderAndVehInfo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
-import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.costadjustmentsbill.CostAdjustmentsBill;
@@ -61,7 +60,10 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.flow.FlowTaskVo;
 import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate;
-import com.yxt.anrui.scm.api.scmvehrebatewith.*;
+import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWith;
+import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo;
+import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto;
+import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithPdfVo;
 import com.yxt.anrui.scm.api.scmvehrebatewithapply.*;
 import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeQuery;
 import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeVo;
@@ -499,8 +501,9 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
             String finalSummaryTag = summaryTag;
             String[] split = finalSummaryTag.split("年");
             String y1 = split[0]; //预提申请标题年份
-            map.forEach((k, v) -> {
-                List<ScmVehRebate> rebates = v;
+            // 方法一：在日常开发中使用比较多的，一般在键值对都需要使用
+            for (Map.Entry<String, List<ScmVehRebate>> entry : map.entrySet()) {
+                List<ScmVehRebate> v = entry.getValue();
                 GeneralVoucher generalVoucher = new GeneralVoucher();
                 generalVoucher.setBussDate(format);
                 List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
@@ -611,7 +614,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
                                 BigDecimal esRebate = new BigDecimal(rebate.getEstimateRebate());
                                 if (esRebate.compareTo(BigDecimal.ZERO) != 0) {
                                     voucherDetail.setAmount(esRebate);
-                                    voucherDetails.add(voucherDetail);
+                                    voucherDetailsJR.add(voucherDetail);
                                 }
                             }
 
@@ -621,16 +624,16 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
                         generalVoucher.setVoucherDetails(voucherDetails);
                         finKingDeeFeign.saveRebatePrepareVoucher(generalVoucher);
                     }
-                    if (!voucherDetailsJR.isEmpty()) {
-                        generalVoucher.setVoucherDetails(voucherDetailsJR);
-                        finKingDeeFeign.saveJRRebatePrepareVoucher(generalVoucher);
-                    }
+//                    if (!voucherDetailsJR.isEmpty()) {
+//                        generalVoucher.setVoucherDetails(voucherDetailsJR);
+//                        finKingDeeFeign.saveJRRebatePrepareVoucher(generalVoucher);
+//                    }
                     if (!resultDetails.isEmpty()) {
                         costAdjustmentsBill.setResultDetails(resultDetails);
                         finKingDeeFeign.pushCostAdjustmentsBill(costAdjustmentsBill);
                     }
                 }
-            });
+            }
         }
     }