Explorar el Código

计量-材料关联WBS没判断是否删除

qianxb hace 11 meses
padre
commit
bb2a4abc51

+ 1 - 1
blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/ContractMaterialMapper.xml

@@ -61,7 +61,7 @@
                (select form_name from s_contract_inventory_form cif where cif.id = ifm.contract_form_id) as formName,
                (select material_name from s_contract_material scm where scm.id = ifm.contract_material_id) as materialName,
                if((select count(1) from s_contract_material_adjust_detail mad where mad.contract_form_id = ifm.contract_form_id
-                                    and mad.contract_material_id = #{materialId}) > 0,1,0) as isQuote
+                                    and mad.is_deleted = 0 and mad.contract_material_id = #{materialId}) > 0,1,0) as isQuote
         from s_inventory_form_material ifm
         where  is_deleted = 0 and contract_id = #{contractId} and contract_material_id = #{materialId}
     </select>