From c145f0e2c2a4a301f11c8b4c132f50c8a56bec62 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 15 一月 2026 17:55:51 +0800
Subject: [PATCH] 生产订单重构
---
src/main/resources/mapper/production/ProductOrderMapper.xml | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index d4ffc40..7fe84fa 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -14,11 +14,17 @@
<result property="updateTime" column="update_time"/>
</resultMap>
<select id="pageProductOrder" resultType="com.ruoyi.production.dto.ProductOrderDto">
- select po.*,sl.sales_contract_no,sl.customer_name,slp.product_category,slp.specification_model
+ select po.*,
+ sl.sales_contract_no,
+ sl.customer_name,
+ slp.product_category,
+ slp.specification_model,
+ ppr.process_route_code,
+ ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus
from product_order po
left join sales_ledger sl on po.sales_ledger_id = sl.id
left join sales_ledger_product slp on po.product_model_id = slp.id
- left join process_route pr on po.route_id = pr.id
+ left join product_process_route ppr on po.id = ppr.product_order_id
<where>
<if test="c.npsNo != null and c.npsNo != ''">
and po.nps_no like concat('%',#{c.npsNo},'%')
@@ -38,17 +44,23 @@
</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
+ 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
+ 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}
+ </select>
</mapper>
--
Gitblit v1.9.3