diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java index 22df73e2..5f65903e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/material/MaterialMapper.java @@ -33,6 +33,7 @@ public interface MaterialMapper extends BaseMapperX { .like(!StringUtils.isEmpty(reqVO.getCode()), MaterialDO::getCode, reqVO.getCode()) .eq(!StringUtils.isEmpty(reqVO.getMaterialType()), MaterialDO::getMaterialType, reqVO.getMaterialType()) .eq(reqVO.getStatus() != null, MaterialDO::getStatus, reqVO.getStatus()) + .eq(true,MaterialDO::getVirtualPart,"N") .eq(!StringUtils.isEmpty(reqVO.getVirtualPart()), MaterialDO::getVirtualPart, reqVO.getVirtualPart()); return selectPage(reqVO, query); @@ -40,7 +41,7 @@ public interface MaterialMapper extends BaseMapperX { default List> selectSimpleList() { - return selectMaps(new QueryWrapper().select("id", "name","short_name","code","material_type","spec","unit","brand").lambda()); + return selectMaps(new QueryWrapper().select("id", "name","short_name","code","material_type","spec","unit","brand").eq("virtual_part","N").lambda()); } } diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materials.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materials.vue index a369365e..2db48a09 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materials.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/materials.vue @@ -1,7 +1,17 @@