diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialRebateCheckPdfVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialRebateCheckPdfVo.java new file mode 100644 index 0000000000..cbb9ea67da --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialRebateCheckPdfVo.java @@ -0,0 +1,74 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmspecialrebatecheckapply; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(单车返利预提申请)
+ * File: ScmVehRebateWithVo.java
+ * Class: com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithVo
+ * Description: 单车返利预提表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-08-25 09:04:38
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "单车返利预提表 视图数据对象", description = "单车返利预提表 视图数据对象") +public class ScmSpecialRebateCheckPdfVo implements Vo { + + private Integer id; + @ApiModelProperty("采购系统") + private String cgxt; + @ApiModelProperty("品牌") + private String pp; + @ApiModelProperty("返利类型") + private String fllx; + @ApiModelProperty("台数") + private String ts; + @ApiModelProperty("预提金额") + private String ytje; + @ApiModelProperty("其中预提费用") + private String ytfy; + @ApiModelProperty("上传金额") + private String scje; + @ApiModelProperty("其中待确定金额") + private String dqdje; + @ApiModelProperty("其中费用") + private String fy; + @ApiModelProperty("返利调整金额") + private String tzje; + @ApiModelProperty("其中费用调整金额") + private String fytzje; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java index 2a86f96195..8fc229845d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java @@ -61,6 +61,9 @@ public class ScmSpecialrebateCheckapplyDetailsVo implements Vo { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("创建日期") private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; @ApiModelProperty("备注") private String remarks; // 备注 @ApiModelProperty("单据编号") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java index 8d6c1b7c46..2e92969de8 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java @@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -66,21 +67,21 @@ public class ScmSpecialrebateCheckapplydetailDetailsVo implements Vo { @ApiModelProperty("返利类型value") private String rebateTypeValue; // 返利类型value @ApiModelProperty("台数") - private String num; // 台数 + private BigDecimal num; // 台数 @ApiModelProperty("预提金额") - private String withRebate; // 预提金额 + private BigDecimal withRebate; // 预提金额 @ApiModelProperty("其中预提费用") - private String withholdCost; + private BigDecimal withholdCost; @ApiModelProperty("上传金额") - private String uploadMoney; // 上传金额 + private BigDecimal uploadMoney; // 上传金额 @ApiModelProperty("待确定金额") - private String stayDetermineMoney; // 待确定金额 + private BigDecimal stayDetermineMoney; // 待确定金额 @ApiModelProperty("调整金额") - private String adjustmentMoney; // 调整金额 + private BigDecimal adjustmentMoney; // 调整金额 @ApiModelProperty("费用调整金额") - private String fyAdjustmentMoney; + private BigDecimal fyAdjustmentMoney; @ApiModelProperty("费用") - private String money; // 费用 + private BigDecimal money; // 费用 @ApiModelProperty("专项返利sid") private String specialRebateSid; // 专项返利sid @ApiModelProperty("核对申请sid") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehRebateCheckPdfVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehRebateCheckPdfVo.java new file mode 100644 index 0000000000..ed942b2666 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehRebateCheckPdfVo.java @@ -0,0 +1,74 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehrebatecheckapply; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(单车返利预提申请)
+ * File: ScmVehRebateWithVo.java
+ * Class: com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithVo
+ * Description: 单车返利预提表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-08-25 09:04:38
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "单车返利预提表 视图数据对象", description = "单车返利预提表 视图数据对象") +public class ScmVehRebateCheckPdfVo implements Vo { + + private Integer id; + @ApiModelProperty("采购系统") + private String cgxt; + @ApiModelProperty("品牌") + private String pp; + @ApiModelProperty("返利类型") + private String fllx; + @ApiModelProperty("台数") + private String ts; + @ApiModelProperty("预提金额") + private String ytje; + @ApiModelProperty("其中预提费用") + private String ytfy; + @ApiModelProperty("上传金额") + private String scje; + @ApiModelProperty("其中待确定金额") + private String dqdje; + @ApiModelProperty("其中费用") + private String fy; + @ApiModelProperty("返利调整金额") + private String tzje; + @ApiModelProperty("其中费用调整金额") + private String fytzje; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDetailsVo.java index a3393bef5b..529c281785 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyDetailsVo.java @@ -63,6 +63,9 @@ public class ScmVehrebateCheckapplyDetailsVo implements Vo { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("创建日期") private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("办结日期") + private Date finishTime; @ApiModelProperty("备注") private String remarks; // 备注 @ApiModelProperty("部门sid") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java index 3c40f3afaa..1b7a2442a4 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailDetailsVo.java @@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -64,21 +65,21 @@ public class ScmVehrebateCheckapplydetailDetailsVo implements Vo { @ApiModelProperty("返利类型value") private String rebateTypeValue; // 返利类型value @ApiModelProperty("数量") - private String num; // 台数 + private BigDecimal num; // 台数 @ApiModelProperty("预提金额") - private String withRebate; // 预提金额 + private BigDecimal withRebate; // 预提金额 @ApiModelProperty("其中预提费用") - private String withholdCost; + private BigDecimal withholdCost; @ApiModelProperty("上传金额") - private String uploadMoney; // 上传金额 + private BigDecimal uploadMoney; // 上传金额 @ApiModelProperty("待确定金额") - private String stayDetermineMoney; // 待确定金额 + private BigDecimal stayDetermineMoney; // 待确定金额 @ApiModelProperty("调整金额") - private String adjustmentMoney; // 调整金额 + private BigDecimal adjustmentMoney; // 调整金额 @ApiModelProperty("费用调整金额") - private String fyAdjustmentMoney; + private BigDecimal fyAdjustmentMoney; @ApiModelProperty("费用") - private String money; // 费用 + private BigDecimal money; // 费用 @ApiModelProperty("单车返利sid") private String vehRebateSid; // 单车返利sid @ApiModelProperty("核对申请sid") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java index 6fe1a64068..41372b89a0 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java @@ -89,7 +89,9 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl @Override public ResultBean createPdf(String specialCheckSid, String userName) { - return null; + ResultBean rb = ResultBean.fireFail(); + PdfPath pdf = scmSpecialrebateCheckapplyService.createPdf(specialCheckSid, userName); + return rb.success().setData(pdf); } @Override diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java index 2eb1619520..6ac57ebe4c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java @@ -35,6 +35,7 @@ import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandFeign; import com.yxt.anrui.base.common.utils.Rule; +import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; import com.yxt.anrui.flowable.api.flow.FlowableFeign; @@ -44,6 +45,7 @@ import com.yxt.anrui.flowable.api.flow2.FlowFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; @@ -61,13 +63,23 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialReb import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo; +import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehRebateCheckPdfVo; +import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyDetailsVo; +import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.PdfPath; import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService; import com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailService; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.ConstantUtils; import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.WordUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.messagecenter.api.message.Message; +import com.yxt.messagecenter.api.message.MessageFeign; +import com.yxt.messagecenter.api.messagelist.MessageList; +import com.yxt.messagecenter.api.messagelist.MessageListFeign; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -77,6 +89,8 @@ import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; +import static java.util.Comparator.comparing; + @Service public class ScmSpecialrebateCheckapplyService extends MybatisBaseService { @@ -88,8 +102,6 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService listPageVo(PagerQuery pq) { ScmSpecialrebateCheckapplyQuery query = pq.getParams(); @@ -1038,4 +1056,120 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService scmWhenSpecialrebateCheckapplydetailDetails = scmSpecialrebateCheckapplyDetailsVo.getScmWhenSpecialrebateCheckapplydetailDetails(); + Map dataMap = new HashMap(); + //标题 + dataMap.put("title",scmSpecialrebateCheckapplyDetailsVo.getCheckApply() + "专项返利核对审批"); + //分公司 + dataMap.put("useOrgName", scmSpecialrebateCheckapplyDetailsVo.getCreateOrgName()); + //创建部门 + dataMap.put("deptName", scmSpecialrebateCheckapplyDetailsVo.getDeptName()); + //创建人 + dataMap.put("createByName", scmSpecialrebateCheckapplyDetailsVo.getCreateByName()); + //创建日期 + dataMap.put("createTime", DateUtil.formatDate(scmSpecialrebateCheckapplyDetailsVo.getCreateTime())); + //办结日期 + dataMap.put("finishTime", DateUtil.formatDate(scmSpecialrebateCheckapplyDetailsVo.getFinishTime())); + //审批编号 + dataMap.put("billNo", scmSpecialrebateCheckapplyDetailsVo.getBillNo()); + List scmSpecialRebateCheckPdfVos = new ArrayList<>(); + //循环获取车辆信息 + Integer i = 1; + for (ScmSpecialrebateCheckapplydetailDetailsVo scmSpecialrebateCheckapplydetailDetailsVo : scmWhenSpecialrebateCheckapplydetailDetails) { + ScmSpecialRebateCheckPdfVo scmSpecialRebateCheckPdfVo = new ScmSpecialRebateCheckPdfVo(); + scmSpecialRebateCheckPdfVo.setId(i); + i = i + 1; + scmSpecialRebateCheckPdfVo.setCgxt(scmSpecialrebateCheckapplydetailDetailsVo.getPurchaseSystemName()); + scmSpecialRebateCheckPdfVo.setPp(scmSpecialrebateCheckapplydetailDetailsVo.getBrandName()); + scmSpecialRebateCheckPdfVo.setFllx(scmSpecialrebateCheckapplydetailDetailsVo.getRebateTypeValue()); + scmSpecialRebateCheckPdfVo.setTs(scmSpecialrebateCheckapplydetailDetailsVo.getNum().toString()); + scmSpecialRebateCheckPdfVo.setYtje(scmSpecialrebateCheckapplydetailDetailsVo.getWithRebate().toString()); + scmSpecialRebateCheckPdfVo.setYtfy(scmSpecialrebateCheckapplydetailDetailsVo.getWithholdCost().toString()); + scmSpecialRebateCheckPdfVo.setScje(scmSpecialrebateCheckapplydetailDetailsVo.getUploadMoney().toString()); + scmSpecialRebateCheckPdfVo.setDqdje(scmSpecialrebateCheckapplydetailDetailsVo.getStayDetermineMoney().toString()); + scmSpecialRebateCheckPdfVo.setFy(scmSpecialrebateCheckapplydetailDetailsVo.getMoney().toString()); + scmSpecialRebateCheckPdfVo.setTzje(scmSpecialrebateCheckapplydetailDetailsVo.getAdjustmentMoney().toString()); + scmSpecialRebateCheckPdfVo.setFytzje(scmSpecialrebateCheckapplydetailDetailsVo.getFyAdjustmentMoney().toString()); + scmSpecialRebateCheckPdfVos.add(scmSpecialRebateCheckPdfVo); + } + dataMap.put("wlList", scmSpecialRebateCheckPdfVos); + dataMap.put("tst", scmWhenSpecialrebateCheckapplydetailDetails.stream().map(ScmSpecialrebateCheckapplydetailDetailsVo::getNum).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + dataMap.put("ytjet", scmWhenSpecialrebateCheckapplydetailDetails.stream().map(ScmSpecialrebateCheckapplydetailDetailsVo::getWithRebate).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + dataMap.put("ytfyt", scmWhenSpecialrebateCheckapplydetailDetails.stream().map(ScmSpecialrebateCheckapplydetailDetailsVo::getWithholdCost).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + dataMap.put("scjet", scmWhenSpecialrebateCheckapplydetailDetails.stream().map(ScmSpecialrebateCheckapplydetailDetailsVo::getUploadMoney).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + dataMap.put("dqdjet", scmWhenSpecialrebateCheckapplydetailDetails.stream().map(ScmSpecialrebateCheckapplydetailDetailsVo::getStayDetermineMoney).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + dataMap.put("fyt", scmWhenSpecialrebateCheckapplydetailDetails.stream().map(ScmSpecialrebateCheckapplydetailDetailsVo::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + dataMap.put("tzjet", scmWhenSpecialrebateCheckapplydetailDetails.stream().map(ScmSpecialrebateCheckapplydetailDetailsVo::getAdjustmentMoney).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + dataMap.put("fytzjet", scmWhenSpecialrebateCheckapplydetailDetails.stream().map(ScmSpecialrebateCheckapplydetailDetailsVo::getFyAdjustmentMoney).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + dataMap.put("remarks", scmSpecialrebateCheckapplyDetailsVo.getRemarks()); + //获取审批记录 + List flowRecordVo = flowableFeignSp.flowRecordAndComment(scmSpecialrebateCheckapplyDetailsVo.getProcInstId(), "1").getData(); + List finPaymentrecordSourceLCVos = new ArrayList<>(); + for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { + if (flowTask.getFlowableRecordVo() != null) { + Map flowableRecordVo = flowTask.getFlowableRecordVo(); + FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); + List> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos"); + Map comment = ConstantUtils.getMap(flowableRecordVo, "comment"); + String assigneeName = (String) taskUserInfos.get(0).get("assigneeName"); + String comment1 = (String) comment.get("comment"); + finPaymentrecordSourceLCVo.setName(assigneeName); + finPaymentrecordSourceLCVo.setComment(comment1); + finPaymentrecordSourceLCVo.setSpsj(flowableRecordVo.get("finishTime").toString()); + finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); + } else { + Map processCommentVo = flowTask.getProcessCommentVo(); + FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); + finPaymentrecordSourceLCVo.setName(processCommentVo.get("title").toString()); + finPaymentrecordSourceLCVo.setComment(processCommentVo.get("content").toString()); + finPaymentrecordSourceLCVo.setSpsj(processCommentVo.get("time").toString()); + finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); + } + } + List messages = messageFeign.selectByBusinessSid(scmSpecialrebateCheckapplyDetailsVo.getSid()).getData(); + if (messages.size() > 0) { + for (Message message : messages) { + FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); + String receiverNames = ""; + List messageLists = messageListFeign.fetchByMainSid(message.getSid()).getData(); + if (messageLists.size() > 0) { + for (MessageList messageList : messageLists) { + receiverNames = receiverNames + messageList.getReceiverName() + "，"; + } + } + finPaymentrecordSourceLCVo.setName("系统"); + finPaymentrecordSourceLCVo.setComment("抄送 " + receiverNames.substring(0, receiverNames.lastIndexOf("，"))); + finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(message.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); + } + } + finPaymentrecordSourceLCVos.sort(comparing(FinPaymentrecordSourceLCVo::getSpsj)); + dataMap.put("lcList", finPaymentrecordSourceLCVos); + //下载人 + dataMap.put("downName", userName); + //下载时间 + dataMap.put("downTime", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")); + //获取模板 + //模板路径 + String sourcePath = "D:\\anrui\\upload\\template\\"; + //生成word文件名 + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = dateStr + seconds + ".doc"; + // 生成文件路径 + String targetPath = sourcePath + dateStr; + WordUtils.creatWord(dataMap, "zxhd", sourcePath, targetPath, typeName); + //新生成的word路径 + String wordPath = targetPath + "\\" + typeName; + //生成出门证文件名 + String pdfName = "专项返利核对_" + dateStr + seconds + ".pdf"; + WordUtils.doc2pdf(wordPath, targetPath, pdfName, ""); + pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName); + return pdfPath; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java index f0fb4d0474..c4eeb583a6 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java @@ -103,7 +103,9 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign { @Override public ResultBean createPdf(String vehCheckSid, String userName) { - return null; + ResultBean rb = ResultBean.fireFail(); + PdfPath pdf = scmVehrebateCheckapplyService.createPdf(vehCheckSid, userName); + return rb.success().setData(pdf); } @Override diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java index dfe9cad624..46c6be2b17 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java @@ -38,6 +38,7 @@ 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.finpaymentrecord.FinPaymentrecordSourceLCVo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.costadjustmentsbill.CostAdjustmentsBill; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; @@ -48,6 +49,7 @@ import com.yxt.anrui.flowable.api.flow2.FlowFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; @@ -65,13 +67,23 @@ 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.scmvehrebatewith.ScmVehRebateWithDetailsVo; +import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithPdfVo; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.PdfPath; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyDetailsVo; import com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateService; import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.ConstantUtils; import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.WordUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.messagecenter.api.message.Message; +import com.yxt.messagecenter.api.message.MessageFeign; +import com.yxt.messagecenter.api.messagelist.MessageList; +import com.yxt.messagecenter.api.messagelist.MessageListFeign; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -81,6 +93,8 @@ import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; +import static java.util.Comparator.comparing; + /** * Project: anrui-scm(单车返利核对)
* File: ScmVehrebateCheckapplyService.java
@@ -123,6 +137,13 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService listPageVo(PagerQuery pq) { ScmVehrebateCheckapplyQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -953,4 +974,120 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService scmWhenVehrebateCheckapplydetailDetails = scmVehrebateCheckapplyDetailsVo.getScmWhenVehrebateCheckapplydetailDetails(); + Map dataMap = new HashMap(); + //标题 + dataMap.put("title",scmVehrebateCheckapplyDetailsVo.getCheckApply() + "单车返利核对审批"); + //分公司 + dataMap.put("useOrgName", scmVehrebateCheckapplyDetailsVo.getCreateOrgName()); + //创建部门 + dataMap.put("deptName", scmVehrebateCheckapplyDetailsVo.getDeptName()); + //创建人 + dataMap.put("createByName", scmVehrebateCheckapplyDetailsVo.getCreateByName()); + //创建日期 + dataMap.put("createTime", DateUtil.formatDate(scmVehrebateCheckapplyDetailsVo.getCreateTime())); + //办结日期 + dataMap.put("finishTime", DateUtil.formatDate(scmVehrebateCheckapplyDetailsVo.getFinishTime())); + //审批编号 + dataMap.put("billNo", scmVehrebateCheckapplyDetailsVo.getBillNo()); + List scmVehRebateCheckPdfVos = new ArrayList<>(); + //循环获取车辆信息 + Integer i = 1; + for (ScmVehrebateCheckapplydetailDetailsVo scmVehrebateCheckapplydetailDetailsVo : scmWhenVehrebateCheckapplydetailDetails) { + ScmVehRebateCheckPdfVo scmVehRebateCheckPdfVo = new ScmVehRebateCheckPdfVo(); + scmVehRebateCheckPdfVo.setId(i); + i = i + 1; + scmVehRebateCheckPdfVo.setCgxt(scmVehrebateCheckapplydetailDetailsVo.getPurchaseSystemName()); + scmVehRebateCheckPdfVo.setPp(scmVehrebateCheckapplydetailDetailsVo.getBrandName()); + scmVehRebateCheckPdfVo.setFllx(scmVehrebateCheckapplydetailDetailsVo.getRebateTypeValue()); + scmVehRebateCheckPdfVo.setTs(scmVehrebateCheckapplydetailDetailsVo.getNum().toString()); + scmVehRebateCheckPdfVo.setYtje(scmVehrebateCheckapplydetailDetailsVo.getWithRebate().toString()); + scmVehRebateCheckPdfVo.setYtfy(scmVehrebateCheckapplydetailDetailsVo.getWithholdCost().toString()); + scmVehRebateCheckPdfVo.setScje(scmVehrebateCheckapplydetailDetailsVo.getUploadMoney().toString()); + scmVehRebateCheckPdfVo.setDqdje(scmVehrebateCheckapplydetailDetailsVo.getStayDetermineMoney().toString()); + scmVehRebateCheckPdfVo.setFy(scmVehrebateCheckapplydetailDetailsVo.getMoney().toString()); + scmVehRebateCheckPdfVo.setTzje(scmVehrebateCheckapplydetailDetailsVo.getAdjustmentMoney().toString()); + scmVehRebateCheckPdfVo.setFytzje(scmVehrebateCheckapplydetailDetailsVo.getFyAdjustmentMoney().toString()); + scmVehRebateCheckPdfVos.add(scmVehRebateCheckPdfVo); + } + dataMap.put("wlList", scmVehRebateCheckPdfVos); + dataMap.put("tst", scmWhenVehrebateCheckapplydetailDetails.stream().map(ScmVehrebateCheckapplydetailDetailsVo::getNum).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + dataMap.put("ytjet", scmWhenVehrebateCheckapplydetailDetails.stream().map(ScmVehrebateCheckapplydetailDetailsVo::getWithRebate).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + dataMap.put("ytfyt", scmWhenVehrebateCheckapplydetailDetails.stream().map(ScmVehrebateCheckapplydetailDetailsVo::getWithholdCost).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + dataMap.put("scjet", scmWhenVehrebateCheckapplydetailDetails.stream().map(ScmVehrebateCheckapplydetailDetailsVo::getUploadMoney).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + dataMap.put("dqdjet", scmWhenVehrebateCheckapplydetailDetails.stream().map(ScmVehrebateCheckapplydetailDetailsVo::getStayDetermineMoney).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + dataMap.put("fyt", scmWhenVehrebateCheckapplydetailDetails.stream().map(ScmVehrebateCheckapplydetailDetailsVo::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + dataMap.put("tzjet", scmWhenVehrebateCheckapplydetailDetails.stream().map(ScmVehrebateCheckapplydetailDetailsVo::getAdjustmentMoney).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + dataMap.put("fytzjet", scmWhenVehrebateCheckapplydetailDetails.stream().map(ScmVehrebateCheckapplydetailDetailsVo::getFyAdjustmentMoney).reduce(BigDecimal.ZERO, BigDecimal::add).toString()); + dataMap.put("remarks", scmVehrebateCheckapplyDetailsVo.getRemarks()); + //获取审批记录 + List flowRecordVo = flowableFeignSp.flowRecordAndComment(scmVehrebateCheckapplyDetailsVo.getProcInstId(), "1").getData(); + List finPaymentrecordSourceLCVos = new ArrayList<>(); + for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { + if (flowTask.getFlowableRecordVo() != null) { + Map flowableRecordVo = flowTask.getFlowableRecordVo(); + FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); + List> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos"); + Map comment = ConstantUtils.getMap(flowableRecordVo, "comment"); + String assigneeName = (String) taskUserInfos.get(0).get("assigneeName"); + String comment1 = (String) comment.get("comment"); + finPaymentrecordSourceLCVo.setName(assigneeName); + finPaymentrecordSourceLCVo.setComment(comment1); + finPaymentrecordSourceLCVo.setSpsj(flowableRecordVo.get("finishTime").toString()); + finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); + } else { + Map processCommentVo = flowTask.getProcessCommentVo(); + FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); + finPaymentrecordSourceLCVo.setName(processCommentVo.get("title").toString()); + finPaymentrecordSourceLCVo.setComment(processCommentVo.get("content").toString()); + finPaymentrecordSourceLCVo.setSpsj(processCommentVo.get("time").toString()); + finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); + } + } + List messages = messageFeign.selectByBusinessSid(scmVehrebateCheckapplyDetailsVo.getSid()).getData(); + if (messages.size() > 0) { + for (Message message : messages) { + FinPaymentrecordSourceLCVo finPaymentrecordSourceLCVo = new FinPaymentrecordSourceLCVo(); + String receiverNames = ""; + List messageLists = messageListFeign.fetchByMainSid(message.getSid()).getData(); + if (messageLists.size() > 0) { + for (MessageList messageList : messageLists) { + receiverNames = receiverNames + messageList.getReceiverName() + "，"; + } + } + finPaymentrecordSourceLCVo.setName("系统"); + finPaymentrecordSourceLCVo.setComment("抄送 " + receiverNames.substring(0, receiverNames.lastIndexOf("，"))); + finPaymentrecordSourceLCVo.setSpsj(DateUtil.format(message.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); + finPaymentrecordSourceLCVos.add(finPaymentrecordSourceLCVo); + } + } + finPaymentrecordSourceLCVos.sort(comparing(FinPaymentrecordSourceLCVo::getSpsj)); + dataMap.put("lcList", finPaymentrecordSourceLCVos); + //下载人 + dataMap.put("downName", userName); + //下载时间 + dataMap.put("downTime", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")); + //获取模板 + //模板路径 + String sourcePath = "D:\\anrui\\upload\\template\\"; + //生成word文件名 + String dateStr = DateUtil.format(new Date(), "yyyyMMdd"); + long seconds = System.currentTimeMillis(); + String typeName = dateStr + seconds + ".doc"; + // 生成文件路径 + String targetPath = sourcePath + dateStr; + WordUtils.creatWord(dataMap, "dchd", sourcePath, targetPath, typeName); + //新生成的word路径 + String wordPath = targetPath + "\\" + typeName; + //生成出门证文件名 + String pdfName = "单车返利核对_" + dateStr + seconds + ".pdf"; + WordUtils.doc2pdf(wordPath, targetPath, pdfName, ""); + pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName); + return pdfPath; + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/resources/ftl/dchd.ftl b/anrui-scm/anrui-scm-biz/src/main/resources/ftl/dchd.ftl new file mode 100644 index 0000000000..702ad9ff5b --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/resources/ftl/dchd.ftl @@ -0,0 +1,2972 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${title!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 分公司： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${useOrgName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 创建部门： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${deptName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 创建人： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${createByName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 创建日期： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${createTime!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 办结日期： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${finishTime!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 审批编号： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${billNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + + + + 采购系统 + + + + + + + + + + + + + + + + + + + + + + + 品牌 + + + + + + + + + + + + + + + + + + + + + + + + 返利类型 + + + + + + + + + + + + + + + + + + + + + + + 台数 + + + + + + + + + + + + + + + + + + + + + + + + 预提金额 + + + + + + + + + + + + + + + + + + + + + + + 其中预提费用 + + + + + + + + + + + + + + + + + + + + + + + + 上传金额 + + + + + + + + + + + + + + + + + + + + + + + 其中待确定金额 + + + + + + + + + + + + + + + + + + + + + + + + + 其中费用返利调整金额 + + + + + + + + + + + + + + + + + + + + + + + + + 其中费用调整金额 + + + + + <#list wlList as wl> + + + + + + + + + + + + + + + + + + + + + + + + ${wl.id!} + + + + + + + + + + + + + + + + + + + + + + + + ${wl.cgxt!} + + + + + + + + + + + + + + + + + + + + + + + ${wl.pp!} + + + + + + + + + + + + + + + + + + + + + + + + ${wl.fllx!} + + + + + + + + + + + + + + + + + + + + + + + ${wl.ts!} + + + + + + + + + + + + + + + + + + + + + + + + ${wl.ytje!} + + + + + + + + + + + + + + + + + + + + + + + ${wl.ytfy!} + + + + + + + + + + + + + + + + + + + + + + + + ${wl.scje!} + + + + + + + + + + + + + + + + + + + + + + + ${wl.dqdje!} + + + + + + + + + + + + + + + + + + + + + + + + ${wl.fy!} + + + + + + + + + + + + + + + + + + + + + + + ${wl.tzje!} + + + + + + + + + + + + + + + + + + + + + + + ${wl.fytzje!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 合计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${tst!} + + + + + + + + + + + + + + + + + + + + + + + + ${ytjet!} + + + + + + + + + + + + + + + + + + + + + + + + ${ytfyt!} + + + + + + + + + + + + + + + + + + + + + + + + + ${scjet!} + + + + + + + + + + + + + + + + + + + + + + + ${dqdjet!} + + + + + + + + + + + + + + + + + + + + + + + + ${fyt!} + + + + + + + + + + + + + + + + + + + + + + + ${tzjet!} + + + + + + + + + + + + + + + + + + + + + + + ${fytzjet!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 备注 + + + + + + + + + + + + + + + + + + + + + + + + ${remarks!} + + + + + + + + + + + + + + + + + + + + + + + + + + + 明细见导表 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 审批流程 + + + + <#list lcList as lc> + <#if (lc_index==0)> + + + + + + + + + + + + + + + + + + + + + + + + + + ${lc.comment!} + + + + + + + + + + + + + + + + + + ${lc.name!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${lc.spsj!} + + + + + + + <#list lcList as lc> + <#if (lc_index>0)> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${lc.comment!} + + + + + + + + + + + + + + + + + + ${lc.name!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${lc.spsj!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 下载人： + + + + + + + + + + + + + + + + + + + + + + + + + + + ${downName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + 下载时间： + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${downTime!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + God + 10745413@qq.com + 2 + 2025-01-07T06:32:00Z + 2025-01-07T06:32:00Z + + + + + + + + 0 + 1 + 79 + 456 + Microsoft Office Word + 0 + 3 + 1 + false + + false + 534 + false + false + 16.0000 + + + + + + + + 2052-12.1.0.18912 + + + 904253E002864ACF82CED81570235AD9_12 + + + + + \ No newline at end of file diff --git a/工作内容需要的文档/单据模板/专项返利核对模板/dcyt.docx b/工作内容需要的文档/单据模板/专项返利核对模板/dcyt.docx deleted file mode 100644 index d8d1ecb147..0000000000 --- a/工作内容需要的文档/单据模板/专项返利核对模板/dcyt.docx +++ /dev/null @@ -1,63 +0,0 @@ - ${title!} - 分公司： -${useOrgName!} - 创建部门： -${deptName!} - 创建人： -${createByName!} - 创建日期： -${createTime!} - 办结日期： -${finishTime!} - 审批编号： -${billNo!} - 序号 - 采购系统 - 品牌 - 返利类型 - 台数 - 预提返利 - 其中待支付费用 - 其中抵顶费用 - ${id!} - ${cgxt!} - ${pp!} - ${fllx!} - ${ts!} - ${ytfl!} - ${dzf!} - ${dd!} - 合计 - - - - - ${ytflt!} - - - 备注 - -明细见导表 - 审批流程 -${lc.comment!} -${lc.name!} - - ${lc.spsj!} - - - - - - - - - - - - - - 下载人： -${downName!} - 下载时间： -${downTime!} - diff --git a/工作内容需要的文档/单据模板/专项返利核对模板/zxhd.docx b/工作内容需要的文档/单据模板/专项返利核对模板/zxhd.docx new file mode 100644 index 0000000000..0fb0c90efe --- /dev/null +++ b/工作内容需要的文档/单据模板/专项返利核对模板/zxhd.docx @@ -0,0 +1,63 @@ + ${title!} + 分公司： +${useOrgName!} + 创建部门： +${deptName!} + 创建人： +${createByName!} + 创建日期： +${createTime!} + 办结日期： +${finishTime!} + 审批编号： +${billNo!} + 序号 + 采购系统 + 品牌 + 返利类型 + 台数 + 预提金额 + 其中预提费用 + 上传金额 + 其中待确定金额 + 其中费用 + 返利调整金额 + 其中费用调整金额 + ${wl.id!} + ${wl.cgxt!} + ${wl.pp!} + ${wl.fllx!} + ${wl.ts!} + ${wl.ytje!} + ${wl.ytfy!} + ${wl.scje!} + ${wl.dqdje!} + ${wl.fy!} + ${wl.tzje!} + ${wl.fytzje!} + 合计 + + + + ${tst!} + ${ytjet!} + ${ytfyt!} + ${scjet!} + ${dqdjet!} + ${fyt!} + ${tzjet!} + ${fytzjet!} + 备注 +${remarks!} +明细见导表 + 审批流程 +${lc.comment!} +${lc.name!} + + ${lc.spsj!} + + 下载人： +${downName!} + 下载时间： +${downTime!} + diff --git a/工作内容需要的文档/单据模板/单车返利核对模板/dchd.docx b/工作内容需要的文档/单据模板/单车返利核对模板/dchd.docx index d8d1ecb147..0fb0c90efe 100644 --- a/工作内容需要的文档/单据模板/单车返利核对模板/dchd.docx +++ b/工作内容需要的文档/单据模板/单车返利核对模板/dchd.docx @@ -16,27 +16,39 @@ ${billNo!} 品牌 返利类型 台数 - 预提返利 - 其中待支付费用 - 其中抵顶费用 - ${id!} - ${cgxt!} - ${pp!} - ${fllx!} - ${ts!} - ${ytfl!} - ${dzf!} - ${dd!} + 预提金额 + 其中预提费用 + 上传金额 + 其中待确定金额 + 其中费用 + 返利调整金额 + 其中费用调整金额 + ${wl.id!} + ${wl.cgxt!} + ${wl.pp!} + ${wl.fllx!} + ${wl.ts!} + ${wl.ytje!} + ${wl.ytfy!} + ${wl.scje!} + ${wl.dqdje!} + ${wl.fy!} + ${wl.tzje!} + ${wl.fytzje!} 合计 - - ${ytflt!} - - + ${tst!} + ${ytjet!} + ${ytfyt!} + ${scjet!} + ${dqdjet!} + ${fyt!} + ${tzjet!} + ${fytzjet!} 备注 - +${remarks!} 明细见导表 审批流程 ${lc.comment!} @@ -44,18 +56,6 @@ ${lc.name!} ${lc.spsj!} - - - - - - - - - - - - 下载人： ${downName!} 下载时间：