From 14944d2a99be5bf6c5c98a110759ad0c70150f0e Mon Sep 17 00:00:00 2001 From: wenshijun Date: Tue, 20 Jan 2026 14:02:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wisdom/controller/RkInfoController.java | 33 +++++--- .../com/zg/project/wisdom/domain/RkInfo.java | 2 +- .../wisdom/domain/vo/RkCkStatisticVO.java | 79 +++++++++++++++++++ src/main/resources/application-druid.yml | 4 +- .../resources/mybatis/wisdom/RkInfoMapper.xml | 3 + 5 files changed, 108 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/zg/project/wisdom/domain/vo/RkCkStatisticVO.java diff --git a/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java b/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java index 99dbfa3..d42b5b6 100644 --- a/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java +++ b/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java @@ -84,16 +84,6 @@ public class RkInfoController extends BaseController return dataInfo; } - /** - * 出入库查询 - */ - @PostMapping("/pageList") - public TableDataInfo pageList(@RequestBody RkInfoQueryDTO dto) { - PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); - List list = rkInfoService.selectRkInfoPageList(dto); - return getDataTable(list); - } - /** * 单据头信息：根据入库单号查询公共字段 */ @@ -135,6 +125,29 @@ public class RkInfoController extends BaseController return getDataTable(list); } + /** + * 导出出入库记录 + */ + @PreAuthorize("@ss.hasPermi('wisdom:stock:export')") + @Log(title = "出入库记录", businessType = BusinessType.EXPORT) + @PostMapping("/exportPageList") + public void exportPageList(HttpServletResponse response, RkInfoQueryDTO query) + { + List list = rkInfoService.selectRkInfoPageList(query); + ExcelUtil util = new ExcelUtil<>(RkInfo.class); + util.exportExcel(response, list, "出入库记录导出"); + } + + /** + * 出入库查询 + */ + @PostMapping("/pageList") + public TableDataInfo pageList(@RequestBody RkInfoQueryDTO dto) { + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + List list = rkInfoService.selectRkInfoPageList(dto); + return getDataTable(list); + } + /** * 导出库存单据主列表 */ diff --git a/src/main/java/com/zg/project/wisdom/domain/RkInfo.java b/src/main/java/com/zg/project/wisdom/domain/RkInfo.java index 055e749..802df76 100644 --- a/src/main/java/com/zg/project/wisdom/domain/RkInfo.java +++ b/src/main/java/com/zg/project/wisdom/domain/RkInfo.java @@ -84,7 +84,7 @@ public class RkInfo extends BaseEntity { /** 所属小仓编码 */ @TableField(exist = false) - @Excel(name = "所属小仓编码") +// @Excel(name = "所属小仓编码") private String warehouseCode; /** 所属小仓名称 */ diff --git a/src/main/java/com/zg/project/wisdom/domain/vo/RkCkStatisticVO.java b/src/main/java/com/zg/project/wisdom/domain/vo/RkCkStatisticVO.java new file mode 100644 index 0000000..744321f --- /dev/null +++ b/src/main/java/com/zg/project/wisdom/domain/vo/RkCkStatisticVO.java @@ -0,0 +1,79 @@ +package com.zg.project.wisdom.domain.vo; + +import com.zg.framework.aspectj.lang.annotation.Excel; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 出入库统计明细 VO + * 仅用于查询与展示，不参与落库 + */ +@Data +public class RkCkStatisticVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** 操作类型：入库 / 出库 */ + @Excel(name = "操作类型") + private String operationType; + + /** 详细类型：入库类型名 / 出库类型名 */ + @Excel(name = "详细类型") + private String detailType; + + /** 库存状态（在库 / 已出库 / 借料等） */ + @Excel(name = "库存状态") + private String stockStatus; + + /** 单据号（入库单号或出库单号） */ + @Excel(name = "单据号") + private String billNo; + + /** 物料号 */ + @Excel(name = "物料号") + private String materialCode; + + /** 物料描述 */ + @Excel(name = "物料描述") + private String materialName; + + /** 单位 */ + @Excel(name = "单位") + private String unit; + + /** 数量（实际数量） */ + @Excel(name = "数量") + private BigDecimal quantity; + + /** 项目号 */ + @Excel(name = "项目号") + private String projectCode; + + /** 项目描述 */ + @Excel(name = "项目描述") + private String projectName; + + /** 库位码 */ + @Excel(name = "库位码") + private String locationCode; + + /** 订单编号（SAP 订单号） */ + @Excel(name = "订单编号") + private String orderNo; + + /** 供应商名称 */ + @Excel(name = "供应商名称") + private String supplierName; + + /** 备注 */ + @Excel(name = "备注") + private String remark; + + /** 入库时间（用户操作入库的日期） */ + @Excel(name = "操作时间", dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date operationTime; + +} diff --git a/src/main/resources/application-druid.yml b/src/main/resources/application-druid.yml index 7a8c206..969fea2 100644 --- a/src/main/resources/application-druid.yml +++ b/src/main/resources/application-druid.yml @@ -7,9 +7,9 @@ spring: # 主库数据源 master: # url: jdbc:mysql://47.100.212.83:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# url: jdbc:mysql://192.168.1.28:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://192.168.1.28:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # url: jdbc:mysql://192.168.1.192:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - url: jdbc:mysql://192.168.1.251:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# url: jdbc:mysql://192.168.1.251:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # url: jdbc:mysql://localhost:3306/wisdom?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: shzg diff --git a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml index 4f688b8..5a921c4 100644 --- a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml +++ b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml @@ -306,6 +306,9 @@ ) + + AND ri.remark LIKE concat('%', #{remark}, '%') + AND ri.rk_type LIKE concat('%', #{rkType}, '%')