From 4d99e718536ac77dff26dde8da7a59cdc9b52de8 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 10:13:57 +0800
Subject: [PATCH] fix:1.生产报工优化
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 8e5f86d..9dc639f 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -21,11 +21,13 @@
<select id="pageProductWorkOrder" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
SELECT
pwo.*,
+ po.batch_no as batchNo,
pp.id as processId,
pp.NAME as processName,
pp.qualified_rate as processQualifiedRate,
pm.model,
pm.unit,
+ pm.material_code as materialCode,
p.product_name AS productName,
p.id AS productId,
po.nps_no AS productOrderNpsNo,
@@ -56,7 +58,10 @@
<if test="c.productOrderNpsNo != null and c.productOrderNpsNo != ''">
and po.nps_no like concat('%',#{c.productOrderNpsNo},'%')
</if>
- order by pwo.priority, pwo.id desc, ppri.drag_sort
+ <if test="c.processName != null and c.processName != ''">
+ and pp.NAME like concat('%',#{c.processName},'%')
+ </if>
+ order by pwo.priority asc, po.id desc, ppri.drag_sort asc
</select>
<select id="getByProductOrderId" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
--
Gitblit v1.9.3