Commit 27ec6e5564a544d819fce63acae5b4d7b7198283
1 parent
924561fc
入库查询物料添加判断是否被删除
Showing
1 changed file
with
1 additions
and
1 deletions
src/main/java/com/huaheng/pc/config/material/controller/MaterialController.java
| @@ -241,7 +241,7 @@ public class MaterialController extends BaseController { | @@ -241,7 +241,7 @@ public class MaterialController extends BaseController { | ||
| 241 | queryWrapper.like(StringUtils.isNotEmpty(materialName), Material::getCode, materialName) // WHERE material = | 241 | queryWrapper.like(StringUtils.isNotEmpty(materialName), Material::getCode, materialName) // WHERE material = |
| 242 | .or() // sql语句拼接or | 242 | .or() // sql语句拼接or |
| 243 | .like(StringUtils.isNotEmpty(materialName), Material::getName, materialName); | 243 | .like(StringUtils.isNotEmpty(materialName), Material::getName, materialName); |
| 244 | - queryWrapper.eq(Material::getWarehouseCode, ShiroUtils.getWarehouseCode()); | 244 | + queryWrapper.eq(Material::getWarehouseCode, ShiroUtils.getWarehouseCode()).ne(Material::getDeleted,1); |
| 245 | List<Material> materialList = materialService.list(queryWrapper); | 245 | List<Material> materialList = materialService.list(queryWrapper); |
| 246 | 246 | ||
| 247 | List<Map<String, Object>> list = new ArrayList<>(); | 247 | List<Map<String, Object>> list = new ArrayList<>(); |