From 5cb362d364fa8582b2090e0d81585f4a7e9f19a1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 06 二月 2026 13:33:46 +0800
Subject: [PATCH] Merge branch 'dev_New' into jtwy
---
src/main/resources/mapper/production/ProductOrderMapper.xml | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index 4837e64..ab4e290 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -17,8 +17,10 @@
select po.*,
sl.sales_contract_no,
sl.customer_name,
- slp.product_category,
- slp.specification_model,
+ p.product_name as product_category,
+ pm.model as specification_model,
+ pm.unit,
+ pm.drawing_number,
ppr.process_route_code,
pb.bom_no,
ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus,
@@ -38,6 +40,8 @@
FROM shipping_info
GROUP BY sales_ledger_id
) shipping_status_counts ON sl.id = shipping_status_counts.sales_ledger_id
+ left join product_model pm on po.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
left join sales_ledger_product slp on po.sale_ledger_product_id = slp.id
left join product_process_route ppr on po.id = ppr.product_order_id
left join product_bom pb on pb.id = ppr.bom_id
@@ -62,23 +66,11 @@
</if>
</where>
</select>
- <select id="productMainByOrderId" resultType="com.ruoyi.production.dto.ProductOrderDto">
- select po.*,
- pwo.work_order_no,
- pwo.report_work,
- pwo.status,
- pwo.quantity,
- pwo.plan_quantity
- from product_order po
- left join product_work_order pwo on po.id = pwo.product_order_id
- where po.id = #{c.id}
- </select>
<select id="listProcessRoute" resultType="com.ruoyi.production.pojo.ProcessRoute">
select pr.*
from process_route pr
left join product_model pm on pr.product_model_id = pm.id
- left join sales_ledger_product slp on pm.id = slp.product_model_id
- where slp.id = #{productModelId}
+ where pm.id = #{productModelId}
</select>
<select id="listProcessBom" resultType="com.ruoyi.production.dto.ProductStructureDto">
select ps.id,
@@ -88,14 +80,17 @@
ps.unit_quantity * po.quantity as demandedQuantity,
ps.unit,
p.product_name,
+ pm.drawing_number,
pp.name as process_name,
pm.product_id,
- pm.model
+ pm.model,
+ pb.bom_no
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
+ left join product_bom pb on ps.bom_id = pb.id
left join product_process_route ppr on ps.bom_id = ppr.bom_id
left join product_order po on po.id = ppr.product_order_id
where ppr.product_order_id = #{orderId}
--
Gitblit v1.9.3