修改

1 week ago · 54ecbc96d8
11 changed files with 481 additions and 679 deletions
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjPdfVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseaccadjapply/BaseAccadjPdfVo.java
@ -33,16 +33,14 @@ import lombok.Data;
 public class BaseAccadjPdfVo implements Vo {

    private Integer id;
-    @ApiModelProperty("车型")
+    @ApiModelProperty("车型/常用配置")
    private String model;
-    @ApiModelProperty("常用配置")
-    private String config;
    @ApiModelProperty("车架号")
    private String vinNo;
    @ApiModelProperty("库存地点")
-    private String address;
+    private String dd;
    @ApiModelProperty("内销价格")
-    private String price;
+    private String jg;
    @ApiModelProperty("运费")
    private String yf;
    @ApiModelProperty("运费承担方")
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
@ -1217,11 +1217,10 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
            BaseAccadjPdfVo baseAccadjPdfVo = new BaseAccadjPdfVo();
            baseAccadjPdfVo.setId(i);
            i = i + 1;
-            baseAccadjPdfVo.setModel(baseInternalPurchaseVehicle.getVehicleAlias());
-            baseAccadjPdfVo.setConfig(baseInternalPurchaseVehicle.getConfigName());
-            baseAccadjPdfVo.setVinNo(baseInternalPurchaseVehicle.getVinNo());
-            baseAccadjPdfVo.setAddress(baseInternalPurchaseVehicle.getInventoryLocationName());
-            baseAccadjPdfVo.setPrice(baseInternalPurchaseVehicle.getWitPinMoney());
+            baseAccadjPdfVo.setModel(baseInternalPurchaseVehicle.getVehicleAlias() + "/" + baseInternalPurchaseVehicle.getConfigName());
+            baseAccadjPdfVo.setVinNo(baseInternalPurchaseVehicle.getVinNo().substring(baseInternalPurchaseVehicle.getVinNo().length() - 8));
+            baseAccadjPdfVo.setDd(baseInternalPurchaseVehicle.getInventoryLocationName());
+            baseAccadjPdfVo.setJg(baseInternalPurchaseVehicle.getWitPinMoney());
            baseAccadjPdfVo.setYf(baseInternalPurchaseVehicle.getFreight());
            baseAccadjPdfVo.setCdf(baseInternalPurchaseVehicle.getFreightUndertakerName());
            baseAccadjPdfVo.setRemarks(baseInternalPurchaseVehicle.getRemarks());
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/tctz.ftl
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/tctz.ftl
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/fkce.ftl
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/ftl/fkce.ftl
--- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnPdfVo.java
+++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnPdfVo.java
@ -37,14 +37,12 @@ public class ScmVehicleReturnPdfVo implements Vo {
    private String vinNo;
    @ApiModelProperty("车辆入库价")
    private String rkj;
-    @ApiModelProperty("车型")
+    @ApiModelProperty("车型/配置")
    private String model;
-    @ApiModelProperty("常用配置")
-    private String config;
    @ApiModelProperty("退库费用")
    private String fy;
    @ApiModelProperty("费用说明")
-    private String fysm;
+    private String sm;
    @ApiModelProperty("入库日期")
-    private String rkrq;
+    private String rk;
 }
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
@ -928,13 +928,12 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
            ScmVehicleReturnPdfVo scmVehicleReturnPdfVo = new ScmVehicleReturnPdfVo();
            scmVehicleReturnPdfVo.setId(i);
            i = i + 1;
-            scmVehicleReturnPdfVo.setVinNo(scmVehicleReturnDetailssVo.getVinNo());
+            scmVehicleReturnPdfVo.setVinNo(scmVehicleReturnDetailssVo.getVinNo().substring(scmVehicleReturnDetailssVo.getVinNo().length() - 8));
            scmVehicleReturnPdfVo.setRkj(scmVehicleReturnDetailssVo.getReturnStockCost().toString());
-            scmVehicleReturnPdfVo.setModel(scmVehicleReturnDetailssVo.getModelName());
-            scmVehicleReturnPdfVo.setConfig(scmVehicleReturnDetailssVo.getConfigName());
+            scmVehicleReturnPdfVo.setModel(scmVehicleReturnDetailssVo.getModelName() + "/" + scmVehicleReturnDetailssVo.getConfigName());
            scmVehicleReturnPdfVo.setFy(scmVehicleReturnDetailssVo.getReturnStockCost().toString());
-            scmVehicleReturnPdfVo.setFysm(scmVehicleReturnDetailssVo.getCostRemarks());
-            scmVehicleReturnPdfVo.setRkrq(scmVehicleReturnDetailssVo.getInboundDate());
+            scmVehicleReturnPdfVo.setSm(scmVehicleReturnDetailssVo.getCostRemarks());
+            scmVehicleReturnPdfVo.setRk(scmVehicleReturnDetailssVo.getInboundDate());
            scmVehicleReturnPdfVos.add(scmVehicleReturnPdfVo);
        }
        dataMap.put("wlList", scmVehicleReturnPdfVos);
