Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java

@@ -536,6 +536,11 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
                     return rb.setMsg("车架号" + loanBeCollectionVehDetail.getVinNo() + "没有添加担保人信息");
                 }
             }
+            if (collMeasures.contains("签订还款协议")) {
+                if (loanBeCollectionVehDetail.getHkxyFiles().size() == 0){
+                    return rb.setMsg("车架号" + loanBeCollectionVehDetail.getVinNo() + "没有上传还款协议附件");
+                }
+            }
         }
         LoanBeCollectionApply loanBeCollectionApply = fetchBySid(dto.getSid());
         int r = submitBusinessData(dto, loanBeCollectionApply);

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

@@ -229,8 +229,6 @@
         lrpd.dueDate < CURDATE()
         GROUP BY
         lrpd.sid
-        HAVING
-        (lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0))) > 0
         ) a1
         WHERE
         a1.borrowerSid = #{borrowerSid}
@@ -239,6 +237,7 @@
         a1.loanContractNo,
         a1.vinNo,
         a1.busVinSid
+        HAVING beOverdueMoney > 0
     </select>
 
     <select id="initReaRepayment" resultType="com.yxt.anrui.riskcenter.api.loanbeoverdueveh.ReaRepaymentVo">
@@ -344,7 +343,6 @@
         ) lbcv ON lbcv.saleVehSid = lrpd.busVinSid AND lbcv.rn = 1
         WHERE lrpd.dueDate &lt; CURDATE()  -- 移除DATE_FORMAT函数
         GROUP BY lrpd.sid
