From f2c7576cbd050824ec78233483e06fc375382bfb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 四月 2026 17:04:03 +0800
Subject: [PATCH] yys 1.客户档案导入-维护人,维护时间默认当前 2.销售报价审核非必填,产品选择方式也要改 3.销售产品增加物料号字段 4.产品维护增加录入时间,修改时间 6.发货审核不需要了 7.BI的生产核算分析不要了,增加生产订单当前工序 3.库存导入模板规格改成图纸编号,产品名称可以为空,加个库位 4.库存管理外购改为标准件 5.bom产品唯一 6.产品根据bom计算子项数量(只统计二级)

---
 src/main/resources/mapper/production/ProductProcessRouteMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductProcessRouteMapper.xml b/src/main/resources/mapper/production/ProductProcessRouteMapper.xml
index dd4809f..5d0f63a 100644
--- a/src/main/resources/mapper/production/ProductProcessRouteMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessRouteMapper.xml
@@ -15,12 +15,15 @@
         <result column="product_order_id" property="productOrderId"/>
     </resultMap>
     <select id="listMain" resultType="com.ruoyi.production.dto.ProcessRouteDto">
-        select ppr.*, p.product_name, pm.product_id, pm.model, pb.bom_no
+        select ppr.*, p.product_name, pm.product_id, pm.model, pb.bom_no,pm.drawing_number,pp.name as processName
         from product_process_route ppr
+                 left join product_process_route_item ppri on ppr.id = ppri.product_route_id
+                 left join product_process pp on pp.id = ppri.process_id
                  left join product_bom pb on ppr.bom_id = pb.id
                  left join product_model pm on ppr.product_model_id = pm.id
                  left join product p on pm.product_id = p.id
         where ppr.product_order_id = #{orderId}
+        group by ppri.id
     </select>
 
 </mapper>

--
Gitblit v1.9.3