diff --git a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html index 4aef9b1..0757a37 100644 --- a/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html +++ b/ruoyi-admin/src/main/resources/templates/system/baselocationinfo/baselocationinfo.html @@ -18,6 +18,10 @@ +
  • + + +
  • diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml index 4bce8a7..f9df5a8 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BaseLocationInfoMapper.xml @@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and location_code like concat(concat('%', #{locationCode}), '%') and location_name like concat(concat('%', #{locationName}), '%') + and material_type like concat(concat('%', #{materialType}), '%') and location_row = #{locationRow} and location_line = #{locationLine}