From 7b2233d1dab53574facc66b3bebffcd8ca5919de Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 21 三月 2026 14:27:19 +0800
Subject: [PATCH] yys 1.已退货完毕的出库单号不要展示在关联出库单中 2.退货管理唯一处理 3.生产订单-库存数量回显 4.发货管理回显退货数量 5.发货增加详情接口 6.生产核算清理脏数据 7.生产报工-删除生产报工记录报错 8.筛选客户名称数据展示有误
---
src/main/resources/mapper/basic/ProductModelMapper.xml | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 317f5d9..9768e8f 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -106,5 +106,34 @@
left join product p on p.id = pm.product_id
order by p.id,pm.id desc
</select>
+ <select id="listPage" resultType="com.ruoyi.basic.dto.ProductAndModelDto">
+ select pm.id as id,
+ p.id as productId,
+ p.product_name as productName ,
+ pm.model as model,
+ pm.unit as unit,
+ pm.drawing_number as drawingNumber,
+ pm.product_type as productType
+ from product_model pm
+ left join product p on p.id = pm.product_id
+ <where>
+ <if test="req.productName != null and req.productName != ''">
+ and p.product_name like concat('%',#{req.productName},'%')
+ </if>
+ <if test="req.model != null and req.model != ''">
+ and pm.model like concat('%',#{req.model},'%')
+ </if>
+ <if test="req.unit != null and req.unit != ''">
+ and pm.unit like concat('%',#{req.unit},'%')
+ </if>
+ <if test="req.drawingNumber != null and req.drawingNumber != ''">
+ and pm.drawing_number like concat('%',#{req.drawingNumber},'%')
+ </if>
+ <if test="req.productType != null and req.productType != ''">
+ and pm.product_type = #{req.productType}
+ </if>
+ </where>
+ order by pm.id desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3