问题修改

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyFeign.java

@@ -84,6 +84,10 @@ public interface BusSalesOrderReturnVehApplyFeign {
     @ResponseBody
     public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> fetchDetailsByOrderSid(@PathVariable("orderSid") String orderSid);
 
+    @ApiOperation("app销售订单退车回显、详情")
+    @GetMapping("/appFetchDetailsByOrderSid")
+    @ResponseBody
+    public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> appFetchDetailsByOrderSid(@RequestParam("orderSid") String orderSid, @RequestParam(value = "sid",required = false) String sid);
     /***********************************************流程************************************************/
 
     @ApiOperation("提交销售订单退车申请审批流程")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyFeignFallback.java

@@ -76,6 +76,11 @@ public class BusSalesOrderReturnVehApplyFeignFallback implements BusSalesOrderRe
 		return null;
 	}
 
+	@Override
+	public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> appFetchDetailsByOrderSid(String orderSid, String sid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean submitVehicleApply(SubmitBusSalesOrderReturnVehApplyDto dto) {
 		return null;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -5052,7 +5052,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         dataMap.put("billNo", busSalesOrder.getBillNo());
         //获取审批记录
         List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignPro.flowRecordAndComment(busSalesOrder.getProcInstId(), "1").getData();
-        flowRecordVo.sort(comparing(PCHistTaskListAndCommentList::getTime));
         List<BusSalesOrderSourceLCVo> busSalesOrderSourceLCVos = new ArrayList<>();
         for (PCHistTaskListAndCommentList flowTask : flowRecordVo) {
             if (flowTask.getFlowableRecordVo() != null) {
@@ -5098,8 +5097,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 busSalesOrderSourceLCVos.add(busSalesOrderSourceLCVo);
             }
         }
-        Collections.reverse(busSalesOrderSourceLCVos);
+        busSalesOrderSourceLCVos.sort(comparing(BusSalesOrderSourceLCVo::getSpsj));
-        //busSalesOrderSourceLCVos.sort(comparing(BusSalesOrderSourceLCVo::getSpsj));
         dataMap.put("lcList", busSalesOrderSourceLCVos);
         //创建时间
         dataMap.put("time", DateUtil.format(busSalesOrder.getCreateTime(), "yyyy-MM-dd"));
@@ -5215,6 +5213,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         dataMap.put("jrfwf", solutionsDetailsVo.getServiceAmount());
         //备注
         dataMap.put("bz", busSalesOrder.getNotes());
+        //下载人
+        dataMap.put("downName", userName);
+        //下载时间
+        dataMap.put("downTime", DateUtil.format(new Date(),"yyyy-MM-dd"));
         //获取图片路径
         if (StringUtils.isNotBlank(busSalesOrder.getImagesFile())){
             String notesImage = busSalesOrder.getImagesFile();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyRest.java

@@ -96,6 +96,11 @@ public class BusSalesOrderReturnVehApplyRest implements BusSalesOrderReturnVehAp
         return busSalesOrderReturnVehApplyService.fetchDetailsByOrderSid(orderSid);
     }
 
+    @Override
+    public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> appFetchDetailsByOrderSid(String orderSid, String sid) {
+        return busSalesOrderReturnVehApplyService.appFetchDetailsByOrderSid(orderSid,sid);
+    }
+
     @Override
     public ResultBean submitVehicleApply(SubmitBusSalesOrderReturnVehApplyDto dto) {
         return busSalesOrderReturnVehApplyService.submitVehicleApply(dto);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@@ -786,4 +786,122 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
         }
         return ResultBean.fireSuccess().setData(bsvList);
     }
+
+    public ResultBean<BusSalesOrderReturnVehApplyDetailsVo> appFetchDetailsByOrderSid(String orderSid, String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        //创建申请返回对象
+        BusSalesOrderReturnVehApplyDetailsVo busSalesOrderReturnVehApplyDetailsVo = new BusSalesOrderReturnVehApplyDetailsVo();
+        //创建申请退车列表返回对象
+        List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVoArrayList = new ArrayList<BusSalesOrderReturnVehDetailsVo>();
+        //根据销售订单sid查询销售订单详情（首次回显）
+        AppOrderDetailsVo appOrderDetailsVo = busSalesOrderService.getSaleOrderDetails(orderSid).getData();
+        //创建二次提交申请对象
+        BusSalesOrderReturnVehApply busSalesOrderReturnVehApplyECTJ = null;
+        //若销售订单详情为空，则代表为二次回显，参数为申请sid
+        if (appOrderDetailsVo == null) {
+            //查询申请信息
+            busSalesOrderReturnVehApplyECTJ = fetchBySid(orderSid);
+            //根据申请中销售订单sid查询销售订单详情
+            appOrderDetailsVo = busSalesOrderService.getSaleOrderDetails(busSalesOrderReturnVehApplyECTJ.getOrderSid()).getData();
+        }
+        AppOrderModelInfoVo modelInfo = appOrderDetailsVo.getModelInfo();
+        List<VinListsVo> vinListsVos = modelInfo.getVinListsVos();
+        BaseModelConfigSelectVo baseModelConfigSelectVo = baseModelConfigFeign.details(modelInfo.getConfigSid()).getData();
+        List<BusSalesOrderReturnVehApply> busSalesOrderReturnVehApplies = baseMapper.fetchByContractNo(appOrderDetailsVo.getContractId());
+        List<String> spVehSids = new ArrayList<>();
+        if (busSalesOrderReturnVehApplies.size() > 0) {
+            for (BusSalesOrderReturnVehApply busSalesOrderReturnVehApply : busSalesOrderReturnVehApplies) {
+                List<BusSalesOrderReturnVehDetailsVo> busSalesOrderReturnVehDetailsVos = busSalesOrderReturnVehService.fetchByMainSid(busSalesOrderReturnVehApply.getSid());
+                for (BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo : busSalesOrderReturnVehDetailsVos) {
+                    spVehSids.add(busSalesOrderReturnVehDetailsVo.getVehSid());
+                }
+            }
+        }
+        for (VinListsVo vinListsVo : vinListsVos) {
+            if (StringUtils.isNotBlank(vinListsVo.getVinSid())) {
+                BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo = new BusSalesOrderReturnVehDetailsVo();
+                String vinSid = vinListsVo.getVinSid();
+                if (spVehSids.contains(vinSid)) {
+                    continue;
+                }
+                BaseVehicleSelectVo baseVehicleSelectVo = baseVehicleFeign.details(vinSid).getData();
+                BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vinListsVo.getVinSid()).getData();
+                busSalesOrderReturnVehDetailsVo.setVehSid(vinSid);
+                busSalesOrderReturnVehDetailsVo.setVinNo(vinListsVo.getVinNo());
+                busSalesOrderReturnVehDetailsVo.setCarColorKey(baseModelConfigSelectVo.getCarColorKey());
+                busSalesOrderReturnVehDetailsVo.setCarColorValue(baseModelConfigSelectVo.getCarColor());
+                if (baseVehicleCertificateVo != null) {
+                    busSalesOrderReturnVehDetailsVo.setCertificateStateKey(baseVehicleCertificateVo.getCertificateState());
+                    busSalesOrderReturnVehDetailsVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
+                } else {
+                    busSalesOrderReturnVehDetailsVo.setCertificateStateKey("-");
+                    busSalesOrderReturnVehDetailsVo.setCertificateStateValue("-");
+                }
+                busSalesOrderReturnVehDetailsVo.setInvoicingStateKey("");
+                busSalesOrderReturnVehDetailsVo.setInvoicingStateValue("");
+                busSalesOrderReturnVehDetailsVo.setInsureStateKey("");
+                busSalesOrderReturnVehDetailsVo.setInsureStateValue("");
+                busSalesOrderReturnVehDetailsVo.setStockStateKey(baseVehicleSelectVo.getVehicleState());
+                busSalesOrderReturnVehDetailsVo.setStockStateValue(baseVehicleSelectVo.getVehicleStateValue());
+                busSalesOrderReturnVehDetailsVoArrayList.add(busSalesOrderReturnVehDetailsVo);
+            }
+        }
+        if (busSalesOrderReturnVehApplyECTJ != null) {
+            if (busSalesOrderReturnVehApplyECTJ.getNodeState().equals("发起申请")) {
+                BusSalesOrderReturnVehApplyDetailsVo data = fetchDetailsVoBySid(busSalesOrderReturnVehApplyECTJ.getSid()).getData();
+                data.setBusSalesOrderReturnVehs(busSalesOrderReturnVehDetailsVoArrayList);
+                return rb.success().setData(data);
+            }
+            ;
+        }
+        busSalesOrderReturnVehApplyDetailsVo.setOrderSid(orderSid);
+        //制单日期
+        busSalesOrderReturnVehApplyDetailsVo.setCreatTime(DateUtil.formatDate(new Date()));
+        //资金来源
+        busSalesOrderReturnVehApplyDetailsVo.setFundsSource(appOrderDetailsVo.getFinancePlanValue());
+        //客户头像
+        busSalesOrderReturnVehApplyDetailsVo.setCustomerPhoto(fileUploadComponent.getUrlPrefix() + appOrderDetailsVo.getCustomerImage());
+        //客户电话
+        busSalesOrderReturnVehApplyDetailsVo.setCustomerPhone(appOrderDetailsVo.getPhone());
+        busSalesOrderReturnVehApplyDetailsVo.setContractNo(appOrderDetailsVo.getContractId());
+        busSalesOrderReturnVehApplyDetailsVo.setCustomerSid(appOrderDetailsVo.getCustomerSid());
+        busSalesOrderReturnVehApplyDetailsVo.setCustomerName(appOrderDetailsVo.getName());
+        CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(appOrderDetailsVo.getCustomerSid()).getData();
+        busSalesOrderReturnVehApplyDetailsVo.setCustomerNo(crmCustomerTempVo.getCustomerNo());
+        busSalesOrderReturnVehApplyDetailsVo.setSaleTypeKey(appOrderDetailsVo.getPayTypeKey());
+        busSalesOrderReturnVehApplyDetailsVo.setSaleTypeValue(appOrderDetailsVo.getPayType());
+        busSalesOrderReturnVehApplyDetailsVo.setModelSid(modelInfo.getModelSid());
+        busSalesOrderReturnVehApplyDetailsVo.setModelName(modelInfo.getModelName());
+        busSalesOrderReturnVehApplyDetailsVo.setBrandName(modelInfo.getBrand());
+        busSalesOrderReturnVehApplyDetailsVo.setModelImage(fileUploadComponent.getUrlPrefix() + modelInfo.getModelImage());
+        busSalesOrderReturnVehApplyDetailsVo.setConfigSid(modelInfo.getConfigSid());
+        AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
+        busSalesOrderReturnVehApplyDetailsVo.setOrderNum(priceInfo.getNumber());
+        busSalesOrderReturnVehApplyDetailsVo.setSalePrice(priceInfo.getSingleFinalPrice());
+        List<FinSelectedReceivablesDetailed> finSelectedReceivablesDetaileds = finSelectedReceivablesDetailedFeign.fetchByContractNo(appOrderDetailsVo.getContractId()).getData();
+        List<FinUncollectedReceivablesDetailed> finUncollectedReceivablesDetaileds = finUncollectedReceivablesDetailedFeign.fetchByContractNo(appOrderDetailsVo.getContractId()).getData();
+        BigDecimal djys = new BigDecimal(0);
+        BigDecimal djss = new BigDecimal(0);
+        BigDecimal ckys = new BigDecimal(0);
+        BigDecimal ckss = new BigDecimal(0);
+        for (FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed : finUncollectedReceivablesDetaileds) {
+            if ("订金".equals(finUncollectedReceivablesDetailed.getReceivablesName())) {
+                djys = djys.add(new BigDecimal(finUncollectedReceivablesDetailed.getReveivableMoney()));
+            } else if ("车款".equals(finUncollectedReceivablesDetailed.getReceivablesName())) {
+                ckys = ckys.add(new BigDecimal(finUncollectedReceivablesDetailed.getReveivableMoney()));
+            }
+        }
+        for (FinSelectedReceivablesDetailed finSelectedReceivablesDetailed : finSelectedReceivablesDetaileds) {
+            if ("订金".equals(finSelectedReceivablesDetailed.getReceivablesName())) {
+                djss = djss.add(finSelectedReceivablesDetailed.getSubscriptionMoney());
+            } else if ("车款".equals(finSelectedReceivablesDetailed.getReceivablesName())) {
+                ckss = ckss.add(finSelectedReceivablesDetailed.getSubscriptionMoney());
+            }
+        }
+        StringBuilder collection = new StringBuilder();
+        collection.append("订金").append(":").append("应收").append(djys).append("实收").append(djss).append(" ").append("车款").append(":").append("应收").append(ckys).append("实收").append(ckss);
+        busSalesOrderReturnVehApplyDetailsVo.setCollection(collection.toString());
+        busSalesOrderReturnVehApplyDetailsVo.setBusSalesOrderReturnVehs(busSalesOrderReturnVehDetailsVoArrayList);
+        return rb.success().setData(busSalesOrderReturnVehApplyDetailsVo);
+    }
 }

