维多利亚

hx-service/victoriatourist/src/main/java/com/fjhx/controller/stock/StockController.java

@@ -1,6 +1,7 @@
 package com.fjhx.controller.stock;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.Condition;
 import com.fjhx.entity.stock.Stock;
 import com.fjhx.params.stock.StockVo;
 import com.fjhx.service.stock.StockService;
@@ -52,5 +53,14 @@ public class StockController {
         return R.success();
     }
 
+    /**
+     * 查询仓库库存
+     */
+    @PostMapping("/pageByWarehouseId")
+    public R pageByWarehouseId(@RequestBody Condition condition) {
+        Page<Map<String, Object>> result = stockService.pageByWarehouseId(condition);
+        return R.success(result);
+    }
+
 }
 

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/stock/StockMapper.java

@@ -1,7 +1,11 @@
 package com.fjhx.mapper.stock;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.stock.Stock;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -12,5 +16,6 @@ import com.fjhx.entity.stock.Stock;
  * @since 2022-11-24
  */
 public interface StockMapper extends BaseMapper<Stock> {
+    Page<Map<String, Object>> pageByWarehouseId(@Param("page") Page<Object> page, @Param("warehouseId") Long warehouseId);
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/stock/StockMapper.xml

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fjhx.mapper.stock.StockMapper">
 
+    <select id="pageByWarehouseId" resultType="java.util.Map">
+        select pi.id,
+               pi.code,
+               pi.name,
+               pi.type,
+               pi.unit,
+               ifnull(s.quantity, 0) inventoryQuantity
+        from product_info pi
+                 left join stock s on s.goods_id = pi.id and s.warehouse_id = #{warehouseId}
+    </select>
+
 </mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/service/check/impl/CheckInfoServiceImpl.java

@@ -46,7 +46,9 @@ public class CheckInfoServiceImpl extends ServiceImpl<CheckInfoMapper, CheckInfo
                 .eq("ci", CheckInfo::getCode)
                 .like("w", Warehouse::getName, condition.get("warehouseName"))
                 .eq("ci", CheckInfo::getCreateUser)
-                .periodTime("ci", CheckInfo::getCreateTime);
+                .periodTime("ci", CheckInfo::getCreateTime)
+                .orderByDesc("ci", CheckInfo::getId)
+        ;
 
         Page<Map<String, Object>> page = baseMapper.getPage(condition.getPage(), wrapper);
 

hx-service/victoriatourist/src/main/java/com/fjhx/service/stock/StockService.java

@@ -2,11 +2,11 @@ package com.fjhx.service.stock;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;
+import com.fjhx.base.Condition;
 import com.fjhx.entity.stock.Stock;
 import com.fjhx.params.stock.StockChangeVo;
 import com.fjhx.params.stock.StockVo;
 
-import java.math.BigDecimal;
 import java.util.Map;
 
 /**
@@ -29,4 +29,6 @@ public interface StockService extends BaseService<Stock> {
 
     void changeQuantity(StockChangeVo stockChangeVo);
 
+    Page<Map<String, Object>> pageByWarehouseId(Condition condition);
+
 }

hx-service/victoriatourist/src/main/java/com/fjhx/service/stock/impl/StockServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.base.Condition;
 import com.fjhx.entity.stock.Stock;
 import com.fjhx.enums.stock.InTypeEnum;
 import com.fjhx.mapper.stock.StockMapper;
@@ -18,11 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * <p>
@@ -76,6 +73,13 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         stockJournalService.addJournal(stockChangeVo);
     }
 
+    @Override
+    public Page<Map<String, Object>> pageByWarehouseId(Condition condition) {
+        Long warehouseId = condition.getLong("warehouseId");
+        Assert.notEmpty(warehouseId, "请传入仓库id");
+        return baseMapper.pageByWarehouseId(condition.getPage(), warehouseId);
+    }
+
     /**
      * 合并变更数量(如果同一种物品在出入库一个仓库，则合并数量)
      */