[feat]新增del_flag 查询条件 0为正常 1为删除

ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderChildMapper.xml

@@ -61,11 +61,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectSysSalesOrderChildList" parameterType="SysSalesOrderChild" resultMap="SysSalesOrderChildResult">
         <include refid="selectSysSalesOrderChild"/>
         <where>
+            a.del_flag = '0'
             <if test="quoteId != null and quoteId !='' "> and a.quoteId = #{quoteId}</if>
             <if test="materialId != null "> and a.materialId = #{materialId}</if>
             <if test="materialCode != null  and materialCode != ''"> and a.materialCode like concat('%', #{materialCode}, '%')</if>
             <if test="materialName != null  and materialName != ''"> and a.materialName like concat('%', #{materialName}, '%')</if>
         </where>
+        order by a.id desc
     </select>
     <select id="selectSysSalesOrderChildById" parameterType="Long" resultMap="SysSalesOrderChildResult">
         <include refid="selectSysSalesOrderChild"/>

ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml

@@ -108,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) as p
         on s.instance_type = p.dict_value
         <where>
+               s.del_flag = '0'
             <if test="createBy != null and createBy !=''"> and s.create_by = #{createBy}</if>
             <if test="salesOrderCode != null  and salesOrderCode != ''"> and s.sales_order_code like concat('%', #{salesOrderCode}, '%')</if>
             <if test="salesOrderNumber != null  and salesOrderNumber != ''"> and s.sales_order_number like concat('%', #{salesOrderNumber}, '%')</if>