From 5e250197e0ab69385fbd56ccae47fe6ff442204f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=AE=97=E5=9D=A4?= Date: Wed, 13 Nov 2024 21:52:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=AE=A1=E7=90=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=87=BA=E5=BA=93=E5=88=97=E8=A1=A8=E6=94=B9=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/domain/bo/SysOaOutWarehouseBo.java | 1 + .../oa/domain/bo/SysOaOutWarehouseBoList.java | 1 - .../oa/domain/vo/SysOaOutWarehouseListVo.java | 24 +++++++++++-- .../oa/mapper/SysOaOutWarehouseMapper.java | 5 ++- .../impl/SysOaOutWarehouseServiceImpl.java | 24 ++++++++----- .../mapper/oa/SysOaOutWarehouseMapper.xml | 35 +++++++++++++++++++ 6 files changed, 78 insertions(+), 12 deletions(-) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBo.java index 1c6559f..169389b 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBo.java @@ -33,6 +33,7 @@ public class SysOaOutWarehouseBo extends BaseEntity { /** * 出库后对应的项目id */ + @NotNull(message = "项目id不能为空",groups = { AddGroup.class }) private Long projectId; /** diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBoList.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBoList.java index 62c781a..6863a92 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBoList.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaOutWarehouseBoList.java @@ -24,7 +24,6 @@ public class SysOaOutWarehouseBoList extends BaseEntity { /** * 项目id */ - @NotNull(message = "项目id不能为空", groups = AddGroup.class) private Long projectId; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseListVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseListVo.java index 5b7dc95..d2d35b8 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseListVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaOutWarehouseListVo.java @@ -16,6 +16,10 @@ import java.util.List; @Data @ExcelIgnoreUnannotated public class SysOaOutWarehouseListVo { + /** + * ID 编号 + */ + private Long id; /** * 出库后对应的项目id @@ -29,9 +33,25 @@ public class SysOaOutWarehouseListVo { private String projectName; /** - * 出库表 + * 出库数量 */ - private List outWarehouseVoList; + private Long amount; + + /** + * 物料ID + */ + private Long warehouseId; + + /** + * 物料名称 + */ + private String warehouseName; + + /** + * 物料备注 + */ + private String remark; + diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaOutWarehouseMapper.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaOutWarehouseMapper.java index bc414eb..a0cf2f9 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaOutWarehouseMapper.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/SysOaOutWarehouseMapper.java @@ -25,5 +25,8 @@ public interface SysOaOutWarehouseMapper extends BaseMapperPlus defineSelectList(@Param(value = "bo") SysOaOutWarehouseBo bo, @Param(value = "page") PageQuery pageQuery); - + /** + * 获取分页的Total值 + */ + Long defineQueryTotal(@Param(value = "bo") SysOaOutWarehouseBo bo, @Param(value = "page") PageQuery pageQuery); } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaOutWarehouseServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaOutWarehouseServiceImpl.java index d5b87a7..941514f 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaOutWarehouseServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaOutWarehouseServiceImpl.java @@ -19,6 +19,7 @@ import com.ruoyi.oa.mapper.SysOaProjectMapper; import com.ruoyi.oa.mapper.SysOaWarehouseMapper; import com.ruoyi.oa.service.ISysOaWarehouseService; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.oa.domain.bo.SysOaOutWarehouseBo; @@ -40,6 +41,7 @@ import static cn.hutool.core.bean.BeanUtil.*; * @author liuzongkun999 * @date 2024-11-02 */ +@Slf4j @RequiredArgsConstructor @Service public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService { @@ -82,6 +84,7 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService { /** * 查询仓库出库列表 */ + @Override public TableDataInfo queryPageList(SysOaOutWarehouseBo bo, PageQuery pageQuery) { // LambdaQueryWrapper lqw = buildQueryWrapper(bo); @@ -90,8 +93,8 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService { // record.setWarehouseName(warehouseMapper.selectVoById(record.getWarehouseId()).getName()); // record.setProjectName(warehouseMapper.selectVoById(record.getProjectId()).getName()); // } + Long total = baseMapper.defineQueryTotal(bo, pageQuery); - // TODO 这么写分页失效 pageQuery.setPageNum(ObjectUtil.defaultIfNull(pageQuery.getPageNum(), 1)); pageQuery.setPageSize(ObjectUtil.defaultIfNull(pageQuery.getPageSize(), Integer.MAX_VALUE)); if (pageQuery.getPageNum() <= 0) { @@ -101,12 +104,15 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService { pageQuery.setPageSize(Integer.MAX_VALUE); } pageQuery.setPageNum((pageQuery.getPageNum() - 1)*pageQuery.getPageSize()); - List result = baseMapper.defineSelectList(bo, pageQuery); -// IPage page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()); -// page.setRecords(result); -// page.setTotal() - return TableDataInfo.build(result); + List selectList = baseMapper.defineSelectList(bo, pageQuery); + + IPage page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize()); + page.setRecords(selectList); + page.setTotal(total); + log.info(String.valueOf(total)); + + return TableDataInfo.build(page); } /** @@ -159,9 +165,11 @@ public class SysOaOutWarehouseServiceImpl implements ISysOaOutWarehouseService { @Override public Boolean insertByBoList(SysOaOutWarehouseBoList boList) { - // 只进行了插入出库表 - // 还缺少 检验数量是否足够，以及删除对应库存数量的业务逻辑 + Long projectId = boList.getProjectId(); + if (projectId == null) { + throw new Error("项目ID不能为空,新增出库失败"); + } List list = boList.getOutWareHouseList(); list.forEach((sysOaOutWarehouseBo2 -> { diff --git a/ruoyi-oa/src/main/resources/mapper/oa/SysOaOutWarehouseMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/SysOaOutWarehouseMapper.xml index da6b815..8399a63 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/SysOaOutWarehouseMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/SysOaOutWarehouseMapper.xml @@ -63,5 +63,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +