24282 пре 1 година
родитељ
комит
97d17446bd
20 измењених фајлова са 750 додато и 3 уклоњено
  1. 1 1
      code-generation/src/main/java/com/sd/Generation.java
  2. 57 0
      sd-business/src/main/java/com/sd/business/controller/inventory/InventoryController.java
  3. 71 0
      sd-business/src/main/java/com/sd/business/controller/warehouse/WarehouseController.java
  4. 17 0
      sd-business/src/main/java/com/sd/business/entity/inventory/dto/InventoryDto.java
  5. 84 0
      sd-business/src/main/java/com/sd/business/entity/inventory/dto/InventorySelectDto.java
  6. 48 0
      sd-business/src/main/java/com/sd/business/entity/inventory/po/Inventory.java
  7. 37 0
      sd-business/src/main/java/com/sd/business/entity/inventory/vo/InventoryVo.java
  8. 17 0
      sd-business/src/main/java/com/sd/business/entity/warehouse/dto/WarehouseDto.java
  9. 27 0
      sd-business/src/main/java/com/sd/business/entity/warehouse/dto/WarehouseSelectDto.java
  10. 36 0
      sd-business/src/main/java/com/sd/business/entity/warehouse/po/Warehouse.java
  11. 17 0
      sd-business/src/main/java/com/sd/business/entity/warehouse/vo/WarehouseVo.java
  12. 40 0
      sd-business/src/main/java/com/sd/business/mapper/inventory/InventoryMapper.java
  13. 26 0
      sd-business/src/main/java/com/sd/business/mapper/warehouse/WarehouseMapper.java
  14. 39 0
      sd-business/src/main/java/com/sd/business/service/inventory/InventoryService.java
  15. 65 0
      sd-business/src/main/java/com/sd/business/service/inventory/impl/InventoryServiceImpl.java
  16. 46 0
      sd-business/src/main/java/com/sd/business/service/warehouse/WarehouseService.java
  17. 59 0
      sd-business/src/main/java/com/sd/business/service/warehouse/impl/WarehouseServiceImpl.java
  18. 44 0
      sd-business/src/main/resources/mapper/inventory/InventoryMapper.xml
  19. 17 0
      sd-business/src/main/resources/mapper/warehouse/WarehouseMapper.xml
  20. 2 2
      sd-starter/src/main/resources/application-dev.yml

+ 1 - 1
code-generation/src/main/java/com/sd/Generation.java

