From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml | 83 +++++++++++++++++++++++++++++------------
1 files changed, 59 insertions(+), 24 deletions(-)
diff --git a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml b/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
index 22e1e8e..18b2082 100644
--- a/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml
@@ -5,20 +5,20 @@
<mapper namespace="com.ruoyi.warehouse.mapper.DocumentationBorrowManagementMapper">
<!-- <resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.DocumentationBorrowManagement">-->
-<!-- <id property="id" column="id" jdbcType="BIGINT"/>-->
-<!-- <result property="documentationId" column="documentation_id" jdbcType="BIGINT"/>-->
-<!-- <result property="borrowerId" column="borrower_id" jdbcType="BIGINT"/>-->
-<!-- <result property="borrowPurpose" column="borrow_purpose" jdbcType="VARCHAR"/>-->
-<!-- <result property="borrowDate" column="borrow_date" jdbcType="TIMESTAMP"/>-->
-<!-- <result property="dueReturnDate" column="due_return_date" jdbcType="TIMESTAMP"/>-->
-<!-- <result property="returnDate" column="return_date" jdbcType="TIMESTAMP"/>-->
-<!-- <result property="borrowStatus" column="borrow_status" jdbcType="VARCHAR"/>-->
-<!-- <result property="remark" column="remark" jdbcType="VARCHAR"/>-->
-<!-- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>-->
-<!-- <result property="createUser" column="create_user" jdbcType="BIGINT"/>-->
-<!-- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>-->
-<!-- <result property="updateUser" column="update_user" jdbcType="BIGINT"/>-->
-<!-- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>-->
+<!-- <id property="id" column="id"/>-->
+<!-- <result property="documentationId" column="documentation_id" />-->
+<!-- <result property="borrowerId" column="borrower_id" />-->
+<!-- <result property="borrowPurpose" column="borrow_purpose" />-->
+<!-- <result property="borrowDate" column="borrow_date"/>-->
+<!-- <result property="dueReturnDate" column="due_return_date" />-->
+<!-- <result property="returnDate" column="return_date"/>-->
+<!-- <result property="borrowStatus" column="borrow_status" />-->
+<!-- <result property="remark" column="remark"/>-->
+<!-- <result property="createTime" column="create_time"/>-->
+<!-- <result property="createUser" column="create_user"/>-->
+<!-- <result property="updateTime" column="update_time"/>-->
+<!-- <result property="updateUser" column="update_user"/>-->
+<!-- <result property="tenantId" column="tenant_id"/>-->
<!-- </resultMap>-->
<!-- <sql id="Base_Column_List">-->
@@ -28,8 +28,10 @@
<!-- create_time,create_user,update_time,-->
<!-- update_user,tenant_id-->
<!-- </sql>-->
- <select id="listPage" resultType="com.ruoyi.warehouse.pojo.DocumentationBorrowManagement">
- select * from documentation_borrow_management
+ <select id="listPage" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
+ select dbm.*,doc.doc_name
+ from documentation_borrow_management dbm
+ LEFT JOIN documentation doc on doc.id = dbm.documentation_id
where 1=1
<if test="documentationBorrowManagement.borrowStatus != null">
and borrow_status = #{documentationBorrowManagement.borrowStatus}
@@ -37,17 +39,50 @@
<if test="documentationBorrowManagement.documentationId != null">
and documentation_id = #{documentationBorrowManagement.documentationId}
</if>
- <if test="documentationBorrowManagement.borrowerId != null">
- and borrower_id = #{documentationBorrowManagement.borrowerId}
+ <if test="documentationBorrowManagement.borrower != null">
+ and borrower like concat('%',#{documentationBorrowManagement.borrower},'%')
</if>
- <if test="documentationBorrowManagement.borrowPurpose != null">
- and borrow_purpose = #{documentationBorrowManagement.borrowPurpose}
+ <if test="documentationBorrowManagement.returner != null">
+ and returner like concat('%',#{documentationBorrowManagement.returner},'%')
</if>
- <if test="documentationBorrowManagement.borrowDate != null">
- and borrow_date = #{documentationBorrowManagement.borrowDate}
+ <if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''">
+ and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d')
</if>
- <if test="documentationBorrowManagement.dueReturnDate != null">
- and due_return_date = #{documentationBorrowManagement.dueReturnDate}
+ <if test="documentationBorrowManagement.entryDateEnd != null and documentationBorrowManagement.entryDateEnd != ''">
+ and borrow_date <= DATE_FORMAT(#{documentationBorrowManagement.entryDateEnd},'%Y-%m-%d')
</if>
</select>
+ <select id="export" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
+ select dbm.*,doc.doc_name
+ from documentation_borrow_management dbm
+ LEFT JOIN documentation doc on doc.id = dbm.documentation_id
+ where 1=1
+ <if test="documentationBorrowManagement.borrowStatus != null">
+ and borrow_status = #{documentationBorrowManagement.borrowStatus}
+ </if>
+ <if test="documentationBorrowManagement.documentationId != null">
+ and documentation_id = #{documentationBorrowManagement.documentationId}
+ </if>
+ <if test="documentationBorrowManagement.borrower != null">
+ and borrower like concat('%',#{documentationBorrowManagement.borrower},'%')
+ </if>
+ <if test="documentationBorrowManagement.returner != null">
+ and returner like concat('%',#{documentationBorrowManagement.returner},'%')
+ </if>
+ <if test="documentationBorrowManagement.entryDateStart != null and documentationBorrowManagement.entryDateStart != ''">
+ and borrow_date >= DATE_FORMAT(#{documentationBorrowManagement.entryDateStart},'%Y-%m-%d')
+ </if>
+ <if test="documentationBorrowManagement.entryDateEnd != null and documentationBorrowManagement.entryDateEnd != ''">
+ and borrow_date <= DATE_FORMAT(#{documentationBorrowManagement.entryDateEnd},'%Y-%m-%d')
+ </if>
+ </select>
+ <select id="list" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
+ select dbm.*,doc.doc_name
+ from documentation_borrow_management dbm
+ LEFT JOIN documentation doc on doc.id = dbm.documentation_id
+ <if test="ew != null">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+
</mapper>
--
Gitblit v1.9.3