Merge remote-tracking branch 'origin/master'

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/front/controller/WaybillCostDetailsController.java

@@ -4,14 +4,18 @@ import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.logistics.domain.BizWaybillCostDetails;
+import com.ruoyi.logistics.domain.BizWaybillOrder;
 import com.ruoyi.logistics.service.IBizWaybillCostDetailsService;
+import com.ruoyi.logistics.service.IBizWaybillOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * WX-运单费用明细
@@ -25,16 +29,20 @@ public class WaybillCostDetailsController extends BaseController
 {
     @Autowired
     private IBizWaybillCostDetailsService bizWaybillCostDetailsService;
-
+    @Autowired
+    private IBizWaybillOrderService bizWaybillOrderService;
     /**
-     * 查询运单明细列表
+     * 查询运单明细列表 这个需要返回运单和费用列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(BizWaybillCostDetails bizWaybillCostDetails)
+    public AjaxResult list(BizWaybillCostDetails bizWaybillCostDetails)
     {
-        startPage();
-        List<BizWaybillCostDetails> list = bizWaybillCostDetailsService.selectBizWaybillCostDetailsList(bizWaybillCostDetails);
-        return getDataTable(list);
+        Map result= new HashMap<>();
+        List<BizWaybillCostDetails> list = bizWaybillCostDetailsService.selectBizWaybillCostDetailsListByWx(bizWaybillCostDetails);
+        BizWaybillOrder orderInfo= bizWaybillOrderService.selectBizWaybillOrderByWaybillId(bizWaybillCostDetails.getWaybillId());
+        result.put("feeList",list);
+        result.put("orderInfo",orderInfo);
+        return AjaxResult.success(result);
     }
 
     /**

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/controller/BizWaybillCostDetailsController.java

@@ -37,6 +37,9 @@ public class BizWaybillCostDetailsController extends BaseController
 
     /**
      * 查询运单明细列表
+     * 这个在财务月度汇总需传入供应商id以及外部运单号  查询详情列表
+     * 参数：  月份--月度账单中的月份 格式2026.01
+     *        供应商--也叫部门id
      */
     @RequiresPermissions("system:costDetails:list")
     @GetMapping("/list")
@@ -82,6 +85,8 @@ public class BizWaybillCostDetailsController extends BaseController
     }
 
     /**
+     * 这个只有部分人有修改运费明细的权限
+     *
      * 修改运单明细
      */
     @RequiresPermissions("system:costDetails:edit")

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/controller/RptFinancialMonthSummaryController.java

@@ -83,7 +83,7 @@ public class RptFinancialMonthSummaryController extends BaseController
     }
 
     /**
-     * 月度账单汇总生成
+     * 月度账单汇总生成  定时任务定时生成
      */
 
     @PostMapping("/creatMontSummary")

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/domain/BizWaybillCostDetails.java

@@ -1,6 +1,9 @@
 package com.ruoyi.logistics.domain;
 
 import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -59,10 +62,95 @@ public class BizWaybillCostDetails extends BaseEntity
     @Excel(name = "用户id")
     private Long userId;
 
+
+
+
+
+
+    @Excel(name = "订单类型 1-非时效件(京东)，2-时效件(顺丰)")
+    private Integer orderType;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date signTime;
+    /** 寄件地区 */
+    @Excel(name = "寄件地区")
+    private String senderCity;
+    /** 到件地区 */
+    @Excel(name = "到件地区")
+    private String receiverCity;
+    /** 计费重量 */
+    @Excel(name = "计费重量")
+    private BigDecimal goodsWeight;
+    /** 产品类型 */
+    @Excel(name = "产品类型")
+    private String productCode;
+    /** 经手人 */
+    @Excel(name = "经手人")
+    private Long userName;
+
+
+
+
+
+
+
+
     /** 删除标志 （0代表存在 2代表删除） */
     private String delFlag;
 
