From a97eb69a7233fc36a794832210fb1b0de037f2bb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 15 四月 2026 16:39:53 +0800
Subject: [PATCH] fix:生产核算-对应工序
---
src/main/resources/mapper/production/ProductOrderMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index f781da3..8a90f60 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -16,6 +16,7 @@
<result property="manufacturingTeam" column="manufacturing_team"/>
<result property="isEnd" column="is_end"/>
</resultMap>
+
<select id="pageProductOrder" resultType="com.ruoyi.production.dto.ProductOrderDto">
select po.*,
sl.sales_contract_no,
@@ -25,6 +26,7 @@
pm.unit,
pm.uid_no,
ppr.process_route_code,
+ pb.id as bomId,
pb.bom_no,
ROUND(po.complete_quantity / po.quantity * 100, 2) AS completionStatus,
DATEDIFF(sl.delivery_date, CURDATE()) AS delivery_days_diff,
@@ -59,10 +61,10 @@
and sl.customer_name like concat('%',#{c.customerName},'%')
</if>
<if test="c.productCategory != null and c.productCategory != ''">
- and slp.product_category like concat('%',#{c.productCategory},'%')
+ and p.product_name like concat('%',#{c.productCategory},'%')
</if>
<if test="c.specificationModel != null and c.specificationModel != ''">
- and slp.specification_model like concat('%',#{c.specificationModel},'%')
+ and pm.model like concat('%',#{c.specificationModel},'%')
</if>
<if test="c.startTime != null and c.endTime != null">
and po.create_time between #{c.startTime} and #{c.endTime}
@@ -85,6 +87,7 @@
p.product_name,
pp.name as process_name,
pm.product_id,
+ pm.uid_no,
pm.model
from
product_structure ps
--
Gitblit v1.9.3