库存查询

sd-business/src/main/java/com/sd/business/controller/inventory/InventoryController.java

@@ -2,6 +2,7 @@ package com.sd.business.controller.inventory;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.sd.business.entity.inventory.dto.InventorySelectDto;
+import com.sd.business.entity.inventory.dto.QuantityByWarehouseDto;
 import com.sd.business.entity.inventory.vo.InventoryVo;
 import com.sd.business.entity.inventory.vo.QuantityByDepartmentVo;
 import com.sd.business.entity.inventory.vo.QuantityByWarehouseVo;
@@ -43,8 +44,8 @@ public class InventoryController {
      * 根据仓库获取库存数量
      */
     @PostMapping("/getQuantityByWarehouse")
-    public List<QuantityByWarehouseVo> getQuantityByWarehouse() {
-        return inventoryService.getQuantityByWarehouse();
+    public List<QuantityByWarehouseVo> getQuantityByWarehouse(@RequestBody QuantityByWarehouseDto dto) {
+        return inventoryService.getQuantityByWarehouse(dto);
     }
 
     /**

sd-business/src/main/java/com/sd/business/entity/inventory/dto/QuantityByWarehouseDto.java

@@ -0,0 +1,15 @@
+package com.sd.business.entity.inventory.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class QuantityByWarehouseDto {
+
+    /**
+     * 事业部id
+     */
+    private Long departmentId;
+
+}

sd-business/src/main/java/com/sd/business/mapper/inventory/InventoryMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.sd.business.entity.in.po.InOutStorageDetails;
+import com.sd.business.entity.inventory.dto.QuantityByWarehouseDto;
 import com.sd.business.entity.inventory.po.Inventory;
 import com.sd.business.entity.inventory.vo.InventoryVo;
 import com.sd.business.entity.inventory.vo.QuantityByDepartmentVo;
@@ -34,7 +35,7 @@ public interface InventoryMapper extends BaseMapper<Inventory> {
     /**
      * 根据仓库获取库存数量
      */
-    List<QuantityByWarehouseVo> getQuantityByWarehouse();
+    List<QuantityByWarehouseVo> getQuantityByWarehouse(QuantityByWarehouseDto dto);
 
     /**
      * 根据事业部获取库存数量

sd-business/src/main/java/com/sd/business/service/inventory/InventoryService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.service.BaseService;
 import com.sd.business.entity.inventory.bo.InOutFun;
 import com.sd.business.entity.inventory.dto.InventorySelectDto;
+import com.sd.business.entity.inventory.dto.QuantityByWarehouseDto;
 import com.sd.business.entity.inventory.po.Inventory;
 import com.sd.business.entity.inventory.vo.InventoryVo;
 import com.sd.business.entity.inventory.vo.QuantityByDepartmentVo;
@@ -30,7 +31,7 @@ public interface InventoryService extends BaseService<Inventory> {
     /**
      * 根据仓库获取库存数量
      */
-    List<QuantityByWarehouseVo> getQuantityByWarehouse();
+    List<QuantityByWarehouseVo> getQuantityByWarehouse(QuantityByWarehouseDto dto);
 
     /**
      * 根据事业部获取库存数量

sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryServiceImpl.java

@@ -1,19 +1,16 @@
 package com.sd.business.service.inventory.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.ruoyi.system.utils.UserUtil;
 import com.sd.business.entity.bom.po.Bom;
 import com.sd.business.entity.bom.po.BomSpec;
-import com.sd.business.entity.bom.vo.BomSpecVo;
 import com.sd.business.entity.in.po.InOutStorageDetails;
 import com.sd.business.entity.inventory.bo.InOutFun;
 import com.sd.business.entity.inventory.dto.InventorySelectDto;
+import com.sd.business.entity.inventory.dto.QuantityByWarehouseDto;
 import com.sd.business.entity.inventory.po.Inventory;
 import com.sd.business.entity.inventory.po.InventoryBackup;
 import com.sd.business.entity.inventory.vo.InventoryVo;
@@ -22,11 +19,8 @@ import com.sd.business.entity.inventory.vo.QuantityByWarehouseVo;
 import com.sd.business.mapper.inventory.InventoryMapper;
 import com.sd.business.service.bom.BomSpecService;
 import com.sd.business.service.inventory.InventoryService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -78,8 +72,8 @@ public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory
     }
 
     @Override
-    public List<QuantityByWarehouseVo> getQuantityByWarehouse() {
-        return baseMapper.getQuantityByWarehouse();
+    public List<QuantityByWarehouseVo> getQuantityByWarehouse(QuantityByWarehouseDto dto) {
+        return baseMapper.getQuantityByWarehouse(dto);
     }
 
     @Override

sd-business/src/main/resources/mapper/inventory/InventoryMapper.xml

@@ -23,10 +23,15 @@
 
     <select id="getQuantityByWarehouse" resultType="com.sd.business.entity.inventory.vo.QuantityByWarehouseVo">
         select sum(ifnull(i.quantity, 0)) inventoryQuantity,
-               w.id                       warehouseId,
-               w.name                     warehouseName
+        w.id warehouseId,
+        w.name warehouseName
         from inventory i
-                 left join warehouse w on i.warehouse_id = w.id
+        left join warehouse w on i.warehouse_id = w.id
+        <where>
+            <if test="departmentId neq null">
+                i.department_id = #{departmentId}
+            </if>
+        </where>
         group by w.id
         order by w.id
     </select>