工作内容需要的文档/单据模板/收款单单据打印模板/收款单模板(激光打印机).doc

@@ -0,0 +1,11 @@
+
+|收款单                                                                                    |
+|收款日期：|${collDate!}             |付款方： |${payee!}       |单据编 |${billNo!}         |
+|          |                         |         |                |号：   |                   |
+|结算方式：|${settleType!}           |备注：   |${remarks!}                                 |
+|序号  |客户姓名                                                                           |
+
+-----------------------
+第 1 页 共 1 页
+
+

工作内容需要的文档/单据模板/收款单单据打印模板/收款单模板(针式打印机).doc

@@ -0,0 +1,10 @@
+
+|收款单                                                                                    |
+|收款日期：|${collDate!}       |付款方：|${payee!}        |单据编号：|${billNo!}           |
+|结算方式：|${settleType!}     |备注：  |${remarks!}                                       |
+|序号   |客户姓名                                                                           |
+
+-----------------------
+第 1 页 共 1 页
+
+

工作内容需要的文档/单据模板/采购入库单单据打印模板/采购入库单模板(激光打印机).doc

@@ -0,0 +1,11 @@
+
+|采购入库单                                                                                |
+|入库日期：|${priceDate!}        |采购类型：|${manPurOrderType!}|单据编号 |${billNo!}       |
+|          |                     |          |                   |：       |                 |
+|采购部门：|${orgDeptName!}      |供货单位：|${manName!}                                    |
+|序号  |物料编号                                                                           |
+
+-----------------------
+第 1 页 共 1 页
+
+

