|
|
@ -68,7 +68,6 @@ import com.yxt.anrui.scm.api.scmvehrebatecheckapply.flow.SubmitScmVehRebateCheck |
|
|
|
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo; |
|
|
|
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto; |
|
|
|
import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo; |
|
|
|
import com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApply; |
|
|
|
import com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateService; |
|
|
|
import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService; |
|
|
|
import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService; |
|
|
@ -534,8 +533,8 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba |
|
|
|
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<>(); |
|
|
@ -712,7 +711,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba |
|
|
|
voucherDetail2.setTimeFlag(finalSummaryTag); |
|
|
|
voucherDetail2.setCustomerCode("DZFCJFL"); //客户编码
|
|
|
|
voucherDetail2.setAmount(adMoney); |
|
|
|
voucherDetail2.setSceneCode("1161.04.00"); |
|
|
|
voucherDetail2.setSceneCode("2181.07.00"); |
|
|
|
voucherDetail2.setRemarks("预留费用调整"); |
|
|
|
voucherDetails.add(voucherDetail2); |
|
|
|
} |
|
|
@ -827,12 +826,12 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba |
|
|
|
generalVoucher.setVoucherDetails(voucherDetails); |
|
|
|
finKingDeeFeign.saveRebateReviewVoucher(generalVoucher); |
|
|
|
} |
|
|
|
if (!resultDetails.isEmpty()) { |
|
|
|
costAdjustmentsBill.setResultDetails(resultDetails); |
|
|
|
finKingDeeFeign.pushCostAdjustmentsBill(costAdjustmentsBill); |
|
|
|
} |
|
|
|
// if (!resultDetails.isEmpty()) {
|
|
|
|
// costAdjustmentsBill.setResultDetails(resultDetails);
|
|
|
|
// finKingDeeFeign.pushCostAdjustmentsBill(costAdjustmentsBill);
|
|
|
|
// }
|
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|