diff --git a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java index f63a4ab..57ba0b8 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java @@ -48,13 +48,14 @@ public class InventoryController extends BaseController { @RequestMapping("/getByGoodsId") public Result> getByGoodsId() { int goodsId = parmsUtil.getInteger("goodsId", "请输入商品ID"); + Boolean isZero = parmsUtil.getObject("isZero", Boolean.class); Goods goods = goodsService.getById(goodsId); if (goods == null) { return error("商品不存在"); } Map goodsMap = JSON.parseObject(JSON.toJSONString(goods), Map.class); - List list = inventoryService.getListByGoodsId(goodsId); + List list = inventoryService.getListByGoodsId(goodsId,isZero); List> listMap = new ArrayList<>(); for (Inventory inventory : list) { Map map = new HashMap<>(); @@ -84,7 +85,7 @@ public class InventoryController extends BaseController { if (goods == null) { return error("商品不存在"); } - List list = inventoryService.getListByGoodsId(goodsId); + List list = inventoryService.getListByGoodsId(goodsId,true); return success(list); } diff --git a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java index 6900f15..b6a1ece 100644 --- a/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java +++ b/src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java @@ -112,10 +112,12 @@ public class InventoryService extends BaseService { /** * 根据goodsId 获取该goods的所有库存信息 */ - public List getListByGoodsId(int goodsId) { + public List getListByGoodsId(int goodsId,boolean isZero) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("good_id", goodsId); - queryWrapper.and(wrapper->wrapper.ne("whole_number", 0).or().ne("fragment_number", 0)); + if (!isZero){ + queryWrapper.and(wrapper->wrapper.ne("whole_number", 0).or().ne("fragment_number", 0)); + } queryWrapper.orderByDesc("create_datetime"); return inventoryMapper.selectList(queryWrapper); }