工作内容需要的文档/单据模板/采购入库单单据打印模板/采购入库单模板(针式打印机).doc

@@ -0,0 +1,12 @@
+
+|采购入库单                                                                                |
+|入库日期： |${priceDate!}       |采购类型|${manPurOrderType!|单据编号： |${billNo!}        |
+|           |                    |：      |}                 |           |                  |
+|采购部门： |${orgDeptName!}     |供货单位|${manName!}                                      |
+|           |                    |：      |                                                 |
+|序号   |物料编号                                                                           |
+
+-----------------------
+第 1 页 共 1 页
+
+

工作内容需要的文档/单据模板/销售出库单单据打印模板/销售出库单模板(激光打印机).doc

@@ -0,0 +1,12 @@
+
+|销售出库单                                                                                |
+|销售类型：|${saleType!}             |销售日期 |${saleDate!}     |单据编号|${billNo!}       |
+|          |                         |：       |                 |：      |                 |
+|客户名称：|${cName!}                |销售部门 |${oName!}        |销售专员|${sName!}        |
+|          |                         |：       |                 |：      |                 |
+|物料编码|物料分组                                                                          |
+
+-----------------------
+第 1 页 共 1 页
+
+

工作内容需要的文档/单据模板/销售出库单单据打印模板/销售出库单模板(针式打印机).doc

