From 9cdb5a8896e839ea6085c27e1046fdd7f3055d10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Mon, 9 Feb 2026 14:02:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ShipperLeaseDetailsApi.java               |  6 +++++
 .../StockReceiptOrderDomainService.java       |  5 ++++-
 .../MaterialInventoryMapper.xml               | 22 ++++---------------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/shipperLeaseDetails/ShipperLeaseDetailsApi.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/shipperLeaseDetails/ShipperLeaseDetailsApi.java
index 7b85ec05d..4f560e24d 100644
--- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/shipperLeaseDetails/ShipperLeaseDetailsApi.java
+++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/facadeApi/shipperLeaseDetails/ShipperLeaseDetailsApi.java
@@ -20,7 +20,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 货主租赁明细Api
@@ -148,6 +150,10 @@ public class ShipperLeaseDetailsApi extends BaseController{
     {
         ShipperLeaseDetailsDO shipperLeaseDetailsDO = shipperLeaseDetailsAssembler.toDO(shipperLeaseDetailsDTO);
         List<WarehouseOccupancyRate> warehouseOccupancyRates = leaseApplicationService.warehouseOccupancyRate(shipperLeaseDetailsDO);
+        // 按照businessDate倒序排序
+        warehouseOccupancyRates = warehouseOccupancyRates.stream()
+                .sorted(Comparator.comparing(WarehouseOccupancyRate::getBusinessDate, Comparator.nullsLast(Comparator.reverseOrder())))
+                .collect(Collectors.toList());
         return getDataTable(warehouseOccupancyRates);
     }
 
diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java
index 50eabd41e..d9e0dfb9b 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockReceiptOrder/service/StockReceiptOrderDomainService.java
@@ -336,8 +336,11 @@ public class StockReceiptOrderDomainService {
         if (CollectionUtils.isEmpty(stockReceiptOrderPOList)) {
             throw new ServiceException("收货单不存在或已下发，请重新选择");
         }
-        //是否任务合并下发
+        //是否任务合并下发：如果前端没有传递或为null，默认设置为2（否）
         Integer taskDistributionMerge = stockReceiptOrderDO.getTaskDistributionMerge();
+        if (taskDistributionMerge == null) {
+            taskDistributionMerge = 2; // 默认不合并下发
+        }
         //收货生成任务下发
         genDeliveTask(stockReceiptOrderPOList, stockReceiptOrderDO);
         //标记收货单任务已下发
diff --git a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
index 56383b267..37ff88dfd 100644
--- a/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
+++ b/mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml
@@ -893,30 +893,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="extAttr1 == ''">
             AND a.EXT_ATTR_1 = #{extAttr1}
         </if>
-        <if test="boxPalletNo == ''">
-            AND a.BOX_PALLET_NO = #{boxPalletNo}
-        </if>
-        <if test="sheetRefNo == ''">
-            AND a.SHEET_REF_NO = #{sheetRefNo}
-        </if>
-        <if test="batchRefNo == ''">
-            AND a.BATCH_REF_NO = #{batchRefNo}
-        </if>
+        <!-- 如果 Batch Ref NO's、Sheet Ref NO's、箱号/卡板号三个值为空，忽略这些查询条件 -->
+        <!-- 已移除 boxPalletNo == '' 和 boxPalletNo == null 的查询条件 -->
+        <!-- 已移除 sheetRefNo == '' 和 sheetRefNo == null 的查询条件 -->
+        <!-- 已移除 batchRefNo == '' 和 batchRefNo == null 的查询条件 -->
         <if test="extAttr2 == null">
             AND a.EXT_ATTR_2 is null
         </if>
         <if test="extAttr1 == null">
             AND a.EXT_ATTR_1 is null
         </if>
-        <if test="boxPalletNo == null">
-            AND a.BOX_PALLET_NO is null
-        </if>
-        <if test="sheetRefNo == null">
-            AND a.SHEET_REF_NO is null
-        </if>
-        <if test="batchRefNo == null">
-            AND a.BATCH_REF_NO is null
-        </if>
     </select>
 
     <!-- 根据库存ID查询库存信息（包含批次属性字段） -->