-        HAVING (lrpd.dueMoney - COALESCE(SUM(lrh.actualMoney), 0)) > 0
         ) a1
         LEFT JOIN (
         SELECT

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

@@ -183,6 +183,7 @@ public class LoanBeOverdueVehService {
         if (StringUtils.isNotBlank(query.getBeOverdueMoneyAndPeriod())) {
             qw.having("beOverdueMoneyAndPeriod = {0}", query.getBeOverdueMoneyAndPeriod());
         }
+        qw.having("beOverdueMoney > {0}", 0);
         IPage<LoanBeOverdueVehVo> page = PagerUtil.queryToPage(pq);
         IPage<LoanBeOverdueVehVo> pagging = loanBeOverdueVehMapper.selectPageVo(page, qw);
         PagerVo<LoanBeOverdueVehVo> p = PagerUtil.pageToVo(pagging, null);
@@ -303,6 +304,7 @@ public class LoanBeOverdueVehService {
         if (StringUtils.isNotBlank(query.getBeOverdueMoneyAndPeriod())) {
             qw.having("beOverdueMoneyAndPeriod = {0}", query.getBeOverdueMoneyAndPeriod());
         }
+        qw.having("beOverdueMoney > {0}", 0);
         List<LoanBeOverdueVehExcelVo> loanBeOverdueVehExcelVos = loanBeOverdueVehMapper.excelList(qw);
         return loanBeOverdueVehExcelVos;
     }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -317,7 +317,9 @@
                                             WHERE j.payCostTitleKey = '006') as fj) as fjj
                                 WHERE fjj.busSid = a.sid), 0) as fund
                  FROM (
-                          SELECT pd.scheduleSid,
+                          SELECT
+                                 v.settleState,
+                                 pd.scheduleSid,
                                  pd.loanContractNo,
                                  pd.oweState,
                                  pd.dueDate,
@@ -335,6 +337,7 @@
                                  pd.updateTime                 AS updateDate
                           FROM loan_repayment_plan_details AS pd
                                    LEFT JOIN anrui_buscenter.bus_sales_order AS s ON s.sid = pd.salesOrderSid
+                                   LEFT JOIN anrui_buscenter.bus_sales_order_vehicle as v ON pd.busVinSid = v.sid
                                    LEFT JOIN (
                               SELECT p.sid,
                                      IFNULL((
@@ -362,7 +365,8 @@
                               FROM loan_repayment_plan_details AS p
                           ) AS t ON pd.sid = t.sid
                       ) AS a
-                 WHERE a.dueDate <= a.updateDate
+                 WHERE a.settleState != 1
+                   AND a.dueDate <= a.updateDate
                    AND a.oweState = 1
                    AND a.useOrgSid = #{pushUseOrgSid}
              ) AS b

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml

@@ -49,25 +49,28 @@
     <select id="detailRackPageList"
             resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackPageListVo">
         SELECT
-        billSid,
+        d.billSid,
-        warehouseName,
+        d.warehouseName,
-        warehouseArea,
+        z.zoneName,
-        warehouseRackSid,
+        d.warehouseArea,
-        warehouseRackName,
+        d.warehouseRackSid,
-        SUM(bookCount) AS bookCount,
+        d.warehouseRackName,
-        SUM(bookCount * cost) AS bookAmount,
+        SUM(d.bookCount) AS bookCount,
-        SUM(realCount) AS realCount,
+        SUM(d.bookCount * d.cost) AS bookAmount,
-        SUM(realCount * cost) AS realAmount,
+        SUM(d.realCount) AS realCount,
-        SUM(bookCount) - SUM(realCount) AS notCount,
+        SUM(d.realCount * d.cost) AS realAmount,
-        (SUM(bookCount * cost) - SUM(realCount * cost)) AS notAmount,
+        SUM(d.bookCount) - SUM(d.realCount) AS notCount,
-        SUM(profitCount) AS profitCount,
+        (SUM(d.bookCount * d.cost) - SUM(d.realCount * d.cost)) AS notAmount,
-        SUM(profitCount * cost) AS profitAmount,
+        SUM(d.profitCount) AS profitCount,
-        SUM(loseCount) AS loseCount,
+        SUM(d.profitCount * d.cost) AS profitAmount,
-        SUM(loseCount * cost) AS loseAmount,
+        SUM(d.loseCount) AS loseCount,
-        SUM(lossCount) AS lossCount,
+        SUM(d.loseCount * d.cost) AS loseAmount,
-        SUM(lossCount * cost) AS lossAmount
+        SUM(d.lossCount) AS lossCount,
+        SUM(d.lossCount * d.cost) AS lossAmount
         FROM
-        wms_inventory_checkbill_detail
+        wms_inventory_checkbill_detail d
+        LEFT JOIN wms_warehouse_zone z
+        ON d.warehouseSid = z.warehouseSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -128,21 +131,22 @@
     <select id="detailRackGoodPageList"
             resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackGoodPageListVo">
         SELECT
-        sid,
+        d.sid,
-        goodsID,
+        d.goodsID,
-        goodsSkuTitle,
+        d.goodsSkuTitle,
-        goodsSkuCode,
+        d.goodsSkuCode,
-        warehouseName,
+        d.warehouseName,
-        warehouseArea,
+        z.zoneName,
-        warehouseRackName,
+        d.warehouseArea,
-        unit,
+        d.warehouseRackName,
-        cost,
+        d.unit,
-        bookCount,
+        d.cost,
-        bookCount * cost AS bookAmount,
+        d.bookCount,
-        realCount,
+        d.bookCount * cost AS bookAmount,
-        realCount * cost AS realAmount,
+        d.realCount,
+        d.realCount * cost AS realAmount,
         CASE
-        state
+        d.state
         WHEN 2
         THEN '正常'
         WHEN 3
@@ -151,7 +155,7 @@
         THEN '盘亏'
         END AS state,
         CASE
-        state
+        d.state
         WHEN 2
         THEN 0
         WHEN 3
@@ -160,7 +164,7 @@
         THEN loseCount
         END AS profitAndLoseCount,
         CASE
-        state
+        d.state
         WHEN 2
         THEN 0
         WHEN 3
@@ -168,11 +172,13 @@
         WHEN 4
         THEN loseCount * cost
         END AS profitAndLoseAmount,
-        lossCount,
+        d.lossCount,
-        lossCount * cost AS lossAmount,
+        d.lossCount * cost AS lossAmount,
-        remarks
+        d.remarks
         FROM
-        wms_inventory_checkbill_detail
+        wms_inventory_checkbill_detail d
+        LEFT JOIN wms_warehouse_zone z
+        ON d.warehouseSid = z.warehouseSid
         <where>
             ${ew.sqlSegment}
         </where>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java

@@ -199,16 +199,19 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
         WmsInventoryCheckbillDetailRackPageListQuery query = pq.getParams();
         QueryWrapper<WmsInventoryCheckbill> qw = new QueryWrapper<>();
         qw.eq("billSid", query.getBillSid());
-        if (StringUtils.isNotBlank(query.getWarehouseSid())) {
+        if (StringUtils.isNotBlank(query.getWarehouseName())) {
-            qw.eq("warehouseSid", query.getWarehouseSid());
+            qw.eq("d.warehouseName", query.getWarehouseName());
         }
-        if (StringUtils.isNotBlank(query.getWarehouseAreaSid())) {
+        if (StringUtils.isNotBlank(query.getZoneName())) {
-            qw.eq("warehouseAreaSid", query.getWarehouseAreaSid());
+            qw.eq("z.zoneName", query.getZoneName());
         }
-        if (StringUtils.isNotBlank(query.getWarehouseRackSid())) {
+        if (StringUtils.isNotBlank(query.getWarehouseAreaName())) {
-            qw.eq("warehouseRackSid", query.getWarehouseRackSid());
+            qw.eq("d.warehouseArea", query.getWarehouseAreaName());
         }
-        qw.groupBy("warehouseRackSid");
+        if (StringUtils.isNotBlank(query.getWarehouseRackName())) {
+            qw.eq("d.warehouseRackName", query.getWarehouseRackName());
+        }
+        qw.groupBy("d.warehouseRackSid");
         IPage<WmsInventoryCheckbill> page = PagerUtil.queryToPage(pq);
         IPage<WmsInventoryCheckbillDetailRackPageListVo> pagging = baseMapper.detailRackPageList(page, qw);
         PagerVo<WmsInventoryCheckbillDetailRackPageListVo> p = PagerUtil.pageToVo(pagging, null);
@@ -246,20 +249,20 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
     public PagerVo<WmsInventoryCheckbillDetailRackGoodPageListVo> detailRackGoodPageList(PagerQuery<WmsInventoryCheckbillDetailRackGoodPageListQuery> pq) {
         WmsInventoryCheckbillDetailRackGoodPageListQuery query = pq.getParams();
         QueryWrapper<WmsInventoryCheckbill> qw = new QueryWrapper<>();
-        qw.eq("billSid", query.getBillSid());
+        qw.eq("d.billSid", query.getBillSid());
-        qw.eq("warehouseRackSid", query.getWarehouseRackSid());
+        qw.eq("d.warehouseRackSid", query.getWarehouseRackSid());
         if (StringUtils.isNotBlank(query.getGoodsID())) {
-            qw.like("goodsID", query.getGoodsID());
+            qw.like("d.goodsID", query.getGoodsID());
         }
         if (StringUtils.isNotBlank(query.getGoodsSkuTitle())) {
-            qw.like("goodsSkuTitle", query.getGoodsSkuTitle());
+            qw.like("d.goodsSkuTitle", query.getGoodsSkuTitle());
         }
         if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
-            qw.like("goodsSkuCode", query.getGoodsSkuCode());
+            qw.like("d.goodsSkuCode", query.getGoodsSkuCode());
         }
         //移动端查询条件
         if (StringUtils.isNotBlank(query.getName())) {
-            qw.and(wrapper -> wrapper.like("goodsID", query.getName()).or().like("goodsSkuTitle", query.getName()).or().like("goodsSkuCode", query.getName()));
+            qw.and(wrapper -> wrapper.like("d.goodsID", query.getName()).or().like("d.goodsSkuTitle", query.getName()).or().like("d.goodsSkuCode", query.getName()));
         }
         IPage<WmsInventoryCheckbill> page = PagerUtil.queryToPage(pq);
         IPage<WmsInventoryCheckbillDetailRackGoodPageListVo> pagging = baseMapper.detailRackGoodPageList(page, qw);

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

@@ -25,7 +25,6 @@
  *********************************************************/
 package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail;
 
-
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -35,19 +34,6 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * 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 WmsInventoryCheckbillDetailRackGoodPageListVo implements Vo {
@@ -62,6 +48,8 @@ public class WmsInventoryCheckbillDetailRackGoodPageListVo implements Vo {
     private String goodsSkuCode; // 图号
     @ApiModelProperty("仓库名称")
     private String warehouseName;
+    @ApiModelProperty("区域名称")
+    private String zoneName;
     @ApiModelProperty("库区名称")
     private String warehouseArea;
     @ApiModelProperty("库位名称")

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

@@ -33,31 +33,20 @@ import lombok.Data;
 
 import java.math.BigDecimal;
 
-/**
- * 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 WmsInventoryCheckbillDetailRackPageListQuery implements Query {
 
     @ApiModelProperty("盘点sid")
     private String billSid;
-    @ApiModelProperty("仓库sid")
+    @ApiModelProperty("仓库")
-    private String warehouseSid; // 仓库sid
+    private String warehouseName; // 仓库sid
+    @ApiModelProperty("区域sid")
+    private String zoneName;
     @ApiModelProperty("库区sid")
-    private String warehouseAreaSid; // 库区sid
+    private String warehouseAreaName; // 库区sid
     @ApiModelProperty("库位sid")
-    private String warehouseRackSid; // 库位sid
+    private String warehouseRackName; // 库位sid
 
     /*
      * 移动端查询条件

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

@@ -25,27 +25,12 @@
  *********************************************************/
 package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail;
 
-
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.math.BigDecimal;
 
-/**
- * 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 WmsInventoryCheckbillDetailRackPageListVo implements Vo {
@@ -54,6 +39,8 @@ public class WmsInventoryCheckbillDetailRackPageListVo implements Vo {
 
     @ApiModelProperty("仓库名称")
     private String warehouseName;
+    @ApiModelProperty("区域名称")
+    private String zoneName;
     @ApiModelProperty("库区名称")
     private String warehouseArea;
     @ApiModelProperty("库位sid")