From deff787716b00b4f491de429ba092915d7fa1a9e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 27 三月 2026 13:07:05 +0800
Subject: [PATCH] 过程检数据查询+原有生产订单表增加产品规格id
---
src/main/resources/mapper/production/ProductOrderMapper.xml | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index ed6c187..4cd3372 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -49,17 +49,12 @@
pb.bom_no AS bomNo,
ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus,
pms.model,
- pms.material_code AS materialCode
+ pms.material_code AS materialCode,
+ pms.id AS productId
FROM product_order po
LEFT JOIN process_route pr ON po.route_id = pr.id
LEFT JOIN product_bom pb ON pr.bom_id = pb.id
- LEFT JOIN (
- SELECT product_order_id, MIN(production_plan_id) AS production_plan_id
- FROM product_order_plan
- GROUP BY product_order_id
- ) pop ON po.id = pop.product_order_id
- LEFT JOIN production_plan pp ON pop.production_plan_id = pp.id
- LEFT JOIN product_material_sku pms ON pms.id = pp.product_material_sku_id
+ LEFT JOIN product_material_sku pms ON pms.id = po.product_material_sku_id
LEFT JOIN product_material pm ON pm.id = pms.product_id
<where>
<if test="c.npsNo != null and c.npsNo != ''">
@@ -68,9 +63,23 @@
<if test="c.startTime != null and c.endTime != null">
AND po.create_time BETWEEN #{c.startTime} AND #{c.endTime}
</if>
+ <if test="c.status != null">
+ AND po.status = #{c.status}
+ </if>
+ <if test="c.productName != null and c.productName != ''">
+ AND pm.product_name LIKE CONCAT('%', #{c.productName}, '%')
+ </if>
+ <if test="c.materialCode != null and c.materialCode != ''">
+ AND pms.material_code LIKE CONCAT('%', #{c.materialCode}, '%')
+ </if>
+ <if test="c.model != null and c.model != ''">
+ AND pms.model LIKE CONCAT('%', #{c.model}, '%')
+ </if>
+ <if test="c.strength != null and c.strength != ''">
+ AND po.strength = #{c.strength}
+ </if>
</where>
</select>
-
<select id="listProcessRoute" resultType="com.ruoyi.production.pojo.ProcessRoute">
select pr.*
from process_route pr
--
Gitblit v1.9.3