diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryAdjustmentRecord/InventoryAdjustmentRecordDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryAdjustmentRecord/InventoryAdjustmentRecordDTO.java index cb4d3b8ac..f9ff15d67 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryAdjustmentRecord/InventoryAdjustmentRecordDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inventoryAdjustmentRecord/InventoryAdjustmentRecordDTO.java @@ -157,6 +157,11 @@ public class InventoryAdjustmentRecordDTO extends BaseVOEntity { @Excel(name = "调整后冻结数量") private BigDecimal freezeAfterQuantity; + @ApiModelProperty("调整动作") + private String adjustAction; + + @ApiModelProperty("关联单号") + private String relateNo; @ApiModelProperty(name = "组织ID集合") private List organizationIdList; diff --git a/mhd_wms/src/main/resources/mapper/inventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml b/mhd_wms/src/main/resources/mapper/inventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml index a1c7454d0..0917626e5 100644 --- a/mhd_wms/src/main/resources/mapper/inventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml +++ b/mhd_wms/src/main/resources/mapper/inventoryAdjustmentRecord/InventoryAdjustmentRecordMapper.xml @@ -101,6 +101,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.material_code = #{materialCode} + + and a.adjust_action = #{adjustAction} + + + and a.relate_no = #{relateNo} + and a.material_name like concat('%', #{materialName}, '%')