-    public void setWaybillDetailId(Long waybillDetailId) 
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
+
+    public void setSignTime(Date signTime) {
+        this.signTime = signTime;
+    }
+
+    public void setSenderCity(String senderCity) {
+        this.senderCity = senderCity;
+    }
+
+    public void setReceiverCity(String receiverCity) {
+        this.receiverCity = receiverCity;
+    }
+
+    public void setGoodsWeight(BigDecimal goodsWeight) {
+        this.goodsWeight = goodsWeight;
+    }
+
+    public void setProductCode(String productCode) {
+        this.productCode = productCode;
+    }
+
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    public Date getSignTime() {
+        return signTime;
+    }
+
+    public String getSenderCity() {
+        return senderCity;
+    }
+
+    public String getReceiverCity() {
+        return receiverCity;
+    }
+
+    public BigDecimal getGoodsWeight() {
+        return goodsWeight;
+    }
+
+    public String getProductCode() {
+        return productCode;
+    }
+
+    public Long getUserName() {
+        return userName;
+    }
+
+    public void setWaybillDetailId(Long waybillDetailId)
     {
         this.waybillDetailId = waybillDetailId;
     }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/mapper/BizWaybillCostDetailsMapper.java

@@ -58,4 +58,6 @@ public interface BizWaybillCostDetailsMapper
      * @return 结果
      */
     public int deleteBizWaybillCostDetailsByWaybillDetailIds(Long[] waybillDetailIds);
+
+    List<BizWaybillCostDetails> selectBizWaybillCostDetailsListByWx(BizWaybillCostDetails bizWaybillCostDetails);
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/IBizWaybillCostDetailsService.java

@@ -58,4 +58,6 @@ public interface IBizWaybillCostDetailsService
      * @return 结果
      */
     public int deleteBizWaybillCostDetailsByWaybillDetailId(Long waybillDetailId);
+
+    List<BizWaybillCostDetails> selectBizWaybillCostDetailsListByWx(BizWaybillCostDetails bizWaybillCostDetails);
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/BizWaybillCostDetailsServiceImpl.java

@@ -1,7 +1,9 @@
 package com.ruoyi.logistics.service.impl;
 
+import java.util.Collections;
 import java.util.List;
 import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.datascope.annotation.DataScope;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.logistics.mapper.BizWaybillCostDetailsMapper;
@@ -39,6 +41,7 @@ public class BizWaybillCostDetailsServiceImpl implements IBizWaybillCostDetailsS
      * @return 运单明细
      */
     @Override
