From c1e275e89d56adfc3d1d6ae20be254953a566059 Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Thu, 7 Mar 2024 15:16:26 +0800
Subject: [PATCH] '20240307'

---
 ruoyi-system/src/main/resources/mapper/quote/QuoteMapper.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ruoyi-system/src/main/resources/mapper/quote/QuoteMapper.xml b/ruoyi-system/src/main/resources/mapper/quote/QuoteMapper.xml
index e1f3c78..c350b2c 100644
--- a/ruoyi-system/src/main/resources/mapper/quote/QuoteMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/quote/QuoteMapper.xml
@@ -28,11 +28,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             (select a.cost_material_id,sum((isnull(a.cost_cl_qty,0)+isnull(a.cost_cl_qty_2,0))*b.material_price) price
             from c_material_cost a
             left join c_yl_material b on a.cost_cl_id=b.material_no
+            where b.material_state='0'
             group by a.cost_material_id
             )b on a.material_id=b.cost_material_id
         left join c_material_type_factory c on a.material_type_id = c.type_no
+        left join c_material_type e on e.type_no = c.type_no
         left join c_factory d on d.factory_no = c.factory_id
         <where>
+            and a.material_state='0' and e.type_state ='0'
             <if test="precMaterialName != null  and precMaterialName != ''"> and a.material_xingh like concat('', #{precMaterialName}, '%')</if>
             <if test="vagueMaterialName != null  and vagueMaterialName != ''"> and a.material_xingh like concat('%', #{vagueMaterialName}, '%')</if>
             <if test="vagueModel != null  and vagueModel != ''"> and a.material_guig like concat('%', #{vagueModel}, '%')</if>