diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java index dcc0f1fd..5226092b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/service/impl/ErpMaterialServiceImpl.java @@ -217,6 +217,8 @@ public class ErpMaterialServiceImpl implements IErpMaterialService @Override public List selectAllErpMaterialListWithBom(ErpMaterial erpMaterial) { + erpMaterial.setUseStatus("1"); + erpMaterial.setAuditStatus("1"); List erpMaterialVos = erpMaterialMapper.selectAllErpMaterialListWithBom(erpMaterial); return erpMaterialVos; } @@ -609,6 +611,10 @@ public class ErpMaterialServiceImpl implements IErpMaterialService * */ @Override public List selectAllErpMaterialListByMaterialVo(ErpMaterialVo erpMaterialVo) { + // 审核状态-审核通过 + erpMaterialVo.setAuditStatus("1"); + // 使用状态-是 + erpMaterialVo.setUseStatus("1"); return erpMaterialMapper.selectAllErpMaterialListByMaterialVo(erpMaterialVo); } diff --git a/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml b/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml index 0969f395..872e174c 100644 --- a/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialMapper.xml @@ -155,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -182,13 +185,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where parent_id = (select id from sys_category where code = 'materialType') ) )cate on erp.material_type = cate.code where cate.parent_id in (select id from sys_category where code in ('cp','bcp')) - and erp.del_flag = '0' and erp.audit_status = '1' + and erp.del_flag = '0' and erp.audit_status = '1' and erp.use_status = '1'