From 717bc87db25321a1403dd5cc818dad514a9a7f0b Mon Sep 17 00:00:00 2001
From: LiJianZhao <lijianzhao@jizhiweb.cn>
Date: Mon, 28 Apr 2025 13:15:16 +0800
Subject: [PATCH] deb

---
 .../server/controller/inventory/InventoryController.java    | 5 +++--
 .../clinic/server/service/inventory/InventoryService.java   | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

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<Map<String, Object>> 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<String, Object> goodsMap = JSON.parseObject(JSON.toJSONString(goods), Map.class);
-        List<Inventory> list = inventoryService.getListByGoodsId(goodsId);
+        List<Inventory> list = inventoryService.getListByGoodsId(goodsId,isZero);
         List<Map<String, Object>> listMap = new ArrayList<>();
         for (Inventory inventory : list) {
             Map<String, Object> map = new HashMap<>();
@@ -84,7 +85,7 @@ public class InventoryController extends BaseController {
         if (goods == null) {
             return error("商品不存在");
         }
-        List<Inventory> list = inventoryService.getListByGoodsId(goodsId);
+        List<Inventory> 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<Inventory> getListByGoodsId(int goodsId) {
+    public List<Inventory> getListByGoodsId(int goodsId,boolean isZero) {
         QueryWrapper<Inventory> 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);
     }