From 7b6741f6ccf11d0043ad94914d41a9bd23452d00 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 29 五月 2026 15:13:24 +0800
Subject: [PATCH] feat(sales): 添加销售台账审核反审功能 1.在销售台账下新增子级菜单:未审批订单和反审核数据。分别进行订单审 核和查看反审核的历史数据。 2.在销售台账页面,新增一个编辑按钮,可以对已审核的订单进行单价修 改。 3.新增反审核按钮,对已审核的订单进行反审核,反审核之后会保存当前订 单的数据快照,便于在反审核菜单进行查看。反审核的订单重新生成一条销 售订单数据进行编辑。
---
src/main/resources/mapper/warehouse/DocumentationMapper.xml | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/warehouse/DocumentationMapper.xml b/src/main/resources/mapper/warehouse/DocumentationMapper.xml
index f5f9f73..91f17a9 100644
--- a/src/main/resources/mapper/warehouse/DocumentationMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationMapper.xml
@@ -50,5 +50,38 @@
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