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/DocumentationMapper.xml | 119 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 71 insertions(+), 48 deletions(-)
diff --git a/src/main/resources/mapper/warehouse/DocumentationMapper.xml b/src/main/resources/mapper/warehouse/DocumentationMapper.xml
index 533002a..91f17a9 100644
--- a/src/main/resources/mapper/warehouse/DocumentationMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationMapper.xml
@@ -4,61 +4,84 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.warehouse.mapper.DocumentationMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.warehouse.pojo.Documentation">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="categoryName" column="category_name" jdbcType="VARCHAR"/>
- <result property="docName" column="doc_name" jdbcType="VARCHAR"/>
- <result property="docNumber" column="doc_number" jdbcType="BIGINT"/>
- <result property="year" column="year" jdbcType="BIGINT"/>
- <result property="responsiblePerson" column="responsible_person" jdbcType="VARCHAR"/>
- <result property="warehouseGoodsShelvesRowcolId" column="warehouse_goods_shelves_rowcol_id" jdbcType="BIGINT"/>
- <result property="docDate" column="doc_date" jdbcType="TIMESTAMP"/>
- <result property="retentionPeriod" column="retention_period" jdbcType="BIGINT"/>
- <result property="securityLevel" column="security_level" jdbcType="VARCHAR"/>
- <result property="copyCount" column="copy_count" jdbcType="BIGINT"/>
- <result property="pageCount" column="page_count" jdbcType="BIGINT"/>
- <result property="docCategory" column="doc_category" jdbcType="VARCHAR"/>
- <result property="docType" column="doc_type" jdbcType="VARCHAR"/>
- <result property="urgencyLevel" column="urgency_level" jdbcType="VARCHAR"/>
- <result property="docStatus" column="doc_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="VARCHAR"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="VARCHAR"/>
- <result property="tenantId" column="tenant_id" jdbcType="BIGINT"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id,category_name,doc_name,
- doc_number,year,responsible_person,
- warehouse_goods_shelves_rowcol_id,doc_date,retention_period,
- security_level,copy_count,page_count,
- doc_category,doc_type,urgency_level,
- doc_status,remark,create_time,
- create_user,update_time,update_user,
- tenant_id
- </sql>
- <select id="listPage" resultType="com.ruoyi.warehouse.pojo.Documentation">
- select * from documentation
+ <select id="listPage" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
+ SELECT
+ doc.*,
+ dc.category,
+ CONCAT(
+ w.warehouse_name, '-',
+ wgs.name, '-',
+ wgsr.row, '灞�-',
+ wgsr.col, '鍒�'
+ ) AS location_info -- 鍚堝苟鍚庣殑瀛楁鍚�
+ FROM documentation doc
+ LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
+ LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id
+ LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
+ LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
where 1=1
- <if test="documentation.categoryName != null">
- and category_name = #{documentation.categoryName}
+ <if test="documentation.documentClassificationId != null">
+ and doc.document_classification_id = #{documentation.documentClassificationId}
</if>
<if test="documentation.docName != null">
- and doc_name = #{documentation.docName}
+ and doc.doc_name = #{documentation.docName}
</if>
<if test="documentation.docNumber != null">
- and doc_number = #{documentation.docNumber}
+ and doc.doc_number = #{documentation.docNumber}
</if>
- <if test="documentation.warehouse_goods_shelves_rowcol_id != null">
- and warehouse_goods_shelves_rowcol_id = #{documentation.warehouseGoodsShelvesRowcolId}
+ <if test="documentation.id != null">
+ and doc.id = #{documentation.id}
</if>
</select>
- <select id="list" resultType="com.ruoyi.warehouse.pojo.Documentation">
- select * from documentation t1
- left join warehouse_goods_shelves_rowcol t2 on t1.warehouse_goods_shelves_rowcol_id = t2.id
- left join warehouse_goods_shelves t3 on t2.warehouse_goods_shelves_id = t3.id
- left join warehouse t4 on t3.warehouse_id = t4.id
+ <select id="listByDocumentClassificationId" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
+ SELECT
+ doc.*,
+ dc.category,
+ CONCAT(
+ w.warehouse_name, '-',
+ wgs.name, '-',
+ wgsr.row, '灞�-',
+ wgsr.col, '鍒�'
+ ) AS location_info -- 鍚堝苟鍚庣殑瀛楁鍚�
+ FROM documentation doc
+ LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
+ LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id
+ LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
+ LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
+ where doc.document_classification_id = #{documentClassificationId}
</select>
+ <select id="list" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
+ SELECT
+ doc.*,
+ dc.category,
+ CONCAT(
+ w.warehouse_name, '-',
+ wgs.name, '-',
+ wgsr.row, '灞�-',
+ wgsr.col, '鍒�'
+ ) AS location_info -- 鍚堝苟鍚庣殑瀛楁鍚�
+ FROM documentation doc
+ LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
+ LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id
+ LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
+ LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
+ </select>
+ <select id="listBywarehouseGoodsShelvesRowcolId" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
+ SELECT
+ doc.*,
+ dc.category,
+ CONCAT(
+ w.warehouse_name, '-',
+ wgs.name, '-',
+ wgsr.row, '灞�-',
+ wgsr.col, '鍒�'
+ ) AS location_info -- 鍚堝苟鍚庣殑瀛楁鍚�
+ FROM documentation doc
+ LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
+ LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_id
+ LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
+ LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
+ where doc.warehouse_goods_shelves_rowcol_id = #{warehouseGoodsShelvesRowcolId}
+ </select>
+
</mapper>
--
Gitblit v1.9.3