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" and a.freeze_quantity = #{freezeQuantity} + + and a.freeze_quantity > 0 + and a.create_by_name like concat('%', #{createByName}, '%')