feat(wms): 新增财务单据查询接口并优化相关功能

- 在 IWmsFinancialDocumentService接口中新增 queryPageListDetail 方法
- 在 WmsFinancialDocumentController 中添加 ListListDetail 控制器方法
- 在 WmsFinancialDocumentMapper 接口中新增 selectVoPageDetail 方法
- 在 WmsFinancialDocumentMapper.xml 中添加新的 SQL 查询语句
- 在 WmsFinancialDocumentServiceImpl 中实现 queryPageListDetail 方法
- 更新 WmsFinancialDocumentVo 和 WmsJournalEntryVo 类以支持明细列表查询

klp-wms/src/main/java/com/klp/controller/WmsFinancialDocumentController.java

@@ -43,6 +43,11 @@ public class WmsFinancialDocumentController extends BaseController {
     public TableDataInfo<WmsFinancialDocumentVo> list(WmsFinancialDocumentBo bo, PageQuery pageQuery) {
         return iWmsFinancialDocumentService.queryPageList(bo, pageQuery);
     }
+    //新增查询接口
+    @GetMapping("/ListDetail")
+    public TableDataInfo<WmsFinancialDocumentVo> ListListDetail(WmsFinancialDocumentBo bo, PageQuery pageQuery) {
+        return iWmsFinancialDocumentService.queryPageListDetail(bo, pageQuery);
+    }
 
     /**
      * 导出财务单据列表

klp-wms/src/main/java/com/klp/domain/vo/WmsFinancialDocumentVo.java

@@ -2,6 +2,8 @@ package com.klp.domain.vo;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -72,5 +74,8 @@ public class WmsFinancialDocumentVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    //明细列表
+    private List<WmsJournalEntryVo> detailList;
+
 
 }

klp-wms/src/main/java/com/klp/domain/vo/WmsJournalEntryVo.java

@@ -26,7 +26,7 @@ public class WmsJournalEntryVo {
      * 分录ID（主键）
      */
     @ExcelProperty(value = "分录ID", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "主=键")
+    @ExcelDictFormat(readConverterExp = "主键")
     private Long entryId;
 
     /**
@@ -94,4 +94,11 @@ public class WmsJournalEntryVo {
     private String remark;
 
 
+    public Long getEntryId() {
+        return entryId;
+    }
+
+    public void setEntryId(Long entryId) {
+        this.entryId = entryId;
+    }
 }

klp-wms/src/main/java/com/klp/mapper/WmsFinancialDocumentMapper.java

@@ -1,8 +1,11 @@
 package com.klp.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.klp.domain.WmsFinancialDocument;
 import com.klp.domain.vo.WmsFinancialDocumentVo;
 import com.klp.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 财务单据Mapper接口
@@ -12,4 +15,5 @@ import com.klp.common.core.mapper.BaseMapperPlus;
  */
 public interface WmsFinancialDocumentMapper extends BaseMapperPlus<WmsFinancialDocumentMapper, WmsFinancialDocument, WmsFinancialDocumentVo> {
 
+    Page<WmsFinancialDocumentVo> selectVoPageDetail(Page<Object> build,@Param("ew") LambdaQueryWrapper<WmsFinancialDocument> lqw);
 }

klp-wms/src/main/java/com/klp/service/IWmsFinancialDocumentService.java

@@ -46,4 +46,6 @@ public interface IWmsFinancialDocumentService {
      * 校验并批量删除财务单据信息
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    TableDataInfo<WmsFinancialDocumentVo> queryPageListDetail(WmsFinancialDocumentBo bo, PageQuery pageQuery);
 }

klp-wms/src/main/java/com/klp/service/impl/WmsFinancialDocumentServiceImpl.java

@@ -48,7 +48,15 @@ public class WmsFinancialDocumentServiceImpl implements IWmsFinancialDocumentSer
         Page<WmsFinancialDocumentVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
-
+    /**
+     * 查询财务单据列表携带明细
+     */
+    @Override
+    public TableDataInfo<WmsFinancialDocumentVo> queryPageListDetail(WmsFinancialDocumentBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<WmsFinancialDocument> lqw = buildQueryWrapper(bo);
+        Page<WmsFinancialDocumentVo> result = baseMapper.selectVoPageDetail(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
     /**
      * 查询财务单据列表
      */

klp-wms/src/main/resources/mapper/klp/WmsFinancialDocumentMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.klp.mapper.WmsFinancialDocumentMapper">
 
     <resultMap type="com.klp.domain.WmsFinancialDocument" id="WmsFinancialDocumentResult">
@@ -20,5 +20,56 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
     </resultMap>
 
+    <!-- 新增用于映射 WmsFinancialDocumentVo 的 ResultMap -->
+    <resultMap id="WmsFinancialDocumentVoResultMap" type="com.klp.domain.vo.WmsFinancialDocumentVo">
+        <id property="documentId" column="document_id"/>
+        <result property="docNo" column="doc_no"/>
+        <result property="docType" column="doc_type"/>
+        <result property="docDate" column="doc_date"/>
+        <result property="amount" column="amount"/>
+        <result property="relatedOrderId" column="related_order_id"/>
+        <result property="status" column="status"/>
+        <result property="remark" column="remark"/>
+        <collection property="detailList" ofType="com.klp.domain.vo.WmsJournalEntryVo">
+            <id property="entryId" column="entry_id"/>
+            <result property="voucherNo" column="voucher_no"/>
+            <result property="lineNo" column="line_no"/>
+            <result property="entryDate" column="entry_date"/>
+            <result property="accountId" column="account_id"/>
+            <result property="debitAmount" column="debit_amount"/>
+            <result property="creditAmount" column="credit_amount"/>
+            <result property="referenceNo" column="reference_no"/>
+            <result property="relatedOrderId" column="je_related_order_id"/>
+            <result property="status" column="je_status"/>
+            <result property="remark" column="je_remark"/>
+        </collection>
+    </resultMap>
+
+    <!-- 修改 selectVoPageDetail 查询以使用新的 ResultMap -->
+    <select id="selectVoPageDetail" resultMap="WmsFinancialDocumentVoResultMap">
+        SELECT
+            wfd.document_id,
+            wfd.doc_no,
+            wfd.doc_type,
+            wfd.doc_date,
+            wfd.amount,
+            wfd.related_order_id,
+            wfd.status,
+            wfd.remark,
+            wje.entry_id as entry_id,
+            wje.voucher_no as voucher_no,
+            wje.line_no as line_no,
+            wje.entry_date as entry_date,
+            wje.account_id as account_id,
+            wje.debit_amount as debit_amount,
+            wje.credit_amount as credit_amount,
+            wje.reference_no as reference_no,
+            wje.related_order_id as je_related_order_id,
+            wje.status as je_status,
+            wje.remark as je_remark
+        FROM wms_financial_document wfd
+                 LEFT JOIN wms_journal_entry wje ON wfd.document_id = wje.document_id
+            ${ew.customSqlSegment()}
+    </select>
 
 </mapper>