问题修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -460,6 +460,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             formVariables.put("isAdj", i);
         }
         if (bv.getTaskId().equals(baseAccadjApply.getTaskId())) {
+            bv.setOrgSidPath(baseAccadjApply.getOrgSidPath());
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -490,6 +490,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
             appMap.put("sid", bv.getBusinessSid());
             variables.put("app", appMap);
             bv.setFormVariables(variables);
+            bv.setOrgSidPath(baseInternalPurchase.getOrgSidPath());
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java

@@ -352,6 +352,7 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         BaseShuntingInvoicingApply baseShuntingInvoicingApply = fetchBySid(bv.getBusinessSid());
+        bv.setOrgSidPath(baseShuntingInvoicingApply.getOrgSidPath());
         return handleProcess(bv, rb, baseShuntingInvoicingApply);
     }
 

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationMaterial.java

@@ -0,0 +1,55 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.fin.api.fincollectionconfirmation;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class FinCollectionConfirmationMaterial{
+
+	@ApiModelProperty("序号")
+    private String id; // 序号
+	@ApiModelProperty("客户姓名")
+    private String cname; // 客户姓名
+    @ApiModelProperty("电话")
+    private String phone; // 电话
+	@ApiModelProperty("合同号")
+    private String contractNo; // 合同号
+    @ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("收款项目")
+    private String collPro; // 收款项目
+	@ApiModelProperty("收款金额")
+    private String collMoney; // 收款金额
+	@ApiModelProperty("收款账号")
+    private String collNum; // 收款账号
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1952,45 +1952,40 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     public ResultBean<PdfPath> createPdf(String skdSid) {
         ResultBean rb = ResultBean.fireFail();
         PdfPath pdfPath = new PdfPath();
-        /*//获取收款单信息
-        FinCollectionConfirmation finCollectionConfirmation = fetchBySid(skdSid);
+        //获取收款单信息
+        FinCollectionConfirmationDetailsVo finCollectionConfirmationDetailsVo = fetchByAllSid(skdSid).getData();
         //获取车辆入库单车辆信息查询
-        List<ScmApplyInboundVehQueryDetailsVo> scmApplyInboundVehQueryDetailsVos = scmApplyInboundVehQueryService.fetchByMainSid(cgrkdSid);
-        Map<String, Object> dataMap = new HashMap<String, Object>();
-        dataMap.put("priceDate",scmApplyInboundQuery.getOrgPriceDate());
-        dataMap.put("manPurOrderType",scmApplyInboundQuery.getManPurOrderTypeValue());
-        dataMap.put("billNo",scmApplyInboundQuery.getApplicationCode());
-        dataMap.put("orgDeptName",scmApplyInboundQuery.getOrgDeptName());
-        dataMap.put("manName",scmApplyInboundQuery.getManName());
-        List<ScmApplyInboundVehQueryMaterial> scmApplyInboundVehQueryMaterials = new ArrayList<>();
-        //初始化总数量为1
-        int num = 0;
+        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetaileds = finCollectionConfirmationDetailsVo.getFinSelectedReceivablesDetaileds();
+        Map<String, Object> dataMap = new HashMap();
+        dataMap.put("collDate",finCollectionConfirmationDetailsVo.getCollectionDate());
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(finCollectionConfirmationDetailsVo.getUseOrgSid()).getData();
+        dataMap.put("payee",sysOrganizationVo.getName());
+        dataMap.put("billNo",finCollectionConfirmationDetailsVo.getBillNo());
+        dataMap.put("settleType",finCollectionConfirmationDetailsVo.getCollectionTypeValue());
+        dataMap.put("remarks",finCollectionConfirmationDetailsVo.getRemarks());
+        List<FinCollectionConfirmationMaterial> finCollectionConfirmationMaterials = new ArrayList<>();
         int id = 0;
-        BigDecimal tPrice = new BigDecimal(0);
         //循环获取车辆信息
-        for (ScmApplyInboundVehQueryDetailsVo scmApplyInboundVehQueryDetailsVo : scmApplyInboundVehQueryDetailsVos) {
-            ScmApplyInboundVehQueryMaterial scmApplyInboundVehQueryMaterial = new ScmApplyInboundVehQueryMaterial();
-            num = num + 1;
+        for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetaileds) {
+            FinCollectionConfirmationMaterial finCollectionConfirmationMaterial = new FinCollectionConfirmationMaterial();
             id = id + 1;
-            BigDecimal settleMoney = new BigDecimal(scmApplyInboundVehQueryDetailsVo.getSettleMoney());
-            tPrice = tPrice.add(settleMoney);
+            BigDecimal settleMoney = new BigDecimal(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
             //主车物料编码
-            scmApplyInboundVehQueryMaterial.setVinNo(scmApplyInboundVehQueryDetailsVo.getVinNo().substring(scmApplyInboundVehQueryDetailsVo.getVinNo().length() - 8));
-            scmApplyInboundVehQueryMaterial.setId(String.valueOf(id));
-            scmApplyInboundVehQueryMaterial.setMgroupName(scmApplyInboundVehQueryDetailsVo.getMgroupName());
-            scmApplyInboundVehQueryMaterial.setVehicleType(scmApplyInboundVehQueryDetailsVo.getVehicleTypeValue());
-            scmApplyInboundVehQueryMaterial.setIunit("辆");
-            scmApplyInboundVehQueryMaterial.setNum("1");
-            scmApplyInboundVehQueryMaterial.setSettleMoney(scmApplyInboundVehQueryDetailsVo.getSettleMoney());
-            scmApplyInboundVehQueryMaterial.setLocalName(scmApplyInboundVehQueryDetailsVo.getLocalName());
-            scmApplyInboundVehQueryMaterials.add(scmApplyInboundVehQueryMaterial);
-        }
-        dataMap.put("wlList",scmApplyInboundVehQueryMaterials);
-        dataMap.put("zs",num);
-        dataMap.put("zsettleMoney",tPrice.toString());
-        String tPriceDX = TransformMoney.transform(tPrice.toString());
+            finCollectionConfirmationMaterial.setVinNo(finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8));
+            finCollectionConfirmationMaterial.setId(String.valueOf(id));
+            finCollectionConfirmationMaterial.setCname(finSelectedReceivablesDetailedVo.getCustomerName());
+            finCollectionConfirmationMaterial.setPhone(finSelectedReceivablesDetailedVo.getCustomerPhone());
+            finCollectionConfirmationMaterial.setContractNo(finSelectedReceivablesDetailedVo.getContractNo());
+            finCollectionConfirmationMaterial.setCollPro(finSelectedReceivablesDetailedVo.getReceivablesName());
+            finCollectionConfirmationMaterial.setCollMoney(finSelectedReceivablesDetailedVo.getSubscriptionMoney());
+            finCollectionConfirmationMaterial.setCollNum(finCollectionConfirmationDetailsVo.getCollectionBankNum());
+            finCollectionConfirmationMaterials.add(finCollectionConfirmationMaterial);
+        }
+        dataMap.put("wlList",finCollectionConfirmationMaterials);
+        dataMap.put("zcollMoney",finCollectionConfirmationDetailsVo.getCollectionMoney());
+        String tPriceDX = TransformMoney.transform(finCollectionConfirmationDetailsVo.getCollectionMoney());
         dataMap.put("tPriceDX",tPriceDX);
-        dataMap.put("makeName",scmApplyInboundQuery.getMakeListName() + scmApplyInboundQuery.getMakeListDate());
+        dataMap.put("makeName","");
         //获取模板
         //模板路径
         String sourcePath = "D:\\anrui\\upload\\template\\";
@@ -2006,7 +2001,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         //生成出门证文件名
         String pdfName = "采购入库单_" + dateStr + seconds + ".pdf";
         WordUtils.doc2pdf(wordPath, targetPath, pdfName, "");
-        pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName);*/
+        pdfPath.setPdfPath("/template/" + dateStr + "/" + pdfName);
         return rb.success().setData(pdfPath);
     }
 }