feat(wms,oms)：库存管理-库存查询新增进货日期、入库日期查询条件，新增进货日期字段贯通收货-上架-库存全链路

需求：OMS/WMS 库存管理-库存查询页增加查询条件：物料分类（后端已支持，无需改动）、进货日期（新增字段）、入库日期。一、DDL（sql/20260831_wms_oms_add_purchase_date.sql） WMS 收货明细、上架明细、物料库存及 OMS 预留库存共 4 张表新增 PURCHASE_DATE DATE 列，附批次明细配置模板、执行前检查与回滚语句；须先执行 DDL 再发布服务。二、进货日期录入与落库链路（收货→上架→WMS库存→OMS库存） 1、录入入口为收货批次属性「进货日期」标签（批次规则配置，标签须一字不差）， ReceiptMaterialDetailImpl 两处标签解析新增分支； 2、收货明细→上架明细：StockReceiptOrderDomainService 6 处日期拷贝点补 setPurchaseDate（含子项）； 3、上架落库：stockIn/sj 赋值写入 material_inventory； 4、同步 OMS：MaterialInventoryOmsParamDO 新增字段经 Feign omsEdit 传递，写入 reservation_material_inventory； 5、库存行合并键：批次规则勾选后进货日期参与分行（getParam 映射 + selectListByWhere 全等匹配）， OMS omsEdit 行匹配同步按进货日期区分，避免不同进货日期误合并到同一行。三、查询条件（两模块 /list 接口） 1、进货日期：purchaseDate（单日精确）+ purchaseDateStart/purchaseDateEnd（区间，End 含当天）； 2、入库日期：WMS 新增 createTimeStart/createTimeEnd（按库存行创建时间过滤，与 OMS 现有口径一致）； 3、列表/导出返回新增 purchaseDate 字段，分组查询取 MAX(purchase_date)。说明：历史库存进货日期为空，按进货日期查询查不到存量数据（无来源可回填），区间查询会排除空值行。
2026-08-31 13:41:19 +08:00
parent 2d1e4b5912
commit da84b7bb69
26 changed files with 257 additions and 7 deletions
@@ -210,6 +210,12 @@ public class MaterialInventory extends BaseVOEntity {
    @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date inventoryDate;

+    @ApiModelProperty("进货日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "进货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date purchaseDate;
+
    @ApiModelProperty("ExtAttr3")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -874,6 +874,7 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
            materialInventory.setExtAttr4(materialInventoryParamDO.getExtAttr4());
            materialInventory.setExpiryDate(materialInventoryParamDO.getExpiryDate());
            materialInventory.setInventoryDate(materialInventoryParamDO.getInventoryDate());
+            materialInventory.setPurchaseDate(materialInventoryParamDO.getPurchaseDate());
            materialInventory.setBatchNumber(materialInventoryParamDO.getBatchNumber());
            materialInventory.setUnit(materialBaseInfo.getUnitCode());
            materialInventory.setUnitName(materialBaseInfo.getUnitName());
@@ -194,6 +194,12 @@ public class MaterialInventoryPO extends MaterialBasePO {
    @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date inventoryDate;

+    @ApiModelProperty("进货日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "进货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date purchaseDate;
+
    @ApiModelProperty("ExtAttr3")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -218,6 +218,12 @@ public class MaterialInventoryDO extends MaterialBaseDO {
    @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date inventoryDate;

+    @ApiModelProperty("进货日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "进货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date purchaseDate;
+
    @ApiModelProperty("ExtAttr3")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -253,6 +259,7 @@ public class MaterialInventoryDO extends MaterialBaseDO {
    private String expiryDateStr;
    private String productionDateStr;
    private String updateTimeStr;
+    private String purchaseDateStr;

    private String expiryDateStart;
    private String expiryDateEnd;
@@ -263,6 +270,13 @@ public class MaterialInventoryDO extends MaterialBaseDO {
    private String updateTimeStart;
    private String updateTimeEnd;

+    private String purchaseDateStart;
+    private String purchaseDateEnd;
+
+    /** 入库日期（库存行创建时间）区间查询 */
+    private String createTimeStart;
+    private String createTimeEnd;
+
    @ApiModelProperty("库存分配匹配：箱号/卡板号 token 列表（明细多值拆分后，OR 匹配；空则不参与匹配）")
    private List<String> boxPalletNoList;

@@ -88,6 +88,8 @@ public class MaterialInventoryParamDO extends MaterialBaseDO {
    private Date expiryDate;
    //库存日期
    private Date inventoryDate;
+    //进货日期
+    private Date purchaseDate;
    //扩展字段3
    private Date extAttr3;
    //扩展字段4
@@ -286,6 +286,11 @@ public class ReceiptMaterialDetail extends BaseVOEntity {
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date inventoryDate;

+    @ApiModelProperty("进货日期")
+    @Excel(name = "进货日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date purchaseDate;
+
    @ApiModelProperty("扩展属性1")
    @Excel(name = "扩展属性1")
    @TableField("ext_attr_1")
@@ -770,6 +770,15 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
                            throw new RuntimeException(e);
                        }
                        receiptMaterialDetailDO.setInventoryDate(date);
+                    } else if ("进货日期".equals(batchLabels)) {
+                        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                        Date date = null;
+                        try {
+                            date = sdf.parse(attributeValue);
+                        } catch (ParseException e) {
+                            throw new RuntimeException(e);
+                        }
+                        receiptMaterialDetailDO.setPurchaseDate(date);
                    }
                }
            }
@@ -1274,6 +1283,15 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
                        log.warn("库存日期格式转换失败，物料：{}，原始值：{}", receiptMaterialDetailDO.getMaterialName(), attributeValue);
                    }
                    break;
+                case "进货日期":
+                    try {
+                        if (attributeValue.matches("\\d{4}-\\d{2}-\\d{2}.*")) {
+                            receiptMaterialDetailDO.setPurchaseDate(DateUtils.parseDate(attributeValue));
+                        }
+                    } catch (Exception e) {
+                        log.warn("进货日期格式转换失败，物料：{}，原始值：{}", receiptMaterialDetailDO.getMaterialName(), attributeValue);
+                    }
+                    break;
                case "总净重":
                case "净重(KG)":
                case "净重":
@@ -316,6 +316,11 @@ public class ReceiptMaterialDetailPO extends BaseVOEntity {
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date inventoryDate;

+    @ApiModelProperty("进货日期")
+    @Excel(name = "进货日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date purchaseDate;
+
    @ApiModelProperty("扩展属性1")
    @Excel(name = "扩展属性1")
    private String extAttr1;
@@ -300,6 +300,11 @@ public class ReceiptMaterialDetailDO extends BaseVOEntity {
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date inventoryDate;

+    @ApiModelProperty("进货日期")
+    @Excel(name = "进货日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date purchaseDate;
+
    @ApiModelProperty("扩展属性1")
    @Excel(name = "扩展属性1")
    private String extAttr1;
@@ -301,6 +301,13 @@ public class ShelfMaterialDetail extends BaseVOEntity {
    @TableField("inventory_date")
    private Date inventoryDate;

+    @ApiModelProperty("进货日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "进货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @TableField("purchase_date")
+    private Date purchaseDate;
+
    @ApiModelProperty("ExtAttr3")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -313,6 +313,12 @@ public class ShelfMaterialDetailDO extends BaseVOEntity {
    @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date inventoryDate;

+    @ApiModelProperty("进货日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "进货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date purchaseDate;
+
    @ApiModelProperty("ExtAttr3")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -1493,6 +1493,7 @@ public class StockReceiptOrderDomainService {
                shelfMaterialDetailDO.setTotalGrossWeight(receiptMaterialDetailDO.getTotalGrossWeight());
                shelfMaterialDetailDO.setExpiryDate(receiptMaterialDetailDO.getExpiryDate());
                shelfMaterialDetailDO.setInventoryDate(receiptMaterialDetailDO.getInventoryDate());
+                shelfMaterialDetailDO.setPurchaseDate(receiptMaterialDetailDO.getPurchaseDate());
                shelfMaterialDetailDO.setBatchRefNo(receiptMaterialDetailDO.getBatchRefNo());
                shelfMaterialDetailDO.setSheetRefNo(receiptMaterialDetailDO.getSheetRefNo());
                shelfMaterialDetailDO.setBoxPalletNo(receiptMaterialDetailDO.getBoxPalletNo());
@@ -1533,6 +1534,7 @@ public class StockReceiptOrderDomainService {
                    shelfMaterialDetailDOChildren.setProductionDate(receiptMaterialDetailDOChildren.getProductionDate());
                    shelfMaterialDetailDOChildren.setExpiryDate(receiptMaterialDetailDOChildren.getExpiryDate());
                    shelfMaterialDetailDOChildren.setInventoryDate(receiptMaterialDetailDOChildren.getInventoryDate());
+                    shelfMaterialDetailDOChildren.setPurchaseDate(receiptMaterialDetailDOChildren.getPurchaseDate());
                    shelfMaterialDetailDOChildren.setBatchRefNo(receiptMaterialDetailDOChildren.getBatchRefNo());
                    shelfMaterialDetailDOChildren.setSheetRefNo(receiptMaterialDetailDOChildren.getSheetRefNo());
                    shelfMaterialDetailDOChildren.setBoxPalletNo(receiptMaterialDetailDOChildren.getBoxPalletNo());
@@ -1634,10 +1636,11 @@ public class StockReceiptOrderDomainService {
                shelfMaterialDetailDO.setTotalVolume(receiptMaterialDetailPO.getTotalVolume());
                shelfMaterialDetailDO.setTotalNetWeight(receiptMaterialDetailPO.getTotalNetWeight());
                shelfMaterialDetailDO.setTotalGrossWeight(receiptMaterialDetailPO.getTotalGrossWeight());
-                // 传递生产日期、过期日期、存货日期、Batch Ref NO's、Sheet Ref NO's、箱号/卡板号、扩展属性1-4
+                // 传递生产日期、过期日期、存货日期、进货日期、Batch Ref NO's、Sheet Ref NO's、箱号/卡板号、扩展属性1-4
                shelfMaterialDetailDO.setProductionDate(receiptMaterialDetailPO.getProductionDate());
                shelfMaterialDetailDO.setExpiryDate(receiptMaterialDetailPO.getExpiryDate());
                shelfMaterialDetailDO.setInventoryDate(receiptMaterialDetailPO.getInventoryDate());
+                shelfMaterialDetailDO.setPurchaseDate(receiptMaterialDetailPO.getPurchaseDate());
                shelfMaterialDetailDO.setBatchRefNo(receiptMaterialDetailPO.getBatchRefNo());
                shelfMaterialDetailDO.setSheetRefNo(receiptMaterialDetailPO.getSheetRefNo());
                shelfMaterialDetailDO.setBoxPalletNo(receiptMaterialDetailPO.getBoxPalletNo());
@@ -1686,6 +1689,7 @@ public class StockReceiptOrderDomainService {
                    shelfMaterialDetailDOChildren.setProductionDate(receiptMaterialDetailPOChildren.getProductionDate());
                    shelfMaterialDetailDOChildren.setExpiryDate(receiptMaterialDetailPOChildren.getExpiryDate());
                    shelfMaterialDetailDOChildren.setInventoryDate(receiptMaterialDetailPOChildren.getInventoryDate());
+                    shelfMaterialDetailDOChildren.setPurchaseDate(receiptMaterialDetailPOChildren.getPurchaseDate());
                    shelfMaterialDetailDOChildren.setBatchRefNo(receiptMaterialDetailPOChildren.getBatchRefNo());
                    shelfMaterialDetailDOChildren.setSheetRefNo(receiptMaterialDetailPOChildren.getSheetRefNo());
                    shelfMaterialDetailDOChildren.setBoxPalletNo(receiptMaterialDetailPOChildren.getBoxPalletNo());
@@ -1767,10 +1771,11 @@ public class StockReceiptOrderDomainService {
                shelfMaterialDetailDO.setQuantity(receiptMaterialDetailPO.getReceiptQuantity());
                shelfMaterialDetailDO.setInUniqueId(receiptMaterialDetailPO.getInUniqueId());
                shelfMaterialDetailDO.setReceiptUniqueId(receiptMaterialDetailPO.getUniqueId());
-                // 传递生产日期、过期日期、存货日期、Batch Ref NO's、Sheet Ref NO's、箱号/卡板号、扩展属性1-4
+                // 传递生产日期、过期日期、存货日期、进货日期、Batch Ref NO's、Sheet Ref NO's、箱号/卡板号、扩展属性1-4
                shelfMaterialDetailDO.setProductionDate(receiptMaterialDetailPO.getProductionDate());
                shelfMaterialDetailDO.setExpiryDate(receiptMaterialDetailPO.getExpiryDate());
                shelfMaterialDetailDO.setInventoryDate(receiptMaterialDetailPO.getInventoryDate());
+                shelfMaterialDetailDO.setPurchaseDate(receiptMaterialDetailPO.getPurchaseDate());
                shelfMaterialDetailDO.setBatchRefNo(receiptMaterialDetailPO.getBatchRefNo());
                shelfMaterialDetailDO.setSheetRefNo(receiptMaterialDetailPO.getSheetRefNo());
                shelfMaterialDetailDO.setBoxPalletNo(receiptMaterialDetailPO.getBoxPalletNo());
@@ -1809,10 +1814,11 @@ public class StockReceiptOrderDomainService {
                        shelfMaterialDetailDOChildren.setInUniqueId(receiptMaterialDetailPO.getInUniqueId());
                        // 子项使用自身的 uniqueId 作为 receiptUniqueId，以便正确关联 material_more_detail 中的扩展属性
                        shelfMaterialDetailDOChildren.setReceiptUniqueId(receiptMaterialDetailDOChildren.getUniqueId());
-                        // 传递生产日期、过期日期、存货日期、Batch Ref NO's、Sheet Ref NO's、箱号/卡板号、扩展属性1-4
+                        // 传递生产日期、过期日期、存货日期、进货日期、Batch Ref NO's、Sheet Ref NO's、箱号/卡板号、扩展属性1-4
                        shelfMaterialDetailDOChildren.setProductionDate(receiptMaterialDetailDOChildren.getProductionDate());
                        shelfMaterialDetailDOChildren.setExpiryDate(receiptMaterialDetailDOChildren.getExpiryDate());
                        shelfMaterialDetailDOChildren.setInventoryDate(receiptMaterialDetailDOChildren.getInventoryDate());
+                        shelfMaterialDetailDOChildren.setPurchaseDate(receiptMaterialDetailDOChildren.getPurchaseDate());
                        shelfMaterialDetailDOChildren.setBatchRefNo(receiptMaterialDetailDOChildren.getBatchRefNo());
                        shelfMaterialDetailDOChildren.setSheetRefNo(receiptMaterialDetailDOChildren.getSheetRefNo());
                        shelfMaterialDetailDOChildren.setBoxPalletNo(receiptMaterialDetailDOChildren.getBoxPalletNo());
@@ -1262,6 +1262,7 @@ public class StockShelfOrderDomainService {
                inventoryParamDO.setInventoryDate(shelfMaterialDetail.getInventoryDate());
                inventoryParamDO.setExpiryDate(shelfMaterialDetail.getExpiryDate());
                inventoryParamDO.setProductionDate(shelfMaterialDetail.getProductionDate());
+                inventoryParamDO.setPurchaseDate(shelfMaterialDetail.getPurchaseDate());
                inventoryParamDO.setBoxPalletNo(shelfMaterialDetail.getBoxPalletNo());
                inventoryParamDO.setSheetRefNo(shelfMaterialDetail.getSheetRefNo());
                inventoryParamDO.setBatchRefNo(shelfMaterialDetail.getBatchRefNo());
@@ -1348,6 +1349,7 @@ public class StockShelfOrderDomainService {
                BeanUtils.copyProperties(inventoryParamDO, materialInventoryOmsParamDO);
                materialInventoryOmsParamDO.setProductionDate(materialInventoryPO.getProductionDate());
                materialInventoryOmsParamDO.setExpiryDate(materialInventoryPO.getExpiryDate());
+                materialInventoryOmsParamDO.setPurchaseDate(materialInventoryPO.getPurchaseDate());
                materialInventoryOmsParamDO.setMaterialBaseInfoId(materialInventoryPO.getMaterialBaseInfoId());
                materialInventoryOmsParamDO.setWarehouseId(materialInventoryPO.getWarehouseId());
                materialInventoryOmsParamDO.setLotNumber(materialInventoryPO.getLotNumber());
@@ -1510,6 +1512,9 @@ public class StockShelfOrderDomainService {
                    case "production_date":
                        param.setProductionDate(shelfMaterialDetail.getProductionDate());
                        break;
+                    case "purchase_date":
+                        param.setPurchaseDate(shelfMaterialDetail.getPurchaseDate());
+                        break;
                }
            }
        } else {
@@ -190,9 +190,12 @@ public class MaterialInventoryDTO extends MaterialBaseDTO {
    private Boolean excludeZeroInventoryQuantity;
    private String expiryDate;
    private String productionDate;
+    /** 进货日期（yyyy-MM-dd，单日精确查询） */
+    private String purchaseDate;
    private String expiryDateStr;
    private String productionDateStr;
    private String updateTimeStr;
+    private String purchaseDateStr;

    private String expiryDateStart;
    private String expiryDateEnd;
@@ -203,4 +206,11 @@ public class MaterialInventoryDTO extends MaterialBaseDTO {
    private String updateTimeStart;
    private String updateTimeEnd;

+    private String purchaseDateStart;
+    private String purchaseDateEnd;
+
+    /** 入库日期（库存行创建时间）区间查询 */
+    private String createTimeStart;
+    private String createTimeEnd;
+
 }
@@ -311,6 +311,12 @@ public class ShelfMaterialDetailDTO extends BaseVOEntity {
    @Excel(name = "存货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date inventoryDate;

+    @ApiModelProperty("进货日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "进货日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date purchaseDate;
+
    @ApiModelProperty("ExtAttr3")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -60,6 +60,8 @@ public class MaterialInventoryApi extends BaseController {
                              @RequestParam(value = "excludeZeroInventoryQuantity", required = false) Boolean excludeZeroInventoryQuantity,
                              @RequestParam(value = "expiryDateStart", required = false) String expiryDateStart,
                              @RequestParam(value = "expiryDateEnd", required = false) String expiryDateEnd,
+                              @RequestParam(value = "purchaseDateStart", required = false) String purchaseDateStart,
+                              @RequestParam(value = "purchaseDateEnd", required = false) String purchaseDateEnd,
                              @RequestParam(value = "orderByExpiryDate", required = false) Boolean orderByExpiryDate)
    {
        if (Boolean.TRUE.equals(excludeZeroInventoryQuantity)) {
@@ -91,8 +93,11 @@ public class MaterialInventoryApi extends BaseController {
        MaterialInventoryDO materialInventoryDO = materialInventoryAssembler.toDO(materialInventoryDTO);
        materialInventoryDO.setExpiryDateStr(materialInventoryDTO.getExpiryDate());
        materialInventoryDO.setProductionDateStr(materialInventoryDTO.getProductionDate());
+        materialInventoryDO.setPurchaseDateStr(materialInventoryDTO.getPurchaseDate());
        materialInventoryDO.setExpiryDateStart(expiryDateStart);
        materialInventoryDO.setExpiryDateEnd(expiryDateEnd);
+        materialInventoryDO.setPurchaseDateStart(purchaseDateStart);
+        materialInventoryDO.setPurchaseDateEnd(purchaseDateEnd);
        // 导出场景：queryRule=wlExpiry + orderByExpiryDate=true 时 SQL 按到期日倒序分组（与 OMS 库存查询导出一致）
        materialInventoryDO.setOrderByExpiryDate(orderByExpiryDate);
        Date updateTime = materialInventoryDTO.getUpdateTime();
@@ -167,7 +172,7 @@ public class MaterialInventoryApi extends BaseController {
        // materialDetailId 是新接口专用参数（出库单明细ID），库存 DTO 的同名字段语义是「上架单明细ID」，
        // 泄入原查询会生成错误的 a.material_detail_id 条件导致查空，进原查询前显式清除
        materialInventoryDTO.setMaterialDetailId(null);
-        return list(materialInventoryDTO, customerName, excludeZeroInventoryQuantity, expiryDateStart, expiryDateEnd, orderByExpiryDate);
+        return list(materialInventoryDTO, customerName, excludeZeroInventoryQuantity, expiryDateStart, expiryDateEnd, null, null, orderByExpiryDate);
    }

    @ApiOperation("查询物料库存列表不分页；queryRule=hz 时按货主+物料分组（同一物料在不同货主各占一行）")