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/basic/ProductModelMapper.xml | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index 317f5d9..47d5cd9 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -106,5 +106,39 @@
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,
+ pr.id as routeId,
+ pr.process_route_name as routeName,
+ pm.create_time as createTime,
+ pm.update_time as updateTime
+ from product_model pm
+ 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},'%')
+ </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