From dee7ffa3d69dd1dc2155e281f1d6b65da829d516 Mon Sep 17 00:00:00 2001
From: zhou-hongcheng <1064771933@qq.com>
Date: Wed, 18 Mar 2026 20:51:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=BB=E4=BD=8D=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E9=80=89=E6=8B=A9=E5=86=BB=E7=BB=93=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=A4=A7=E4=BA=8E0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/todo/MaterialInventoryDO.java                 | 4 ++++
 .../dto/materialInventory/MaterialInventoryDTO.java          | 5 +++++
 .../mapper/materialInventory/MaterialInventoryMapper.xml     | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java
index 4472c28b9..5bd99e6d3 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/todo/MaterialInventoryDO.java
@@ -232,4 +232,8 @@ public class MaterialInventoryDO extends MaterialBaseDO {
 
     //查询规则 hz:货主,wl:物料,kw:库位,wlkw:物料库位,all:全部
     private String queryRule;
+
+    @ApiModelProperty("冻结数量大于0条件")
+    @Excel(name = "冻结数量大于0条件")
+    private String greaterThanFreezeQuantity;
 }
\ No newline at end of file
diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java
index 0ed4a3c85..62f12b8b0 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialInventory/MaterialInventoryDTO.java
@@ -180,4 +180,9 @@ public class MaterialInventoryDTO extends MaterialBaseDTO {
     @ApiModelProperty("面积")
     @Excel(name = "面积")
     private BigDecimal area;
+
+    @ApiModelProperty("冻结数量大于0条件")
+    @Excel(name = "冻结数量大于0条件")
+    private String greaterThanFreezeQuantity = "true";
+
 }
\ 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 7b32259c9..7c08de2ad 100644
--- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
@@ -177,6 +177,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="freezeQuantity != null ">
             and a.freeze_quantity = #{freezeQuantity}
         </if>
+        <if test="greaterThanFreezeQuantity != null and greaterThanFreezeQuantity != ''">
+            and a.freeze_quantity > 0
+        </if>
         <if test="createByName != null  and createByName != ''">
             and a.create_by_name like concat('%', #{createByName}, '%')
         </if>