@ -942,7 +941,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
        dataMap.put("fy", scmVehicleReturn.getMoney());
        dataMap.put("remarks", scmVehicleReturn.getRemarks());
        //获取审批记录
-        List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignSp.flowRecordAndComment(scmVehicleReturn.getProcDefId(), "1").getData();
+        List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignSp.flowRecordAndComment(scmVehicleReturn.getInstanceId(), "1").getData();
        List<FinPaymentrecordSourceLCVo> finPaymentrecordSourceLCVos = new ArrayList<>();
        for (PCHistTaskListAndCommentList flowTask : flowRecordVo) {
            if (flowTask.getFlowableRecordVo() != null) {
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/cgtk.ftl
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/cgtk.ftl
--- a/工作内容需要的文档/单据模板/放款差额模板/放款差额.docx
+++ b/工作内容需要的文档/单据模板/放款差额模板/放款差额.docx
@ -11,11 +11,12 @@ ${createTime!}
 ${finishTime!}
                                                                审批编号：
 ${billNo!}
+                                                                         资方
+${zf!}
+                                                                      贷款人
+${dkr!}
                                                                         备注
-${remarks!}
-                                    序号
-                                    资方
-                                   贷款人
+${bz!}
                                   车架号
                                 放款金额
                             主产品厂家贴息
@ -23,9 +24,6 @@ ${remarks!}
                             固定贷款保证金
                                   意外险
                                       
-                                       
-                                       
-                                       
                                    应放
                                    实放
                                    差额
@ -41,9 +39,6 @@ ${remarks!}
                                    已收
                                    实际
                                    差额
-                                   ${wl.id!}
-                                   ${wl.zf!}
-                                  ${wl.dkr!}
                                 ${wl.vinNo!}
                                  ${wl.yf1!}
                                  ${wl.sf2!}
@ -54,12 +49,12 @@ ${remarks!}
                                  ${wl.yj7!}
                                  ${wl.sj8!}
                                  ${wl.ce9!}
-                                  ${wl.yj10!}
-                                  ${wl.sj11!}
-                                  ${wl.ce12!}
-                                  ${wl.ys13!}
-                                  ${wl.sj14!}
-                                  ${wl.ce15!}
+                                  ${wl.gd1!}
+                                  ${wl.gd2!}
+                                  ${wl.gd3!}
+                                  ${wl.yw1!}
+                                  ${wl.yw2!}
+                                  ${wl.yw3!}
                                 审批流程
 ${lc.name!}
 ${lc.comment!} 
--- a/工作内容需要的文档/单据模板/调车调账模板/分公司调车调账.docx
+++ b/工作内容需要的文档/单据模板/调车调账模板/分公司调车调账.docx
@ -0,0 +1,47 @@
+                           分公司间调账申请
+                                                                   分公司：
+${orgName!}
+                                                                创建部门：
+${deptName!}
+                                                                   创建人：
+${createName!}
+                                                                创建日期：
+${createTime!}
+                                                                办结日期：
+${finishTime!}
+                                                                审批编号：
+${billNo}
+                                                                   调账类型
+${type!}
+                                                                调出分公司
+${dc!}
+                                                                调入分公司
+${dr!}
+申请车辆列表
+                                    序号
+                              车型/常用配置
+                                   车架号
+                                 库存地点
+                                 内销价格
+                                    运费
+                                运费承担方
+                                    备注
+                                     ${!}
+                                 ${wl.model!}
+                                   ${wl.v!}
+                                   ${wl.d!}
+                                   ${wl.jg!}
+                                   ${wl.yf!}
+                                  ${wl.cdf!}
+                                ${wl.remarks!}
+                                                                   审批流程
+${lc.name!}sss
+${lc.comment!}
+                                                                                                                                   ${lc.spsj!}
+                                                                   下载人：
+${downName!}
+                                                                下载日期：
+${downTime!}
+
+
+
--- a/工作内容需要的文档/单据模板/采购退库模板/采购退库.docx
+++ b/工作内容需要的文档/单据模板/采购退库模板/采购退库.docx
@ -0,0 +1,43 @@
+                           车辆采购退库申请
+                                                                   分公司：
+${orgName!}
+                                                                创建部门：
+${deptName!}
+                                                                  创建人： 
+${createName!}
+                                                                创建日期：
+${createTime!}
+                                                                办结日期：
+${finishTime!}
+                                                                审批编号：
+${billNo!}
+                                                                   退库原因
+${yy!}　
+                                                                   退库费用
+${fy!}
+                                                                         备注
+${remarks!}　
+车辆列表
+                                    序号
+                                   车架号
+                                车辆入库价
+                              车型/常用配置
+                                 退库费用
+                                 费用说明
+                                 入库日期
+                                     ${!}
+                                   ${wl.v!}
+                                  ${wl.rkj!}
+                                 ${wl.model!}
+                                   ${wl.fy!}
+                                   ${wl.sm!}
+                                   ${wl.rk!}
+                                                                审批流程：
+${lc.name!}
+${lc.comment!}
+                                                                                             ${lc.spsj!}
+                                                                   下载人：
+${downName!}
+                                                                下载时间：
+${downTime!}
+