From 307add2f3e49dd4375562fbf7046e6b391a68eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com> Date: Tue, 31 Mar 2026 09:36:33 +0800 Subject: [PATCH] =?UTF-8?q?PC=E5=8D=B3=E6=97=B6=E5=BA=93=E5=AD=98=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=89=B9=E6=AC=A1=E5=8F=B7=E6=9F=A5=E8=AF=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statementStatistics/todo/ImmediateInventoryDO.java | 4 ++++ .../dto/statementStatistics/ImmediateInventoryDTO.java | 5 +++++ .../mapper/materialInventory/MaterialInventoryMapper.xml | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/statementStatistics/todo/ImmediateInventoryDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/statementStatistics/todo/ImmediateInventoryDO.java index e8834cc4f..326891292 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/statementStatistics/todo/ImmediateInventoryDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/statementStatistics/todo/ImmediateInventoryDO.java @@ -154,4 +154,8 @@ public class ImmediateInventoryDO extends BaseVOEntity { @ApiModelProperty("复核数量开始") private BigDecimal checkQuantityEnd; + @ApiModelProperty("批次号") + @Excel(name = "批次号") + private String batchNumber; + } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/statementStatistics/ImmediateInventoryDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/statementStatistics/ImmediateInventoryDTO.java index f0b91e239..8310831b6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/statementStatistics/ImmediateInventoryDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/statementStatistics/ImmediateInventoryDTO.java @@ -156,4 +156,9 @@ public class ImmediateInventoryDTO { @ApiModelProperty("复核数量开始") private BigDecimal checkQuantityEnd; + + @ApiModelProperty("批次号") + @Excel(name = "批次号") + private String batchNumber; + } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml index 124b47725..2bee36329 100644 --- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml +++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml @@ -695,6 +695,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and b.bar_code = #{barCode} + + and a.batch_number = #{batchNumber} + + and ifnull( (