@@ -0,0 +1,12 @@
+
+|销售出库单                                                                                |
+|销售类型： |${saleType!} |销售日期：     |${saleDate!}       |单据编号 |${billNo!}         |
+|           |             |               |                   |：       |                   |
+|客户名称： |${cName!}         |销售部门 |${oName!}          |销售专员 |${sName!}          |
+|           |                  |：       |                   |：       |                   |
+|物料编码|物料分组                                                                         |
+
+-----------------------
+第 1 页 共 1 页
+
+

工作内容需要的文档/单据模板/销售订单审批下载模板/xsddsp.docx

@@ -0,0 +1,72 @@
+                              销售订单审批
+                                  ${orgName!}
+创建时间：${time!}
+审批编号：${billNo!}
+                                                                      创建人
+${userSid!}
+                                                                   创建部门
+${deptName!}
+                                                                   客户名称
+${custName!}
+                                                                   联系电话
+${phone!}
+                                                                   销售类型
+${saleType!}
+                                                                         车型
+${vehModel!}
+                                                       销售指导价（元）
+${salePrice!}
+                                                          合同价格（元）
+${conPrice!}
+                                                             是否公司入保
+${isrb!}
+                                                       是否赠送客户物品
+${iszs!}
+                                                             赠送客户物品
+${zskhwp!}
+                                                                   是否返利
+${isfl!}
+返利备案表
+                                 返利金额
+                                    户名
+                                   手机号
+                                    账号
+                                   开户行
+                                ${fl.flPrice!}
+                                   ${fl.hm!}
+                                  ${fl.sjh!}
+                                   ${fl.zh!}
+                                  ${fl.khh!}
+金融信息备案
+                                                                         资方
+${zf!}
+                                                                   贴息金额
+${txPrice!}
+                                                                   贴息用途
+${txyt!}
+                                                                金融服务费
+${jrfwf!}
+                                                                         备注
+${bz!}
+                                 审批流程
+${lc.comment!}
+${lc.name!}
+                                                                               
+                                                                    ${lc.spsj!}
+
+
+
+
+
+
+
+
+
+
+
+
+
+                                                                   下载人：
+${downName!}
+                                                                下载时间：
+${downTime!}

工作内容需要的文档/单据模板/预付款审批下载模板/prePaymentApply.doc

@@ -0,0 +1,23 @@
+
+
+                                 预付款申请
+
+河北安瑞汽车租赁集团有限公司
+创建时间：${createTime!}
+|审批编号     |${applyCode!}                                    |
+|创建人       |${createByName!}                                 |
+|创建人部门   |${createByDeptName!}                             |
+|费用所属公司 |${createOrgName!}                                |
+|付款用途     |${remarks!}                                      |
+|收款单位     |${receiveCompany!}                               |
+|开户行       |${receiveBank!}                                  |
+|收款账号     |${receiveBankAccount!}                           |
+|金额（元）   |${cost!}                                         |
+|备注         |${payRemark!}                                    |
+|附件         |${fileName!}                                     |
+|审批流程     |${lc.comment!}                |${lc.spsj!}       |
+|             |${lc.name!}                   |                  |
+
+
+
+