From fec59214c5b08c24d390cade902d64c65dff90da Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 14 五月 2026 16:47:38 +0800
Subject: [PATCH] feat(生产工单): 修正成品名称返回

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

diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 317f5d9..73e5df9 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -9,7 +9,6 @@
         <result column="product_id" property="productId" />
         <result column="model" property="model" />
         <result column="unit" property="unit" />
-        <result column="speculative_trading_name" property="speculativeTradingName" />
         <result column="tenant_id" property="tenantId" />
         <result column="product_name" property="productName" />
         <result column="product_id" property="productId" />
@@ -106,5 +105,30 @@
         left join product p on p.id = pm.product_id
         order by p.id,pm.id desc
     </select>
+    <select id="selectModelListByProductIds" resultType="com.ruoyi.basic.pojo.ProductModel">
+        WITH RECURSIVE tree AS (
+        SELECT id
+        FROM product
+        WHERE id in <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
 
+        UNION ALL
+
+        SELECT p.id
+        FROM product p
+        INNER JOIN tree t ON p.parent_id = t.id
+        )
+        SELECT t1.*
+        FROM product_model t1
+        INNER JOIN product t2 ON t1.product_id = t2.id
+        INNER JOIN tree t ON t2.id = t.id;
+    </select>
+    <select id="selectOldProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
+        select product_model.*,product.product_name
+        from product_model left join
+            product on product_model.product_id = product.id
+        where product_model.model = #{model}
+        and product.product_name = #{productName}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3