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/production/ProductStructureMapper.xml | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductStructureMapper.xml b/src/main/resources/mapper/production/ProductStructureMapper.xml
index 5cd2deb..e4a0795 100644
--- a/src/main/resources/mapper/production/ProductStructureMapper.xml
+++ b/src/main/resources/mapper/production/ProductStructureMapper.xml
@@ -9,22 +9,35 @@
<result property="unitQuantity" column="unit_quantity"/>
<result property="demandedQuantity" column="demanded_quantity"/>
<result property="unit" column="unit"/>
- <result property="diskQuantity" column="disk_quantity"/>
<result property="tenantId" column="tenant_id"/>
</resultMap>
-
-
-
- <select id="listByproductModelId" resultType="com.ruoyi.production.dto.ProductStructureDto">
+ <select id="listBybomId" resultType="com.ruoyi.production.dto.ProductStructureDto">
select ps.*,
- pm.speculative_trading_name ,
- pp.name as process_name,
- pm.product_id
+ p.product_name,
+ pp.name as process_name,
+ pm.product_id,
+ pm.model
from
- product_structure ps
- left join product_model pm on ps.product_model_id = pm.id
- left join product_process pp on ps.process_id = pp.id
- where pm.id = #{productId}
+ product_structure ps
+ left join product_model pm on ps.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ left join product_process pp on ps.process_id = pp.id
+ where ps.bom_id = #{bomId}
+ order by ps.id
+ </select>
+ <select id="listBybomAndProcess" resultType="com.ruoyi.production.dto.ProductStructureDto">
+ select ps.*,
+ p.product_name,
+ pp.name as process_name,
+ pm.product_id,
+ pm.model
+ from
+ product_structure ps
+ left join product_model pm on ps.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
+ left join product_process pp on ps.process_id = pp.id
+ where ps.bom_id = #{bomId}
+ and ps.process_id=#{processId}
order by ps.id
</select>
</mapper>
--
Gitblit v1.9.3