修改

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

@@ -1287,7 +1287,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
         String typeName = dateStr + seconds + ".doc";
         //  生成文件路径
         String targetPath = sourcePath + dateStr;
-        WordUtils.creatWord(dataMap, "tzsq", sourcePath, targetPath, typeName);
+        WordUtils.creatWord(dataMap, "tctz", sourcePath, targetPath, typeName);
         //新生成的word路径
         String wordPath = targetPath + "\\" + typeName;
         //生成出门证文件名

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvalcustfiling/BusValcustFilingService.java

@@ -1137,6 +1137,12 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
     public String createPdf(String sid, String userName) {
         BusValcustFiling busValcustFiling = fetchBySid(sid);
         BusValcustFilingDetailsVo busValcustFilingDetailsVo = fetchDetailsVoBySid(sid);
+        if (StringUtils.isBlank(busValcustFilingDetailsVo.getYsMoney())){
+            busValcustFilingDetailsVo.setYsMoney("0");
+        }
+        if (StringUtils.isBlank(busValcustFilingDetailsVo.getSsMoney())){
+            busValcustFilingDetailsVo.setSsMoney("0");
+        }
         Map<String, Object> dataMap = new HashMap<String, Object>();
         //分公司
         dataMap.put("orgName", busValcustFilingDetailsVo.getUseOrgName());
@@ -1157,12 +1163,6 @@ public class BusValcustFilingService extends MybatisBaseService<BusValcustFiling
         dataMap.put("hj", busValcustFilingDetailsVo.getTotalMoney());
         dataMap.put("yssxf", busValcustFilingDetailsVo.getYsMoney());
         dataMap.put("sssxf", busValcustFilingDetailsVo.getSsMoney());
-        if (StringUtils.isBlank(busValcustFilingDetailsVo.getYsMoney())){
-            busValcustFilingDetailsVo.setYsMoney("0");
-        }
-        if (StringUtils.isBlank(busValcustFilingDetailsVo.getSsMoney())){
-            busValcustFilingDetailsVo.setSsMoney("0");
-        }
         dataMap.put("ce", new BigDecimal(busValcustFilingDetailsVo.getYsMoney()).subtract(new BigDecimal(busValcustFilingDetailsVo.getSsMoney())));
         dataMap.put("yssxfhj", new BigDecimal(busValcustFilingDetailsVo.getYsMoney()).multiply(new BigDecimal(busValcustFilingDetailsVo.getNum())));
         dataMap.put("sssxfhj", new BigDecimal(busValcustFilingDetailsVo.getSsMoney()).multiply(new BigDecimal(busValcustFilingDetailsVo.getNum())));

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loandiff/LoanDiffPdfVo.java

@@ -32,11 +32,6 @@ import lombok.Data;
 @Data
 public class LoanDiffPdfVo implements Vo {
 
-    private Integer id;
-    @ApiModelProperty("资方")
-    private String zf;
-    @ApiModelProperty("贷款人")
-    private String dkr;
     @ApiModelProperty("车架号")
     private String vinNo;
     @ApiModelProperty("放款金额-应放")
@@ -58,15 +53,15 @@ public class LoanDiffPdfVo implements Vo {
     @ApiModelProperty("其他融厂家贴息-差额")
     private String ce9;
     @ApiModelProperty("固定贷款保证金-预计")
-    private String yj10;
+    private String gd1;
     @ApiModelProperty("固定贷款保证金-实际")
-    private String sj11;
+    private String gd2;
     @ApiModelProperty("固定贷款保证金-差额")
-    private String ce12;
+    private String gd3;
     @ApiModelProperty("意外险-已收")
-    private String ys13;
+    private String yw1;
     @ApiModelProperty("意外险-实际")
-    private String sj14;
+    private String yw2;
     @ApiModelProperty("意外险-差额")
-    private String ce15;
+    private String yw3;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml

@@ -312,7 +312,88 @@
         WHEN 1 THEN '控制成功'
         WHEN 2 THEN '控制失败'
         WHEN 3 THEN '已解控'
-        END AS lockCarState
+        END AS lockCarState,
+        CASE
+        WHEN lrpd.dueDate > lrpd.updateTime or lrpd.updateTime IS NULL THEN '1'
+        WHEN lrpd.dueDate <= lrpd.updateTime AND (IFNULL(
+        (
+        lrpd.dueMoney - IFNULL((
+        SELECT
+        SUM(
+        IFNULL( lrh.actualMoney, 0 ))
+        FROM
+        loan_repayment_history AS lrh
+        WHERE
+        lrh.planDetailSid = lrpd.sid
+        AND lrh.updateState = '1'
+        ),
+        0
+        )),
+        0
+        ) + IFNULL((
+        SELECT
+        ( fjj.reveivableMoney - fjj.m )
+        FROM
+        (
+        SELECT
+        IFNULL((
+        SELECT
+        SUM( subscriptionMoney )
+        FROM
+        anrui_fin.fin_selected_receivables_detailed AS s
+        WHERE
+        s.auditState = '3'
+        AND s.receivablesSid = fj.sid
+        ),
+        0
+        ) AS m,
+        fj.*
+        FROM
+        ( SELECT j.busSid, j.sid, j.reveivableMoney FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j WHERE j.payCostTitleKey = '006' ) AS fj
+        ) AS fjj
+        WHERE
+        fjj.busSid = lrpd.sid
+        ),0) + IFNULL(lrpd.paymentInterest,0)) > 0 THEN '0'
+        WHEN lrpd.dueDate <= lrpd.updateTime AND (IFNULL(
+        (
+        lrpd.dueMoney - IFNULL((
+        SELECT
+        SUM(
+        IFNULL( lrh.actualMoney, 0 ))
+        FROM
+        loan_repayment_history AS lrh
+        WHERE
+        lrh.planDetailSid = lrpd.sid
+        AND lrh.updateState = '1'
+        ),
+        0
+        )),
+        0
+        ) + IFNULL((
+        SELECT
+        ( fjj.reveivableMoney - fjj.m )
+        FROM
+        (
+        SELECT
+        IFNULL((
+        SELECT
+        SUM( subscriptionMoney )
+        FROM
+        anrui_fin.fin_selected_receivables_detailed AS s
+        WHERE
+        s.auditState = '3'
+        AND s.receivablesSid = fj.sid
+        ),
+        0
+        ) AS m,
+        fj.*
+        FROM
+        ( SELECT j.busSid, j.sid, j.reveivableMoney FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j WHERE j.payCostTitleKey = '006' ) AS fj
+        ) AS fjj
+        WHERE
+        fjj.busSid = lrpd.sid
+        ),0) + IFNULL(lrpd.paymentInterest,0)) <= 0 THEN '1'
+        END AS nowOverdue
         FROM loan_repayment_plan_details lrpd
         LEFT JOIN loan_repayment_history lrh
         ON lrh.planDetailSid = lrpd.sid

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java

@@ -80,6 +80,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -883,33 +884,30 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
         dataMap.put("billNo", loanDiff.getBillNo());
         List<LoanDiffPdfVo> loanDiffPdfVos = new ArrayList<>();
         //循环获取车辆信息
-        Integer i = 1;
         for (LoanDiffDetailssVo loanDiffDetailssVo : data.getLoanDiffDetails()) {
             LoanDiffPdfVo loanDiffPdfVo = new LoanDiffPdfVo();
-            loanDiffPdfVo.setId(i);
-            i = i + 1;
-            loanDiffPdfVo.setZf(loanDiffDetailssVo.getBankName());
-            loanDiffPdfVo.setDkr(loanDiffDetailssVo.getBorrowName());
             loanDiffPdfVo.setVinNo(loanDiffDetailssVo.getVinNo());
-            loanDiffPdfVo.setYf1(loanDiffDetailssVo.getMakeLoan().toString());
-            loanDiffPdfVo.setSf2(loanDiffDetailssVo.getRealityLoan().toString());
-            loanDiffPdfVo.setCe3(loanDiffDetailssVo.getDiffLoan().toString());
-            loanDiffPdfVo.setYj4(loanDiffDetailssVo.getMakeDiscount().toString());
-            loanDiffPdfVo.setSj5(loanDiffDetailssVo.getRealityOtherDiscount().toString());
-            loanDiffPdfVo.setCe6(loanDiffDetailssVo.getDiffDiscount().toString());
-            loanDiffPdfVo.setYj7(loanDiffDetailssVo.getMakeOtherDiscount().toString());
-            loanDiffPdfVo.setSj8(loanDiffDetailssVo.getDiffOtherDiscount().toString());
-            loanDiffPdfVo.setCe9(loanDiffDetailssVo.getDiffOtherDiscount().toString());
-            loanDiffPdfVo.setYj10(loanDiffDetailssVo.getMakeLoanMargin().toString());
-            loanDiffPdfVo.setSj11(loanDiffDetailssVo.getRealityLoanMargin().toString());
-            loanDiffPdfVo.setCe12(loanDiffDetailssVo.getDiffLoanMargin().toString());
-            loanDiffPdfVo.setYs13(loanDiffDetailssVo.getReceivedPremium().toString());
-            loanDiffPdfVo.setSj14(loanDiffDetailssVo.getRealityPremium().toString());
-            loanDiffPdfVo.setCe15(loanDiffDetailssVo.getDiffPremium().toString());
+            loanDiffPdfVo.setYf1(loanDiffDetailssVo.getMakeLoan() == null ? "0" : loanDiffDetailssVo.getMakeLoan().toString());
+            loanDiffPdfVo.setSf2(loanDiffDetailssVo.getRealityLoan() == null ? "0" : loanDiffDetailssVo.getRealityLoan().toString());
+            loanDiffPdfVo.setCe3(loanDiffDetailssVo.getDiffLoan() == null ? "0" : loanDiffDetailssVo.getDiffLoan().toString());
+            loanDiffPdfVo.setYj4(loanDiffDetailssVo.getMakeDiscount() == null ? "0" : loanDiffDetailssVo.getMakeDiscount().toString());
+            loanDiffPdfVo.setSj5(loanDiffDetailssVo.getRealityDiscount() == null ? "0" : loanDiffDetailssVo.getRealityDiscount().toString());
+            loanDiffPdfVo.setCe6(loanDiffDetailssVo.getDiffDiscount() == null ? "0" : loanDiffDetailssVo.getDiffDiscount().toString());
+            loanDiffPdfVo.setYj7(loanDiffDetailssVo.getMakeOtherDiscount() == null ? "0" : loanDiffDetailssVo.getMakeOtherDiscount().toString());
+            loanDiffPdfVo.setSj8(loanDiffDetailssVo.getRealityOtherDiscount() == null ? "0" : loanDiffDetailssVo.getRealityOtherDiscount().toString());
+            loanDiffPdfVo.setCe9(loanDiffDetailssVo.getDiffOtherDiscount() == null ? "0" : loanDiffDetailssVo.getDiffOtherDiscount().toString());
+            loanDiffPdfVo.setGd1(loanDiffDetailssVo.getMakeLoanMargin() == null ? "0" : loanDiffDetailssVo.getMakeLoanMargin().toString());
+            loanDiffPdfVo.setGd2(loanDiffDetailssVo.getRealityLoanMargin() == null ? "0" : loanDiffDetailssVo.getRealityLoanMargin().toString());
+            loanDiffPdfVo.setGd3(loanDiffDetailssVo.getDiffLoanMargin() == null ? "0" : loanDiffDetailssVo.getDiffLoanMargin().toString());
+            loanDiffPdfVo.setYw1(loanDiffDetailssVo.getReceivedPremium() == null ? "0" : loanDiffDetailssVo.getReceivedPremium().toString());
+            loanDiffPdfVo.setYw2(loanDiffDetailssVo.getRealityPremium() == null ? "0" : loanDiffDetailssVo.getRealityPremium().toString());
+            loanDiffPdfVo.setYw3(loanDiffDetailssVo.getDiffPremium() == null ? "0" : loanDiffDetailssVo.getDiffPremium().toString());
             loanDiffPdfVos.add(loanDiffPdfVo);
         }
         dataMap.put("wlList", loanDiffPdfVos);
-        dataMap.put("remarks", data.getRemarks());
+        dataMap.put("zf", data.getLoanDiffDetails().get(0).getBankName());
+        dataMap.put("dkr", data.getLoanDiffDetails().get(0).getBorrowName());
+        dataMap.put("bz", data.getRemarks());
         //获取审批记录
         List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignSp.flowRecordAndComment(loanDiff.getProcInstId(), "1").getData();
         List<FinPaymentrecordSourceLCVo> finPaymentrecordSourceLCVos = new ArrayList<>();
@@ -966,7 +964,7 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
         String typeName = dateStr + seconds + ".doc";
         //  生成文件路径
         String targetPath = sourcePath + dateStr;
-        WordUtils.creatWord(dataMap, "fkqr", sourcePath, targetPath, typeName);
+        WordUtils.creatWord(dataMap, "fkce", sourcePath, targetPath, typeName);
         //新生成的word路径
         String wordPath = targetPath + "\\" + typeName;
         //生成出门证文件名

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryAlloSelectList.java

@@ -44,6 +44,10 @@ public class WmsInventoryAlloSelectList {
     private String warehouseRackSid;
     //库位编码
     private String warehouseRackCode;
+    //区域sid
+    private String warehouseZoneSid;
+    //区域名称
+    private String warehouseZoneName;
     //库存数量
     private String count;
     //入库单价

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@@ -287,12 +287,16 @@
         wi.warehouseRackSid,
         wi.warehouseRackCode,
         wi.count,
-        wi.cost AS taxPrice
+        wi.cost AS taxPrice,
+        wz.sid AS warehouseZoneSid,
+        wz.zoneName AS warehouseZoneName
         FROM wms_inventory wi
         LEFT JOIN wms_warehouse_rack wr
         ON wi.warehouseRackSid = wr.sid
         LEFT JOIN wms_warehouse_area wa
         ON wr.locationSid = wa.sid
+        LEFT JOIN wms_warehouse_zone wz
+        ON wz.warehouseSid = wi.warehouseSid
         <where>
             ${ew.sqlSegment}
         </where>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillQueryNew.java

@@ -1,13 +1,9 @@
 package com.yxt.wms.biz.inventory.wmsinventoryallocatebill;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
  * @author wangpengfei
  * @date 2024/2/26 13:37

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetail.java

@@ -1,12 +1,9 @@
 package com.yxt.wms.biz.inventory.wmsinventoryallocatebilldetail;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * @author wangpengfei

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailDtoNew.java

@@ -53,6 +53,10 @@ public class WmsInventoryAllocateBillDetailDtoNew implements Dto {
     private String warehouseRackSid;
     @ApiModelProperty("库位编码")
     private String warehouseRackCode;
+    @ApiModelProperty("区域sid")
+    private String warehouseZoneSid;
+    @ApiModelProperty("区域名称")
+    private String warehouseZoneName;
     @ApiModelProperty("库存数量")
     private BigDecimal stockCount;
     @ApiModelProperty("成本价")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListQuery.java

@@ -25,25 +25,11 @@
  *********************************************************/
 package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail;
 
-
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-/**
- * Project: yxt-wms(仓储) <br/>
- * File: WmsInventoryCheckbillDetailVo.java <br/>
- * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo <br/>
- * Description: 库存盘点-明细 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-22 09:25:02 <br/>
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
 @Data
 @ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情")
 public class WmsInventoryCheckbillDetailGoodPageListQuery implements Query {
@@ -51,11 +37,13 @@ public class WmsInventoryCheckbillDetailGoodPageListQuery implements Query {
     @ApiModelProperty("盘点sid")
     private String billSid;
     @ApiModelProperty("仓库sid")
-    private String warehouseSid; // 仓库sid
+    private String warehouseSid;
     @ApiModelProperty("库区sid")
-    private String warehouseAreaSid; // 库区sid
+    private String warehouseAreaSid;
     @ApiModelProperty("库位sid")
-    private String warehouseRackSid; // 库位sid
+    private String warehouseRackSid;
+    @ApiModelProperty("区域sid")
+    private String warehouseZoneSid;
     @ApiModelProperty("商品ID")
     private String goodsID; // 商品ID
     @ApiModelProperty("商品名称")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListVo.java

@@ -66,6 +66,8 @@ public class WmsInventoryCheckbillDetailGoodPageListVo implements Vo {
     private String warehouseArea;
     @ApiModelProperty("库位名称")
     private String warehouseRackName;
+    @ApiModelProperty("区域名称")
+    private String warehouseZoneName;
     @ApiModelProperty("单位")
     private String unit;
     @ApiModelProperty("成本单价")

工作内容需要的文档/单据模板/价值客户备案模板/价值客户备案.docx

@@ -0,0 +1,46 @@
+                           价值客户备案审批
+                                                                   分公司：
+${orgName!}
+                                                                创建部门：
+${deptName!}　
+                                                                   创建人：
+${createName!}
+                                                                创建日期：
+${createTime!}
+                                                                办结日期：
+${finishTime!}　
+                                                                审批编号：
+${billNo!}
+                                                             销售合同编号
+${hth!}
+                                                                         车型
+${model!}　
+                                                                      车架号
+${vinNo!}
+                              单台加装配置金额/单台销售让利金额
+${je!}
+                                                                   合计金额
+${hj!}
+                                                          单台应收手续费
+${yssxf!}　
+                                                          单台实收手续费
+${sssxf!}　
+                                                          单台手续费差额
+${ce!}　
+                                                          应收手续费合计
+${yssxfhj!}　
+                                                          实收手续费合计
+${sssxfhj!}　
+                                                          手续费差额合计
+${cehj!}　
+                                                                         备注
+${remarks!}　
+                                                                   流程审批
+${lc.comment!}
+${lc.name!}
+                                                                    ${lc.spsj!}
+                                                                   下载人：
+${downName!}
+                                                                下载时间：
+${downTime!}
+

工作内容需要的文档/单据模板/放款差额模板/放款差额.docx

@@ -0,0 +1,71 @@
+                           放款差额确认申请
+                                                                   分公司：
+${orgName!}
+                                                                创建部门：
+${deptName!}
+                                                                   创建人：
+${createName!}
+                                                                创建日期：
+${createTime!}
+                                                                办结日期：
+${finishTime!}
+                                                                审批编号：
+${billNo!}
+                                                                         备注
+${remarks!}
+                                    序号
+                                    资方
+                                   贷款人
+                                   车架号
+                                 放款金额
+                             主产品厂家贴息
+                             其他融厂家贴息
+                             固定贷款保证金
+                                   意外险
+                                       
+                                       
+                                       
+                                       
+                                    应放
+                                    实放
+                                    差额
+                                    预计
+                                    实际
+                                    差额
+                                    预计
+                                    实际
+                                    差额
+                                    预计
+                                    实际
+                                    差额
+                                    已收
+                                    实际
+                                    差额
+                                   ${wl.id!}
+                                   ${wl.zf!}
+                                  ${wl.dkr!}
+                                 ${wl.vinNo!}
+                                  ${wl.yf1!}
+                                  ${wl.sf2!}
+                                  ${wl.ce3!}
+                                  ${wl.yj4!}
+                                  ${wl.sj5!}
+                                  ${wl.ce6!}
+                                  ${wl.yj7!}
+                                  ${wl.sj8!}
+                                  ${wl.ce9!}
+                                  ${wl.yj10!}
+                                  ${wl.sj11!}
+                                  ${wl.ce12!}
+                                  ${wl.ys13!}
+                                  ${wl.sj14!}
+                                  ${wl.ce15!}
+                                 审批流程
+${lc.name!}
+${lc.comment!} 
+                                                                                                                                                                                                                                                        ${lc.spsj}
+                                                                   下载人：
+${downName!}
+                                                                下载时间：
+${downTime!}
+

工作内容需要的文档/单据模板/销售退车模板/销售退车.docx

@@ -0,0 +1,55 @@
+                           销售订单退车审批
+                                                                   分公司：
+${orgName!}　
+                                                                创建部门：
+${deptName!}　
+                                                                   创建人：
+${createName!}
+                                                                创建日期：
+${createTime!}　
+                                                                办结日期：
+${finishTime!}　
+                                                                审批编号：
+${billNo!}　
+                                                                   合同编号
+${contractNo!}
+                                                                   客户名称
+${customer!}
+                                                                   销售类型
+${saleType!}
+                                                                         车型
+${model!}
+                                                                         台数
+${num!}
+                                                                 成交价(元)
+${price!}
+                                                                   收款情况
+${skqk!}
+                                                                   终止原因
+${zzyy!}
+                                                                         备注
+${remarks!}
+车辆列表 
+                                    序号
+                                   车架号
+                                    颜色
+                                合格证状态
+                                 开票状态
+                                 投保状态
+                                 库存状态
+                                   ${wl.id!}
+                                 ${wl.vinNo!}
+                                 ${wl.color!}
+                                ${wl.hgzState!}
+                                ${wl.kpState!}
+                                ${wl.tbState!}
+                                ${wl.kcState!}
+                                                                   审批流程
+${lc.comment!}
+${lc.name!}
+                                                                    ${lc.spsj!}
+                                                                   下载人：
+${downName!}
+                                                                下载时间：
+${downTime!}
+