From e0cfecb2b11b3d6ac91394e71c689a30356ead28 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 20 五月 2026 09:29:28 +0800
Subject: [PATCH] fix:1.生产按照特定工序更改 2.库存按照型号,工序类别,电压进行筛选 3.销售页面展示电压,类别 4.生产入库按照电压入库

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

diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index e12b63c..317f5d9 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -97,5 +97,14 @@
 
         ORDER BY pm.id DESC
     </select>
+    <select id="getProductAndModelList" resultType="java.util.Map">
+        select p.id as id,
+               pm.id as modelId,
+               p.product_name as productName ,
+               pm.model as  model
+        from product_model pm
+        left join product p on p.id = pm.product_id
+        order by p.id,pm.id desc
+    </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3