+    @DataScope(deptAlias = "d")
     public List<BizWaybillCostDetails> selectBizWaybillCostDetailsList(BizWaybillCostDetails bizWaybillCostDetails)
     {
         return bizWaybillCostDetailsMapper.selectBizWaybillCostDetailsList(bizWaybillCostDetails);
@@ -66,6 +69,11 @@ public class BizWaybillCostDetailsServiceImpl implements IBizWaybillCostDetailsS
     @Override
     public int updateBizWaybillCostDetails(BizWaybillCostDetails bizWaybillCostDetails)
     {
+        //修改运费明细后  会向修改记录插入数据
+
+
+
+
         bizWaybillCostDetails.setUpdateTime(DateUtils.getNowDate());
         return bizWaybillCostDetailsMapper.updateBizWaybillCostDetails(bizWaybillCostDetails);
     }
@@ -93,4 +101,9 @@ public class BizWaybillCostDetailsServiceImpl implements IBizWaybillCostDetailsS
     {
         return bizWaybillCostDetailsMapper.deleteBizWaybillCostDetailsByWaybillDetailId(waybillDetailId);
     }
+
+    @Override
+    public List<BizWaybillCostDetails> selectBizWaybillCostDetailsListByWx(BizWaybillCostDetails bizWaybillCostDetails) {
+        return bizWaybillCostDetailsMapper.selectBizWaybillCostDetailsListByWx(bizWaybillCostDetails);
+    }
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/RptFinancialMonthSummaryServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.datascope.annotation.DataScope;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,6 +46,7 @@ public class RptFinancialMonthSummaryServiceImpl implements IRptFinancialMonthSu
      * @return 财务月度汇总
      */
     @Override
+    @DataScope(deptAlias = "d")
     public List<RptFinancialMonthSummary> selectRptFinancialMonthSummaryList(RptFinancialMonthSummary rptFinancialMonthSummary)
     {
         return rptFinancialMonthSummaryMapper.selectRptFinancialMonthSummaryList(rptFinancialMonthSummary);
@@ -121,8 +123,8 @@ public class RptFinancialMonthSummaryServiceImpl implements IRptFinancialMonthSu
         // 格式化上个月日期为字符串
         String formattedDate = lastMonth.format(formatter);
         //按照传值条件查询统计账单情况
-
         param.put("monthCode",formattedDate);
+        param.put("deptId",null);
         List<Map<String,Object>> monthSummaryList=rptFinancialMonthSummaryMapper.selectMonthSummaryList(param);
         return rptFinancialMonthSummaryMapper.insertBachRptFinancialMonthSummary(monthSummaryList);
     }

jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/logistics/BizWaybillCostDetailsMapper.xml

@@ -22,16 +22,65 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateBy"    column="update_by"    />
+
+
+        <result property="orderType"    column="order_type"    />
+        <result property="senderCity"    column="sender_city"    />
+        <result property="receiverCity"    column="receiver_city"    />
+        <result property="signTime"    column="sign_time"    />
+        <result property="goodsWeight"    column="goods_weight"    />
+        <result property="productCode"    column="product_code"    />
+        <result property="userName"    column="user_name"    />
+
+
+
+
+
     </resultMap>
 
     <sql id="selectBizWaybillCostDetailsVo">
-        select waybill_detail_id, waybill_id, external_waybill_no, fee_item_code, fee_item_name, fee_name, amount, rate_amount, adjust_amount, remark, create_time, update_time, dept_id, user_id, del_flag, create_by, update_by from biz_waybill_cost_details
-    </sql>
+        SELECT
+            a.waybill_detail_id,
+            b.sign_time,
+            b.external_waybill_no,
+            b.sender_city,
+            b.receiver_city,
+            b.goods_weight,
+            b.order_type,
+            b.product_code,
+            u.nick_name,
+            a.waybill_id,
+            a.external_waybill_no,
+            a.fee_item_code,
+            a.fee_item_name,
+            ifnull( a.adjust_amount, a.rate_amount ) rate_amount,
+            a.adjust_amount,
+            a.remark,
+            a.create_time,
+            a.update_time,
+            a.dept_id,
+            a.del_flag,
+            a.create_by,
+            a.update_by
+        FROM
+            biz_waybill_cost_details a
+                LEFT JOIN biz_waybill_order b ON a.waybill_id = b.waybill_id
+                LEFT JOIN sys_user u ON b.user_id = u.user_id
+                LEFT JOIN sys_dept d ON a.dept_id = d.dept_id
+                </sql>
 
     <select id="selectBizWaybillCostDetailsList" parameterType="com.ruoyi.logistics.domain.BizWaybillCostDetails" resultMap="BizWaybillCostDetailsResult">
         <include refid="selectBizWaybillCostDetailsVo"/>
-        <where>  
-            <if test="waybillId != null "> and waybill_id = #{waybillId}</if>
+        <where>
+            b.order_status = 6
+            <if test="monthCode != null "> AND DATE_FORMAT( b.sign_time, '%Y.%m' ) = #{monthCode}</if>
+            <if test="deptId != null "> AND a.dept_id = #{deptId}</if>
+
+
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+
+           <!-- <if test="waybillId != null "> and waybill_id = #{waybillId}</if>
             <if test="externalWaybillNo != null  and externalWaybillNo != ''"> and external_waybill_no = #{externalWaybillNo}</if>
             <if test="feeItemCode != null  and feeItemCode != ''"> and fee_item_code = #{feeItemCode}</if>
             <if test="feeItemName != null  and feeItemName != ''"> and fee_item_name like concat('%', #{feeItemName}, '%')</if>
@@ -40,13 +89,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="rateAmount != null "> and rate_amount = #{rateAmount}</if>
             <if test="adjustAmount != null "> and adjust_amount = #{adjustAmount}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
-            <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>-->
         </where>
     </select>
+
+
+
+    <select id="selectBizWaybillCostDetailsListByWx" parameterType="com.ruoyi.logistics.domain.BizWaybillCostDetails" resultMap="BizWaybillCostDetailsResult">
+        select waybill_detail_id, waybill_id, external_waybill_no, fee_item_code, fee_item_name, fee_name, amount, rate_amount, adjust_amount, remark, create_time, update_time, dept_id, user_id, del_flag, create_by, update_by from biz_waybill_cost_details
+
+    <where>
+
+     <if test="waybillId != null "> and waybill_id = #{waybillId}</if>
+        <!--  <if test="externalWaybillNo != null  and externalWaybillNo != ''"> and external_waybill_no = #{externalWaybillNo}</if>
+         <if test="feeItemCode != null  and feeItemCode != ''"> and fee_item_code = #{feeItemCode}</if>
+         <if test="feeItemName != null  and feeItemName != ''"> and fee_item_name like concat('%', #{feeItemName}, '%')</if>
+         <if test="feeName != null  and feeName != ''"> and fee_name like concat('%', #{feeName}, '%')</if>
+         <if test="amount != null "> and amount = #{amount}</if>
+         <if test="rateAmount != null "> and rate_amount = #{rateAmount}</if>
+         <if test="adjustAmount != null "> and adjust_amount = #{adjustAmount}</if>
+         <if test="deptId != null "> and dept_id = #{deptId}</if>
+         <if test="userId != null "> and user_id = #{userId}</if>-->
+    </where>
+    </select>
     
     <select id="selectBizWaybillCostDetailsByWaybillDetailId" parameterType="Long" resultMap="BizWaybillCostDetailsResult">
         <include refid="selectBizWaybillCostDetailsVo"/>
-        where waybill_detail_id = #{waybillDetailId}
+        where a.waybill_detail_id = #{waybillDetailId}
     </select>
 
     <insert id="insertBizWaybillCostDetails" parameterType="com.ruoyi.logistics.domain.BizWaybillCostDetails" useGeneratedKeys="true" keyProperty="waybillDetailId">

jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/logistics/RptFinancialMonthSummaryMapper.xml

@@ -32,21 +32,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectRptFinancialMonthSummaryList" parameterType="com.ruoyi.logistics.domain.RptFinancialMonthSummary" resultMap="RptFinancialMonthSummaryResult">
         select a.summary_id, a.summary_month, a.payable_amount, a.transaction_count, a.status, a.create_time,
         a.update_time, a.remark, a.del_flag, a.create_by, a.update_by, a.dept_id, a.user_id, a.bw_djbh,
-        a.bw_dzfp_pdf_url, a.bw_dzfp_ofd_url, a.bw_dzfp_xml_url,b.dept_name from rpt_financial_month_summary a
-               left join  sys_dept b on  a.dept_id=b.dept_id
+        a.bw_dzfp_pdf_url, a.bw_dzfp_ofd_url, a.bw_dzfp_xml_url,d.dept_name from rpt_financial_month_summary a
+               left join  sys_dept d on  a.dept_id=d.dept_id
         <where>  
             <if test="summaryMonth != null  and summaryMonth != ''"> and a.summary_month = #{summaryMonth}</if>
             <if test="payableAmount != null  and payableAmount != ''"> and a.payable_amount = #{payableAmount}</if>
             <if test="transactionCount != null  and transactionCount != ''"> a.and transaction_count = #{transactionCount}</if>
             <if test="status != null  and status != ''"> and a.status = #{status}</if>
-            <if test="deptId != null "> and a.dept_id = #{deptId}</if>
             <if test="deptName != null "> and b.dept_name = #{deptName}</if>
-            <if test="userId != null "> and a.user_id = #{userId}</if>
             <if test="bwDjbh != null  and bwDjbh != ''"> and a.bw_djbh = #{bwDjbh}</if>
             <if test="bwDzfpPdfUrl != null  and bwDzfpPdfUrl != ''"> and a.bw_dzfp_pdf_url = #{bwDzfpPdfUrl}</if>
             <if test="bwDzfpOfdUrl != null  and bwDzfpOfdUrl != ''"> and a.bw_dzfp_ofd_url = #{bwDzfpOfdUrl}</if>
             <if test="bwDzfpXmlUrl != null  and bwDzfpXmlUrl != ''"> and a.bw_dzfp_xml_url = #{bwDzfpXmlUrl}</if>
+
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+
         </where>
+
+
     </select>
     
     <select id="selectRptFinancialMonthSummaryBySummaryId" parameterType="Long" resultMap="RptFinancialMonthSummaryResult">
@@ -139,7 +143,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sum(
                     ifnull(adjust_amount, rate_amount  )) payable_amount
         FROM
-            ( SELECT * FROM biz_waybill_order WHERE order_status = 6 AND DATE_FORMAT( sign_time, '%Y.%m' )= #{monthCode}  ) a
+            ( SELECT * FROM biz_waybill_order WHERE order_status = 6 AND DATE_FORMAT( sign_time, '%Y.%m' )= #{monthCode}  and  dept_id=#{deptId}  ) a
                 INNER JOIN biz_waybill_cost_details b ON a.external_waybill_no = b.external_waybill_no
         WHERE
             1 = 1