@@ -8,7 +8,7 @@ public class Generation {
         GeneratorApplication.builder()
                 .url("jdbc:mysql://36.134.91.96:12333/sd_business?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
                 .username("root")
-                .password("Fjhx@pwd123")
+                .password("5fWD*oa^nso@kmKa")
                 .port(9989)
                 .module("sd-business")
                 .parent("com.sd.business")

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

@@ -0,0 +1,57 @@
+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.vo.InventoryVo;
+import com.sd.business.entity.inventory.vo.QuantityByDepartmentVo;
+import com.sd.business.entity.inventory.vo.QuantityByWarehouseVo;
+import com.sd.business.service.inventory.InventoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 库存 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@RestController
+@RequestMapping("/inventory")
+public class InventoryController {
+
+    @Autowired
+    private InventoryService inventoryService;
+
+    /**
+     * 库存分页
+     */
+    @PostMapping("/page")
+    public Page<InventoryVo> page(@RequestBody InventorySelectDto dto) {
+        return inventoryService.getPage(dto);
+    }
+
+    /**
+     * 根据仓库获取库存数量
+     */
+    @PostMapping("/getQuantityByWarehouse")
+    public List<QuantityByWarehouseVo> getQuantityByWarehouse() {
+        return inventoryService.getQuantityByWarehouse();
+    }
+
+    /**
+     * 根据事业部获取库存数量
+     */
+    @PostMapping("/getQuantityByDepartment")
+    public List<QuantityByDepartmentVo> getQuantityByDepartment() {
+        return inventoryService.getQuantityByDepartment();
+    }
+
+}

+ 71 - 0
sd-business/src/main/java/com/sd/business/controller/warehouse/WarehouseController.java

@@ -0,0 +1,71 @@
+package com.sd.business.controller.warehouse;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.entity.warehouse.dto.WarehouseDto;
+import com.sd.business.entity.warehouse.dto.WarehouseSelectDto;
+import com.sd.business.entity.warehouse.vo.WarehouseVo;
+import com.sd.business.service.warehouse.WarehouseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * <p>
+ * 仓库 前端控制器
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@RestController
+@RequestMapping("/warehouse")
+public class WarehouseController {
+
+    @Autowired
+    private WarehouseService warehouseService;
+
+    /**
+     * 仓库分页
+     */
+    @PostMapping("/page")
+    public Page<WarehouseVo> page(@RequestBody WarehouseSelectDto dto) {
+        return warehouseService.getPage(dto);
+    }
+
+    /**
+     * 仓库明细
+     */
+    @PostMapping("/detail")
+    public WarehouseVo detail(@RequestBody BaseSelectDto dto) {
+        return warehouseService.detail(dto.getId());
+    }
+
+    /**
+     * 仓库新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody WarehouseDto warehouseDto) {
+        warehouseService.add(warehouseDto);
+    }
+
+    /**
+     * 仓库编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody WarehouseDto warehouseDto) {
+        warehouseService.edit(warehouseDto);
+    }
+
+    /**
+     * 仓库删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        warehouseService.delete(dto.getId());
+    }
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/inventory/dto/InventoryDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.inventory.dto;
+
+import com.sd.business.entity.inventory.po.Inventory;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 库存新增编辑入参实体
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class InventoryDto extends Inventory {
+
+}

+ 84 - 0
sd-business/src/main/java/com/sd/business/entity/inventory/dto/InventorySelectDto.java

@@ -0,0 +1,84 @@
+package com.sd.business.entity.inventory.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * 库存列表查询入参实体
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class InventorySelectDto extends BaseSelectDto {
+
+    /**
+     * bom分类id
+     */
+    private Long bomClassifyId;
+
+    /**
+     * 品名
+     */
+    private String bomSpecName;
+
+    /**
+     * 品号
+     */
+    private String bomSpecCode;
+
+    /**
+     * 种类 字典:bom_species
+     */
+    private String bomSpecies;
+
+    /**
+     * 色层 字典:bom_chromatophore
+     */
+    private String bomChromatophore;
+
+    /**
+     * 压纹工艺 字典:bom_embossingProcess
+     */
+    private String bomEmbossingProcess;
+
+    /**
+     * 正面纹路 字典:bom_frontGrain
+     */
+    private String bomFrontGrain;
+
+    /**
+     * 背面纹路 字典:bom_reverseGrain
+     */
+    private String bomReverseGrain;
+
+    /**
+     * 颜色
+     */
+    private String bomSpecColour;
+
+    /**
+     * 长 cm
+     */
+    private BigDecimal bomSpecLength;
+
+    /**
+     * 宽 cm
+     */
+    private BigDecimal bomSpecWidth;
+
+    /**
+     * 仓库id
+     */
+    private Long warehouseId;
+
+    /**
+     * 事业部id
+     */
+    private Long departmentId;
+
+}

+ 48 - 0
sd-business/src/main/java/com/sd/business/entity/inventory/po/Inventory.java

@@ -0,0 +1,48 @@
+package com.sd.business.entity.inventory.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 库存
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+@TableName("inventory")
+public class Inventory extends BasePo {
+
+    /**
+     * 仓库id
+     */
+    private Long warehouseId;
+
+    /**
+     * bom规格id
+     */
+    private Long bomSpecId;
+
+    /**
+     * 结存单价
+     */
+    private BigDecimal balanceUnitPrice;
+
+    /**
+     * 数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 事业部id
+     */
+    private Long departmentId;
+
+}

+ 37 - 0
sd-business/src/main/java/com/sd/business/entity/inventory/vo/InventoryVo.java

@@ -0,0 +1,37 @@
+package com.sd.business.entity.inventory.vo;
+
+import com.sd.business.entity.inventory.po.Inventory;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 库存列表查询返回值实体
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class InventoryVo extends Inventory {
+
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+
+    /**
+     * 品名
+     */
+    private String bomSpecName;
+
+    /**
+     * 品号
+     */
+    private String bomSpecCode;
+
+    /**
+     * 事业部名称
+     */
+    private String departmentName;
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/warehouse/dto/WarehouseDto.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.warehouse.dto;
+
+import com.sd.business.entity.warehouse.po.Warehouse;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 仓库新增编辑入参实体
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class WarehouseDto extends Warehouse {
+
+}

+ 27 - 0
sd-business/src/main/java/com/sd/business/entity/warehouse/dto/WarehouseSelectDto.java

@@ -0,0 +1,27 @@
+package com.sd.business.entity.warehouse.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 仓库列表查询入参实体
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class WarehouseSelectDto extends BaseSelectDto {
+
+    /**
+     * 仓库类型 字典:warehouse_type
+     */
+    private String type;
+
+    /**
+     * 仓库名称
+     */
+    private String name;
+
+}

+ 36 - 0
sd-business/src/main/java/com/sd/business/entity/warehouse/po/Warehouse.java

@@ -0,0 +1,36 @@
+package com.sd.business.entity.warehouse.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 仓库
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+@TableName("warehouse")
+public class Warehouse extends BasePo {
+
+    /**
+     * 仓库类型 字典:warehouse_type
+     */
+    private String type;
+
+    /**
+     * 仓库名称
+     */
+    private String name;
+
+    /**
+     * 仓库说明
+     */
+    private String remark;
+
+}

+ 17 - 0
sd-business/src/main/java/com/sd/business/entity/warehouse/vo/WarehouseVo.java

@@ -0,0 +1,17 @@
+package com.sd.business.entity.warehouse.vo;
+
+import com.sd.business.entity.warehouse.po.Warehouse;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 仓库列表查询返回值实体
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Getter
+@Setter
+public class WarehouseVo extends Warehouse {
+
+}

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

@@ -0,0 +1,40 @@
+package com.sd.business.mapper.inventory;
+
+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.inventory.po.Inventory;
+import com.sd.business.entity.inventory.vo.InventoryVo;
+import com.sd.business.entity.inventory.vo.QuantityByDepartmentVo;
+import com.sd.business.entity.inventory.vo.QuantityByWarehouseVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 库存 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+public interface InventoryMapper extends BaseMapper<Inventory> {
+
+    /**
+     * 库存分页
+     */
+    Page<InventoryVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Inventory> wrapper);
+
+    /**
+     * 根据仓库获取库存数量
+     */
+    List<QuantityByWarehouseVo> getQuantityByWarehouse();
+
+    /**
+     * 根据事业部获取库存数量
+     */
+    List<QuantityByDepartmentVo> getQuantityByDepartment();
+
+}

+ 26 - 0
sd-business/src/main/java/com/sd/business/mapper/warehouse/WarehouseMapper.java

@@ -0,0 +1,26 @@
+package com.sd.business.mapper.warehouse;
+
+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.warehouse.po.Warehouse;
+import com.sd.business.entity.warehouse.vo.WarehouseVo;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 仓库 Mapper 接口
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+public interface WarehouseMapper extends BaseMapper<Warehouse> {
+
+    /**
+     * 仓库分页
+     */
+    Page<WarehouseVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<Warehouse> wrapper);
+
+}

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

@@ -0,0 +1,39 @@
+package com.sd.business.service.inventory;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.inventory.dto.InventorySelectDto;
+import com.sd.business.entity.inventory.po.Inventory;
+import com.sd.business.entity.inventory.vo.InventoryVo;
+import com.sd.business.entity.inventory.vo.QuantityByDepartmentVo;
+import com.sd.business.entity.inventory.vo.QuantityByWarehouseVo;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 库存 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+public interface InventoryService extends BaseService<Inventory> {
+
+    /**
+     * 库存分页
+     */
+    Page<InventoryVo> getPage(InventorySelectDto dto);
+
+    /**
+     * 根据仓库获取库存数量
+     */
+    List<QuantityByWarehouseVo> getQuantityByWarehouse();
+
+    /**
+     * 根据事业部获取库存数量
+     */
+    List<QuantityByDepartmentVo> getQuantityByDepartment();
+
+}

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

@@ -0,0 +1,65 @@
+package com.sd.business.service.inventory.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.bom.po.Bom;
+import com.sd.business.entity.bom.po.BomSpec;
+import com.sd.business.entity.inventory.dto.InventorySelectDto;
+import com.sd.business.entity.inventory.po.Inventory;
+import com.sd.business.entity.inventory.vo.InventoryVo;
+import com.sd.business.entity.inventory.vo.QuantityByDepartmentVo;
+import com.sd.business.entity.inventory.vo.QuantityByWarehouseVo;
+import com.sd.business.mapper.inventory.InventoryMapper;
+import com.sd.business.service.inventory.InventoryService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 库存 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Service
+public class InventoryServiceImpl extends ServiceImpl<InventoryMapper, Inventory> implements InventoryService {
+
+    @Override
+    public Page<InventoryVo> getPage(InventorySelectDto dto) {
+        IWrapper<Inventory> wrapper = getWrapper();
+
+        wrapper.orderByDesc("i", Inventory::getId);
+        wrapper.eq("b", Bom::getBomClassifyId, dto.getBomClassifyId());
+        wrapper.like("bs", BomSpec::getName, dto.getBomSpecName());
+        wrapper.like("bs", BomSpec::getCode, dto.getBomSpecCode());
+        wrapper.eq("b", Bom::getSpecies, dto.getBomSpecies());
+        wrapper.eq("b", Bom::getChromatophore, dto.getBomChromatophore());
+        wrapper.eq("b", Bom::getEmbossingProcess, dto.getBomEmbossingProcess());
+        wrapper.eq("b", Bom::getFrontGrain, dto.getBomFrontGrain());
+        wrapper.eq("b", Bom::getReverseGrain, dto.getBomReverseGrain());
+        wrapper.like("bs", BomSpec::getColour, dto.getBomSpecColour());
+        wrapper.like("bs", BomSpec::getLength, dto.getBomSpecLength());
+        wrapper.like("bs", BomSpec::getWidth, dto.getBomSpecWidth());
+        wrapper.eq("i", Inventory::getWarehouseId, dto.getWarehouseId());
+        wrapper.eq("i", Inventory::getDepartmentId, dto.getDepartmentId());
+
+        Page<InventoryVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public List<QuantityByWarehouseVo> getQuantityByWarehouse() {
+        return baseMapper.getQuantityByWarehouse();
+    }
+
+    @Override
+    public List<QuantityByDepartmentVo> getQuantityByDepartment() {
+        return baseMapper.getQuantityByDepartment();
+    }
+
+
+}

+ 46 - 0
sd-business/src/main/java/com/sd/business/service/warehouse/WarehouseService.java

@@ -0,0 +1,46 @@
+package com.sd.business.service.warehouse;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.service.BaseService;
+import com.sd.business.entity.warehouse.dto.WarehouseDto;
+import com.sd.business.entity.warehouse.dto.WarehouseSelectDto;
+import com.sd.business.entity.warehouse.po.Warehouse;
+import com.sd.business.entity.warehouse.vo.WarehouseVo;
+
+
+/**
+ * <p>
+ * 仓库 服务类
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+public interface WarehouseService extends BaseService<Warehouse> {
+
+    /**
+     * 仓库分页
+     */
+    Page<WarehouseVo> getPage(WarehouseSelectDto dto);
+
+    /**
+     * 仓库明细
+     */
+    WarehouseVo detail(Long id);
+
+    /**
+     * 仓库新增
+     */
+    void add(WarehouseDto warehouseDto);
+
+    /**
+     * 仓库编辑
+     */
+    void edit(WarehouseDto warehouseDto);
+
+    /**
+     * 仓库删除
+     */
+    void delete(Long id);
+
+}

+ 59 - 0
sd-business/src/main/java/com/sd/business/service/warehouse/impl/WarehouseServiceImpl.java

@@ -0,0 +1,59 @@
+package com.sd.business.service.warehouse.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.warehouse.dto.WarehouseDto;
+import com.sd.business.entity.warehouse.dto.WarehouseSelectDto;
+import com.sd.business.entity.warehouse.po.Warehouse;
+import com.sd.business.entity.warehouse.vo.WarehouseVo;
+import com.sd.business.mapper.warehouse.WarehouseMapper;
+import com.sd.business.service.warehouse.WarehouseService;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 仓库 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-07-03
+ */
+@Service
+public class WarehouseServiceImpl extends ServiceImpl<WarehouseMapper, Warehouse> implements WarehouseService {
+
+    @Override
+    public Page<WarehouseVo> getPage(WarehouseSelectDto dto) {
+        IWrapper<Warehouse> wrapper = getWrapper();
+        wrapper.orderByDesc("w", Warehouse::getId);
+        wrapper.eq("w", Warehouse::getType, dto.getType());
+        wrapper.like("w", Warehouse::getName, dto.getName());
+        Page<WarehouseVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public WarehouseVo detail(Long id) {
+        Warehouse Warehouse = this.getById(id);
+        WarehouseVo result = BeanUtil.toBean(Warehouse, WarehouseVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(WarehouseDto warehouseDto) {
+        this.save(warehouseDto);
+    }
+
+    @Override
+    public void edit(WarehouseDto warehouseDto) {
+        this.updateById(warehouseDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+}

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

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sd.business.mapper.inventory.InventoryMapper">
+
+    <select id="getPage" resultType="com.sd.business.entity.inventory.vo.InventoryVo">
+        select i.id,
+               i.warehouse_id,
+               i.bom_spec_id,
+               i.balance_unit_price,
+               i.quantity,
+               i.department_id,
+               w.name  warehouseName,
+               bs.name bomSpecName,
+               bs.code bomSpecCode,
+               d.name  departmentName
+        from inventory i
+                 left join bom_spec bs on i.bom_spec_id = bs.id
+                 left join bom b on bs.bom_id = b.id
+                 left join warehouse w on i.warehouse_id = w.id
+                 left join department d on i.department_id = d.id
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getQuantityByWarehouse" resultType="com.sd.business.entity.inventory.vo.QuantityByWarehouseVo">
+        select sum(ifnull(i.quantity, 0)) inventoryQuantity,
+               w.id                       warehouseId,
+               w.name                     warehouseName
+        from inventory i
+                 left join warehouse w on i.warehouse_id = w.id
+        group by w.id
+        order by w.id
+    </select>
+
+    <select id="getQuantityByDepartment" resultType="com.sd.business.entity.inventory.vo.QuantityByDepartmentVo">
+        select sum(ifnull(i.quantity, 0)) inventoryQuantity,
+               d.id                       departmentId,
+               d.name                     departmentName
+        from inventory i
+                 left join department d on i.department_id = d.id
+        group by d.id
+        order by d.id
+    </select>
+
+</mapper>

+ 17 - 0
sd-business/src/main/resources/mapper/warehouse/WarehouseMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sd.business.mapper.warehouse.WarehouseMapper">
+    <select id="getPage" resultType="com.sd.business.entity.warehouse.vo.WarehouseVo">
+        select w.id,
+               w.type,
+               w.name,
+               w.remark,
+               w.create_user,
+               w.create_time,
+               w.update_user,
+               w.update_time
+        from warehouse w
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

+ 2 - 2
sd-starter/src/main/resources/application-dev.yml

@@ -8,11 +8,11 @@ spring:
         base:
           url: jdbc:mysql://36.134.91.96:12333/sd_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
           username: root
-          password: Fjhx@pwd123
+          password: 5fWD*oa^nso@kmKa
         business:
           url: jdbc:mysql://36.134.91.96:12333/sd_business?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
           username: root
-          password: Fjhx@pwd123
+          password: 5fWD*oa^nso@kmKa
 
   # redis 配置
   redis: