From 1bbe6f787d58b768dce5370aa4e0d242c5e4b62d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 21 四月 2026 17:26:53 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
index 13f0ad7..ec8554b 100644
--- a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
@@ -3,23 +3,27 @@
<mapper namespace="com.ruoyi.production.mapper.ProductProcessRouteItemMapper">
- <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProductProcessRouteItem">
+ <resultMap id="basicMap" type="com.ruoyi.production2.pojo.ProductProcessRouteItem">
<id property="id" column="id"/>
<result property="productModelId" column="product_model_id"/>
<result property="tenantId" column="tenant_id"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
- <select id="listItem" resultType="com.ruoyi.production.dto.ProductProcessRouteItemDto">
+ <select id="listItem" resultType="com.ruoyi.production2.dto.ProductProcessRouteItemDto">
select ppri.*,
pp.name as process_name,
+ pp.is_inbound as inbound,
+ pp.is_report_work as reportWork,
pm.model,
pm.unit,
- p.product_name
+ p.product_name,
+ case when pwo.complete_quantity>0 then true else false end as is_complete
from product_process_route_item ppri
left join product_model pm on ppri.product_model_id = pm.id
left join product p on pm.product_id = p.id
left join product_process pp on pp.id = ppri.process_id
+ left join product_work_order pwo on pwo.product_process_route_item_id = ppri.id
where ppri.product_order_id = #{orderId}
order by ppri.drag_sort
</select>
--
Gitblit v1.9.3