From ac6db1c4fddcb89c9668e34a35f023817a59f838 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 01 四月 2026 17:54:44 +0800
Subject: [PATCH] yys 1.产品导入新增excel错误提示 2.bom导入新增excel错误提示 3.仓储物流增加库位字段 4.修改发货出库-新增库位 5.修改采购入库审核-新增库位 6.生产入库-新增库位,审核

---
 src/main/resources/mapper/basic/ProductModelMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 9768e8f..89954e5 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -113,9 +113,12 @@
                pm.model as  model,
                pm.unit as unit,
                pm.drawing_number as drawingNumber,
-               pm.product_type as productType
+               pm.product_type as productType,
+               pr.id as routeId,
+               pr.process_route_name as routeName
         from product_model pm
-                 left join product p on p.id = pm.product_id
+                left join product p on p.id = pm.product_id
+                left join process_route pr on pr.id = pm.route_id
         <where>
             <if test="req.productName != null and req.productName != ''">
                 and p.product_name like concat('%',#{req.productName},'%')

--
Gitblit v1.9.3