feat(oms,wms):库存查询导出新增isExport标识与融合排序 /list 新增可选参数 isExport 标识导出请求(导出显示商品饮用有效期/物料分类/进货日期由查询结果直接返回)；isExport=true 时所有查询维度(OMS 6条/WMS 8条)统一启用导出融合排序：到期日倒序空值最后(保留原 orderByExpiryDate 第一优先级,融合不取代)→同到期日内按物料编码升序→0库存靠后→更新时间倒序→MAX(库存ID)兜底保证分页稳定；各语句挂载公共片段 exportOrderByMaterialCode，不传 isExport 保持原有排序；OMS Controller 在 isExport=true 时跳过 Java 按更新时间重排避免覆盖 SQL 导出排序

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/materialInventory/MaterialInventoryApi.java

@@ -53,7 +53,7 @@ public class MaterialInventoryApi extends BaseController {
     /**
      * 分页查询物料库存列表
      */
-    @ApiOperation(value = "查询物料库存列表", notes = "库存查询页不传 excludeZeroInventoryQuantity 可查出数量为0；出库分配页传 excludeZeroInventoryQuantity=true 排除库存数量为0")
+    @ApiOperation(value = "查询物料库存列表", notes = "库存查询页不传 excludeZeroInventoryQuantity 可查出数量为0；出库分配页传 excludeZeroInventoryQuantity=true 排除库存数量为0；导出复用本接口：传 isExport=true 标识导出请求(导出显示：商品饮用有效期expiryDate/物料分类materialClassifyName/进货日期purchaseDate，所有查询维度均返回)")
     @GetMapping("/list")
     public TableDataInfo list(MaterialInventoryDTO materialInventoryDTO,
                               @RequestParam(value = "customerName", required = false) String customerName,
@@ -62,7 +62,9 @@ public class MaterialInventoryApi extends BaseController {
                               @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)
+                              @RequestParam(value = "orderByExpiryDate", required = false) Boolean orderByExpiryDate,
+                              // 导出标识：导出与查询共用本接口，isExport=true 表示本次请求为导出（导出专属排序等逻辑以此开关）
+                              @RequestParam(value = "isExport", required = false) Boolean isExport)
     {
         if (Boolean.TRUE.equals(excludeZeroInventoryQuantity)) {
             materialInventoryDTO.setExcludeZeroInventoryQuantity(true);
@@ -100,6 +102,8 @@ public class MaterialInventoryApi extends BaseController {
         materialInventoryDO.setPurchaseDateEnd(purchaseDateEnd);
         // 导出场景：queryRule=wlExpiry + orderByExpiryDate=true 时 SQL 按到期日倒序分组（与 OMS 库存查询导出一致）
         materialInventoryDO.setOrderByExpiryDate(orderByExpiryDate);
+        // 导出标识：isExport=true 启用导出融合排序（到期日倒序优先 → 同到期日按物料编码升序，所有维度生效）
+        materialInventoryDO.setIsExport(isExport);
         Date updateTime = materialInventoryDTO.getUpdateTime();
         if (updateTime != null) {
             LocalDateTime localDateTime = updateTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
@@ -172,7 +176,8 @@ public class MaterialInventoryApi extends BaseController {
         // materialDetailId 是新接口专用参数（出库单明细ID），库存 DTO 的同名字段语义是「上架单明细ID」，
         // 泄入原查询会生成错误的 a.material_detail_id 条件导致查空，进原查询前显式清除
         materialInventoryDTO.setMaterialDetailId(null);
-        return list(materialInventoryDTO, customerName, excludeZeroInventoryQuantity, expiryDateStart, expiryDateEnd, null, null, orderByExpiryDate);
+        // assignableList 非导出场景，isExport 传 null
+        return list(materialInventoryDTO, customerName, excludeZeroInventoryQuantity, expiryDateStart, expiryDateEnd, null, null, orderByExpiryDate, null);
     }
 
     @ApiOperation("查询物料库存列表不分页；queryRule=hz 时按货主+物料分组（同一物料在不同货主各占一行）")