Merge branch 'dev' into feature/dev-0729

# Conflicts:
#	mhd_bms/src/main/resources/bootstrap.yml

mhd_wms/src/main/java/com/mhd/wms/application/service/statementStatistics/StatementStatisticsService.java

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.lang.reflect.Field;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -127,6 +128,7 @@ public class StatementStatisticsService {
             }
         }
         List<ImmediateInventoryPO> immediateInventoryPOS = materialInventoryDomainService.queryImmediateInventoryList(immediateInventoryDO);
+
         // 性能优化：批量获取批次属性，避免N+1查询问题
         // 1. 收集所有唯一的materialBaseInfoId
         Set<Long> materialBaseInfoIdSet = immediateInventoryPOS.stream()
@@ -161,6 +163,19 @@ public class StatementStatisticsService {
         return immediateInventoryPOS;
     }
 
+    /**
+     * 获取库存数量合计
+     * @param immediateInventoryDO 查询参数
+     * @return 库存数量合计
+     */
+    public BigDecimal sumImmediateInventoryQuantity(ImmediateInventoryDO immediateInventoryDO) {
+        BigDecimal totalInventoryQuantity = materialInventoryDomainService.sumImmediateInventoryQuantity(immediateInventoryDO);
+        if (totalInventoryQuantity == null) {
+            totalInventoryQuantity = BigDecimal.ZERO;
+        }
+        return totalInventoryQuantity;
+    }
+
     /**
      * 为物料库存设置更多属性（从库存表中获取值）
      * @param materialInventoryPOList 物料库存列表

mhd_wms/src/main/java/com/mhd/wms/application/service/stockReceiptOrder/StockReceiptOrderApplicationService.java

@@ -2222,24 +2222,31 @@ public class StockReceiptOrderApplicationService {
     }
 
     /**
-     * PDA 抄码收货不采集毛重、体积、面积：在装配前将对应请求字段置 0，避免 getInfo 带回的累计展示值被当作本次增量。
+     * PDA 抄码收货不采集毛重、体积、面积：在装配前将对应请求字段置 null，
+     * 利用 MyBatis-Plus NOT_NULL 策略跳过这些字段，避免覆盖已有累计数据。
+     * @param lines 收货明细列表
      */
     private static void normalizePdaCopyReceiptGrossVolumeAreaToZero(List<ReceiptMaterialDetailDO> lines) {
+        // 没有明细时，直接返回
         if (CollectionUtils.isEmpty(lines)) {
             return;
         }
+        // 有明细时，遍历
         for (ReceiptMaterialDetailDO line : lines) {
+            // 跳过 line 为 null
             if (line == null) {
                 continue;
             }
+            // 在装配之前将字段置为 null
             if (isPdaCopyReceiptLine(line)) {
-                line.setReceiptGrossWeight(BigDecimal.ZERO);
-                line.setTotalGrossWeight(BigDecimal.ZERO);
-                line.setReceiptVolume(BigDecimal.ZERO);
-                line.setTotalVolume(BigDecimal.ZERO);
-                line.setReceiptArea(BigDecimal.ZERO);
-                line.setTotalArea(BigDecimal.ZERO);
+                line.setReceiptGrossWeight(null);
+                line.setTotalGrossWeight(null);
+                line.setReceiptVolume(null);
+                line.setTotalVolume(null);
+                line.setReceiptArea(null);
+                line.setTotalArea(null);
             }
+            // 递归，确保每一个子行都会独立通过 isPdaCopyReceiptLine 判断是否需要清字段
             normalizePdaCopyReceiptGrossVolumeAreaToZero(line.getChildren());
         }
     }

mhd_wms/src/main/java/com/mhd/wms/domain/inventoryAdjustmentRecord/service/InventoryAdjustmentRecordDomainService.java

@@ -1,15 +1,21 @@
 package com.mhd.wms.domain.inventoryAdjustmentRecord.service;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.aliyun.oss.ServiceException;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mhd.common.core.constant.SnowFlakeConstants;
 import com.mhd.common.core.domain.po.UserPo;
+import com.mhd.common.core.domain.po.WarehousePO;
 import com.mhd.common.core.utils.OrderSequence;
 import com.mhd.common.core.utils.uuid.IdGenerator;
+import com.mhd.common.core.utils.StringUtils;
+import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.core.web.domain.BaseVOEntity;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.system.api.OmsServiceFeign;
+import com.mhd.system.api.SystemServiceFeign;
 import com.mhd.system.api.domain.*;
 import com.mhd.system.api.model.LoginUser;
 import com.mhd.wms.domain.inventoryAdjustmentRecord.repository.facade.IInventoryAdjustmentRecordService;
@@ -56,6 +62,8 @@ public class InventoryAdjustmentRecordDomainService {
     private IdGenerator idGenerator;
     @Autowired
     private OmsServiceFeign omsServiceFeign;
+    @Autowired
+    private SystemServiceFeign systemServiceFeign;
 
 
 
@@ -106,6 +114,15 @@ public class InventoryAdjustmentRecordDomainService {
      */
     @Transactional
     public Boolean inventoryAdjust(InventoryAdjustmentRecordDO inventoryAdjustmentRecordDO) {
+        // 根据仓库ID获取仓库信息，用于后续库存调整的仓库判断
+        AjaxResult warehouseInfoByWarehouseId = systemServiceFeign.getWarehouseInfoByWarehouseId(inventoryAdjustmentRecordDO.getWarehouseId());
+        if (warehouseInfoByWarehouseId == null) {
+            throw new ServiceException("仓库不存在");
+        } else if (!warehouseInfoByWarehouseId.get("code").equals(200)) {
+            throw new ServiceException("网络错误请重试 --- " + warehouseInfoByWarehouseId.get("msg"));
+        }
+        // 获取仓库信息
+        WarehousePO warehousePO = JSON.parseObject(JSONObject.toJSONString(warehouseInfoByWarehouseId.get("data")), WarehousePO.class);
         InventoryAdjustmentRecordDO inventoryAdjustmentRecord = new InventoryAdjustmentRecordDO();
         inventoryAdjustmentRecord.setAdjustAction("库存调整");
         LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -115,6 +132,17 @@ public class InventoryAdjustmentRecordDomainService {
         inventoryAdjustmentRecord.setCreateBy(loginUser.getUserid());
         inventoryAdjustmentRecord.setCreateByName(loginUser.getUsername());
         inventoryAdjustmentRecord.setCreateTime(new Date());
+        if (inventoryAdjustmentRecordDO.getAdjustType() == null) {
+            throw new ServiceException("调整类型不能为空");
+        }
+        if (inventoryAdjustmentRecordDO.getAdjustType() == 1
+                && inventoryAdjustmentRecordDO.getMaterialInventoryId() == null) {
+            throw new ServiceException("请选择要调整的库存");
+        }
+        if (inventoryAdjustmentRecordDO.getAdjustQuantity() == null
+                || inventoryAdjustmentRecordDO.getAdjustQuantity().compareTo(BigDecimal.ZERO) == 0) {
+            throw new ServiceException("调整数量不能为空且不能为0");
+        }
         MaterialInventory materialInventory = null;
         //根据调整类型判断,数量调整只调整当前库存记录数量，状态调整减少当前原物料状态库存数量和可用数量，增加到现状态库存数量和可用数量
         if (inventoryAdjustmentRecordDO.getAdjustType() != null && inventoryAdjustmentRecordDO.getAdjustType() == 1) {
@@ -180,8 +208,8 @@ public class InventoryAdjustmentRecordDomainService {
                     .eq(MaterialInventory::getStorageSectionId,inventoryAdjustmentRecordDO.getStorageSectionId())
                     .eq(MaterialInventory::getStorageLocationId,inventoryAdjustmentRecordDO.getStorageLocationId())
                     .eq(MaterialInventory::getMaterialStatusCode,inventoryAdjustmentRecordDO.getAdjustBeforeStatusCode())
-                    .eq(MaterialInventory::getBatchNumber,inventoryAdjustmentRecordDO.getBatchNumber())
-                    .eq(MaterialInventory::getContainerId,inventoryAdjustmentRecordDO.getContainerId())
+                    .eq(StringUtils.isNotBlank(inventoryAdjustmentRecordDO.getBatchNumber()),MaterialInventory::getBatchNumber,inventoryAdjustmentRecordDO.getBatchNumber())
+                    .eq(inventoryAdjustmentRecordDO.getContainerId() != null, MaterialInventory::getContainerId, inventoryAdjustmentRecordDO.getContainerId())
                     .eq(BaseVOEntity::getDelFlag, 1));
             if (ObjectUtil.isNotNull(materialInventory)) {
                 BeanUtils.copyProperties(materialInventory, inventoryAdjustmentRecord);
@@ -218,6 +246,8 @@ public class InventoryAdjustmentRecordDomainService {
                 inventoryAdjustmentRecord.setAdjustedGrossWeight(materialInventory.getGrossWeight());
                 inventoryAdjustmentRecord.setAdjustedVolume(materialInventory.getVolume());
                 inventoryAdjustmentRecord.setAdjustedArea(materialInventory.getArea());
+                // ===== 新增：原状态库存扣减后立即落库，避免依赖末尾统一更新 =====
+                materialInventoryService.updateById(materialInventory);
             } else {
                 throw new ServiceException("根据原物料状态查询不到物料库存信息！");
             }
@@ -228,8 +258,8 @@ public class InventoryAdjustmentRecordDomainService {
                     .eq(MaterialInventory::getStorageSectionId,inventoryAdjustmentRecordDO.getStorageSectionId())
                     .eq(MaterialInventory::getStorageLocationId,inventoryAdjustmentRecordDO.getStorageLocationId())
                     .eq(MaterialInventory::getMaterialStatusCode,inventoryAdjustmentRecordDO.getAdjustAfterStatusCode())
-                    .eq(MaterialInventory::getBatchNumber,inventoryAdjustmentRecordDO.getBatchNumber())
-                    .eq(MaterialInventory::getContainerId,inventoryAdjustmentRecordDO.getContainerId())
+                    .eq(StringUtils.isNotBlank(inventoryAdjustmentRecordDO.getBatchNumber()),MaterialInventory::getBatchNumber,inventoryAdjustmentRecordDO.getBatchNumber())
+                    .eq(inventoryAdjustmentRecordDO.getContainerId() != null,MaterialInventory::getContainerId,inventoryAdjustmentRecordDO.getContainerId())
                     .eq(BaseVOEntity::getDelFlag, 1));
             if (ObjectUtil.isNotNull(materialInventory1)) {
                 materialInventory1.setInventoryQuantity(materialInventory1.getInventoryQuantity().add(inventoryAdjustmentRecordDO.getAdjustQuantity()));
@@ -245,21 +275,49 @@ public class InventoryAdjustmentRecordDomainService {
             inventoryAdjustmentRecord.setAdjustAfterStatusCode(inventoryAdjustmentRecordDO.getAdjustAfterStatusCode());
             inventoryAdjustmentRecord.setAdjustAfterStatusName(inventoryAdjustmentRecordDO.getAdjustAfterStatusName());
         }
+        // ===== 新增：adjustType 合法性兜底，避免异常类型导致 materialInventory 为 null 静默走完流程 =====
+        if (ObjectUtil.isNull(materialInventory)) {
+            throw new ServiceException("不支持的调整类型：" + inventoryAdjustmentRecordDO.getAdjustType());
+        }
         //生成库存调整追溯记录
         if (ObjectUtil.isNotNull(materialInventory)){
             genInventoryStandingDetail(materialInventory, inventoryAdjustmentRecordDO.getAdjustQuantity());
         }
 
-
-        materialInventoryService.updateById(materialInventory);
+        // ===== 修复：末尾更新加 null 保护 =====
+        if (ObjectUtil.isNotNull(materialInventory)) {
+            materialInventoryService.updateById(materialInventory);
+        }
         Boolean insert = inventoryAdjustmentRecordService.insert(inventoryAdjustmentRecord);
         //推送oms库存调整记录
-        pushOms(materialInventory, inventoryAdjustmentRecordDO);
+        try{
+            // 当仓库启用 oms 才进行推送
+            if (warehousePO.getIsEnable() == 1) {
+                Boolean pushSuccess = pushOms(materialInventory, inventoryAdjustmentRecordDO);
+                if (!pushSuccess) {
+                    throw new ServiceException("库存调整推送OMS失败，请稍后重试");
+                }
+            }
+        }catch (Exception e){
+            log.error("推送OMS库存调整记录异常，materialBaseInfoId={}, adjustDirection={}",
+                    inventoryAdjustmentRecordDO.getMaterialBaseInfoId(),
+                    inventoryAdjustmentRecordDO.getAdjustDirection());
+            throw new ServiceException("库存调整推送OMS失败，请稍后重试");
+        }
+        System.out.println("库存调整时间结束 ----" + System.currentTimeMillis());
         return insert;
     }
 
-
-    private void pushOms(MaterialInventory materialInventory,InventoryAdjustmentRecordDO inventoryAdjustmentRecordDO) {
+    /**
+     * 推送库存调整信息至OMS系统
+     * <p>
+     * 根据调整方向（1=增加库存，2=减少库存）分别构造入库调整单或出库调整单，
+     * 并通过Feign接口推送至OMS系统，同时推送对应的物料明细信息。
+     *
+     * @param materialInventory          调整涉及的物料库存信息，包含仓库、库区、库位、货主等上下文数据
+     * @param inventoryAdjustmentRecordDO 库存调整记录，包含调整方向、调整数量、物料编码等数据
+     */
+    private Boolean pushOms(MaterialInventory materialInventory,InventoryAdjustmentRecordDO inventoryAdjustmentRecordDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
         UserPo userPo = loginUser.getUserPo();
         MaterialBaseInfo materialBaseInfo = materialBaseInfoService.getById(materialInventory.getMaterialBaseInfoId());
@@ -327,8 +385,16 @@ public class InventoryAdjustmentRecordDomainService {
             inMaterialDetail.setStorageLocationCode(materialInventory.getStorageLocationCode());
             inMaterialDetail.setStorageLocationName(materialInventory.getStorageLocationName());
             inMaterialDetail.setSingleGrossWeight(materialBaseInfo.getWeightLimit());
-            omsServiceFeign.pushInOrder(stockInOrder);
-            omsServiceFeign.pushInOrderDetail(inMaterialDetail);
+            AjaxResult inOrderResult = omsServiceFeign.pushInOrder(stockInOrder);
+            AjaxResult inOrderDetailResult = omsServiceFeign.pushInOrderDetail(inMaterialDetail);
+            if (inOrderResult == null || inOrderDetailResult == null
+                || !"200".equals(String.valueOf(inOrderResult.get("code")))
+                || !"200".equals(String.valueOf(inOrderDetailResult.get("code")))
+            ) {
+                log.error("推送OMS入库调整单失败，pushInOrder={}, pushInOrderDetail={}",
+                        inOrderResult, inOrderDetailResult);
+                return false;
+            }
         } else {
             StockOutOrderTZPD stockOutOrder = new StockOutOrderTZPD();
             stockOutOrder.setOrganizationId(loginUser.getUserPo().getOrganizationId());
@@ -391,9 +457,18 @@ public class InventoryAdjustmentRecordDomainService {
             outMaterialDetail.setStorageLocationCode(materialInventory.getStorageLocationCode());
             outMaterialDetail.setStorageLocationName(materialInventory.getStorageLocationName());
             outMaterialDetail.setSingleGrossWeight(materialBaseInfo.getWeightLimit());
-            omsServiceFeign.pushOutOrder(stockOutOrder);
-            omsServiceFeign.pushOutOrderDetail(outMaterialDetail);
+            AjaxResult inOrderResult = omsServiceFeign.pushOutOrder(stockOutOrder);
+            AjaxResult inOrderDetailResult = omsServiceFeign.pushOutOrderDetail(outMaterialDetail);
+            if (inOrderResult == null || inOrderDetailResult == null
+                    || !"200".equals(String.valueOf(inOrderResult.get("code")))
+                    || !"200".equals(String.valueOf(inOrderDetailResult.get("code")))
+            ) {
+                log.error("推送OMS入库调整单失败，pushInOrder={}, pushInOrderDetail={}",
+                        inOrderResult, inOrderDetailResult);
+                return false;
+            }
         }
+        return true;
     }
 
     /**

mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/facade/IMaterialInventoryService.java

@@ -71,6 +71,12 @@ public interface IMaterialInventoryService extends IService<MaterialInventory>
      */
     public List<ImmediateInventoryPO> queryImmediateInventoryList(ImmediateInventoryDO immediateInventoryDO);
 
+    /**
+     * 查询即时库存合计数量
+     */
+    public BigDecimal sumImmediateInventoryQuantity(ImmediateInventoryDO immediateInventoryDO);
+
+
     /**
      * @description 增加指定库存
      * @author ZhouGY

mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/mapper/MaterialInventoryMapper.java

@@ -38,6 +38,8 @@ public interface MaterialInventoryMapper extends BaseMapper<MaterialInventory>
     public List<MaterialInventoryPO> queryListByHz(MaterialInventoryDO materialInventoryDO);
     //查物料库存列表-货主+物料（同一物料在不同货主下各一行）
     public List<MaterialInventoryPO> queryListByHzWl(MaterialInventoryDO materialInventoryDO);
+    //查物料库存列表-按货主+物料+仓库（库存查询第三个页签，update_time 取合并后最大值）
+    public List<MaterialInventoryPO> queryListByHzWlUnit(MaterialInventoryDO materialInventoryDO);
 
     /**
      * @description 批量增加库存
@@ -91,6 +93,12 @@ public interface MaterialInventoryMapper extends BaseMapper<MaterialInventory>
      */
     public List<ImmediateInventoryPO> queryImmediateInventoryList(ImmediateInventoryDO immediateInventoryDO);
 
+    /**
+     * 查询即时库存合计数量（与列表相同筛选条件，返回库存数量总和）
+     */
+    public BigDecimal sumImmediateInventoryQuantity(ImmediateInventoryDO immediateInventoryDO);
+
+
 
     @Select("SELECT SUM(inventory_quantity) FROM material_inventory a  LEFT JOIN material_base_info b ON a.material_base_info_id = b.material_base_info_id WHERE  a.del_flag = 1 AND b.shipper_id = #{shipperId} AND b.material_base_info_id =  #{materialBaseInfoId}")
     public BigDecimal sumInventoryQuantityByShipperAndMaterialCode(@Param("shipperId") Long shipperId, @Param("materialBaseInfoId") Long materialBaseInfoId);

mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/persistence/MaterialInventoryImpl.java

@@ -77,17 +77,19 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
         String queryRule = materialInventoryDO.getQueryRule();
         if ("hz".equals(queryRule)) {
             return materialInventoryMapper.queryListByHz(materialInventoryDO);
-        } else if ("hzwl".equals(queryRule)) {
+        } else if ("hzwl".equals(queryRule)) {          //  货主查询
             return materialInventoryMapper.queryListByHzWl(materialInventoryDO);
-        } else if ("wl".equals(queryRule)) {
+        } else if ("wl".equals(queryRule)) {          //  物料查询
             return materialInventoryMapper.queryListByWl(materialInventoryDO);
         } else if ("kw".equals(queryRule)) {
             return materialInventoryMapper.queryListByKw(materialInventoryDO);
-        } else if ("wlkw".equals(queryRule)) {
+        } else if ("wlkw".equals(queryRule)) {      //  物料/库位查询
             return materialInventoryMapper.queryListByWlKw(materialInventoryDO);
-        } else if ("wlExpiry".equals(queryRule)) {
+        } else if ("wlExpiry".equals(queryRule)) {  // 物料/过期日期查询
             return materialInventoryMapper.queryListByWlExpiry(materialInventoryDO);
-        } else if ("all".equals(queryRule)) {
+        } else if("hzwlunit".equals(queryRule)){    // 货主/物料查询
+            return materialInventoryMapper.queryListByHzWlUnit(materialInventoryDO);
+        }else if ("all".equals(queryRule)) {       // 全部查询
             return materialInventoryMapper.queryList(materialInventoryDO);
         } else {
             //不传返回全部
@@ -464,11 +466,29 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
         }
     }
 
+    /**
+     * 分页查询即时库存列表
+     *
+     * @param immediateInventoryDO 即时库存查询条件（含组织权限、货主、物料、仓库、数量区间等筛选条件）
+     * @return 即时库存列表
+     */
     @Override
     public List<ImmediateInventoryPO> queryImmediateInventoryList(ImmediateInventoryDO immediateInventoryDO) {
         return materialInventoryMapper.queryImmediateInventoryList(immediateInventoryDO);
     }
 
+    /**
+     * 查询即时库存合计数量
+     * <p>与列表查询使用相同筛选条件但不分页，统计筛选条件下所有库存数量之和</p>
+     *
+     * @param immediateInventoryDO 即时库存查询条件（与列表查询保持一致，保证合计口径一致）
+     * @return 库存数量合计值，无数据时为 0
+     */
+    @Override
+    public BigDecimal sumImmediateInventoryQuantity(ImmediateInventoryDO immediateInventoryDO) {
+        return materialInventoryMapper.sumImmediateInventoryQuantity(immediateInventoryDO);
+    }
+
     /**
      * @description 增加指定库存
      * @author ZhouGY

mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/service/MaterialInventoryDomainService.java

@@ -103,6 +103,20 @@ public class MaterialInventoryDomainService {
         return materialInventoryService.queryImmediateInventoryList(immediateInventoryDO);
     }
 
+    /**
+     * 查询即时库存合计数量
+     */
+    public BigDecimal sumImmediateInventoryQuantity(ImmediateInventoryDO immediateInventoryDO) {
+        return materialInventoryService.sumImmediateInventoryQuantity(immediateInventoryDO);
+    }
+
+    /**
+     * 根据查询条件获取物料库存信息
+     * <p>按货主、组织、物料、仓库、库位等条件查询，返回汇总后的库存信息（含库存数量合计）</p>
+     *
+     * @param materialInventoryDO 物料库存查询条件（含货主、顶级组织、物料基础信息、仓库、库位等）
+     * @return 匹配条件的物料库存信息，无匹配数据时返回 null
+     */
     public MaterialInventoryPO selectOneByWhere(MaterialInventoryDO materialInventoryDO) {
         return materialInventoryService.selectOneByWhere(materialInventoryDO);
     }

mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/repository/persistence/ReceiptMaterialDetailImpl.java

@@ -459,6 +459,7 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
                     ReceiptMaterialDetail receiptMaterialDetailChild = new ReceiptMaterialDetail();
                     BeanUtils.copyProperties(receiptMaterialDetailDOChild, receiptMaterialDetailChild);
                     alignPersistedReceiptQuantityToCumulative(receiptMaterialDetailDOChild, receiptMaterialDetailChild);
+                    normalizeZeroMetricsToNull(receiptMaterialDetailChild);
                     receiptMaterialDetailChild.setCreateBy(loginUser.getUserid());
                     receiptMaterialDetailChild.setCreateByName(loginUser.getUsername());
                     receiptMaterialDetailChild.setCreateTime(new Date());
@@ -474,9 +475,12 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
                     }
                 }
             }
+
             ReceiptMaterialDetail receiptMaterialDetail = new ReceiptMaterialDetail();
             BeanUtils.copyProperties(receiptMaterialDetailDO, receiptMaterialDetail);
             alignPersistedReceiptQuantityToCumulative(receiptMaterialDetailDO, receiptMaterialDetail);
+            // total* 字段为 0 或空字符串时置为 null，避免 MyBatis-Plus NOT_NULL 策略下覆盖已有数据
+            normalizeZeroMetricsToNull(receiptMaterialDetail);
             receiptMaterialDetail.setUpdateBy(loginUser.getUserid());
             receiptMaterialDetail.setUpdateByName(loginUser.getUsername());
             receiptMaterialDetail.setUpdateTime(new Date());
@@ -488,23 +492,25 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
         }
         //保存物料明细信息
         saveOrUpdateBatch(receiptMaterialDetailList);
+        //批量新增/更新物料更多属性：保留已有值，仅更新有值的属性，不再先删后插
+        mergeMaterialMoreDetail(materialMoreDetailList, stockReceiptOrderDO, receiptMaterialDetailDOList);
         //批量新增/更新物料更多属性：先删除该收货单下所有明细的旧批次属性，再插入新值，避免重复插入导致更新失效
-        if (!CollectionUtils.isEmpty(materialMoreDetailList)){
-            String receiptOrderNumber = stockReceiptOrderDO.getReceiptOrderNumber();
-            if (StringUtils.isBlank(receiptOrderNumber) && !CollectionUtils.isEmpty(receiptMaterialDetailDOList)) {
-                receiptOrderNumber = receiptMaterialDetailDOList.get(0).getReceiptOrderNumber();
-            }
-            if (StringUtils.isNotBlank(receiptOrderNumber)) {
-                java.util.Set<Long> uniqueIds = collectReceiptDetailUniqueIds(receiptMaterialDetailDOList);
-                if (!uniqueIds.isEmpty()) {
-                    IMaterialMoreDetailService.remove(new QueryWrapper<MaterialMoreDetail>()
-                            .eq("order_number", receiptOrderNumber)
-                            .in("material_detail_unique_id", uniqueIds)
-                            .eq("del_flag", 1));
-                }
-            }
-            IMaterialMoreDetailService.saveBatch(materialMoreDetailList);
-        }
+//        if (!CollectionUtils.isEmpty(materialMoreDetailList)){
+//            String receiptOrderNumber = stockReceiptOrderDO.getReceiptOrderNumber();
+//            if (StringUtils.isBlank(receiptOrderNumber) && !CollectionUtils.isEmpty(receiptMaterialDetailDOList)) {
+//                receiptOrderNumber = receiptMaterialDetailDOList.get(0).getReceiptOrderNumber();
+//            }
+//            if (StringUtils.isNotBlank(receiptOrderNumber)) {
+//                java.util.Set<Long> uniqueIds = collectReceiptDetailUniqueIds(receiptMaterialDetailDOList);
+//                if (!uniqueIds.isEmpty()) {
+//                    IMaterialMoreDetailService.remove(new QueryWrapper<MaterialMoreDetail>()
+//                            .eq("order_number", receiptOrderNumber)
+//                            .in("material_detail_unique_id", uniqueIds)
+//                            .eq("del_flag", 1));
+//                }
+//            }
+//            IMaterialMoreDetailService.saveBatch(materialMoreDetailList);
+//        }
         //批量新增序列号
         if (!CollectionUtils.isEmpty(materialDetailSerialNumberList)){
             inMaterialDetailSerialNumberService.saveBatch(materialDetailSerialNumberList);
@@ -513,6 +519,144 @@ public class ReceiptMaterialDetailImpl extends ServiceImpl<ReceiptMaterialDetail
         updateInMaterialDetailFromAttributeOption(receiptMaterialDetailDOList);
     }
 
+    /**
+     * 批量合并物料更多属性：有值则更新，无值跳过保留旧值，不存在则新增。
+     * 替代原先「先 DELETE 全部再 INSERT」的策略，避免未填写字段丢失已有数据。
+     * @param materialMoreDetailList     本次收货提交的批次属性列表
+     * @param stockReceiptOrderDO        收货单信息，用于获取收货单号
+     * @param receiptMaterialDetailDOList 收货明细列表，用于提取 uniqueId 集合
+     */
+    private void mergeMaterialMoreDetail(List<MaterialMoreDetail> materialMoreDetailList,
+                                         StockReceiptOrderDO stockReceiptOrderDO,
+                                         List<ReceiptMaterialDetailDO> receiptMaterialDetailDOList) {
+        // 无批次属性则直接返回
+        if (CollectionUtils.isEmpty(materialMoreDetailList)) {
+            return;
+        }
+        // 无收货单号无法做增量更新，退回全量插入
+        String receiptOrderNumber = stockReceiptOrderDO.getReceiptOrderNumber();
+        if (StringUtils.isBlank(receiptOrderNumber) && !CollectionUtils.isEmpty(receiptMaterialDetailDOList)) {
+            receiptOrderNumber = receiptMaterialDetailDOList.get(0).getReceiptOrderNumber();
+        }
+        // 无收货单号无法做增量更新，退回全量插入
+        if (StringUtils.isBlank(receiptOrderNumber)) {
+            IMaterialMoreDetailService.saveBatch(materialMoreDetailList);
+            return;
+        }
+        // 无明细唯一ID无法做增量更新，退回全量插入
+        java.util.Set<Long> uniqueIds = collectReceiptDetailUniqueIds(receiptMaterialDetailDOList);
+        if (uniqueIds.isEmpty()) {
+            IMaterialMoreDetailService.saveBatch(materialMoreDetailList);
+            return;
+        }
+        // 查询已存在的批次属性记录
+        List<MaterialMoreDetail> existingList = IMaterialMoreDetailService.list(
+                new QueryWrapper<MaterialMoreDetail>()
+                        .eq("order_number", receiptOrderNumber) // 收货单号
+                        .in("material_detail_unique_id", uniqueIds) // 明细唯一ID
+                        .eq("del_flag", 1)); // 删除标志
+        // 按 materialDetailUniqueId + batchDetailId 构建索引
+        Map<String, MaterialMoreDetail> existingMap = new HashMap<>();
+        for (MaterialMoreDetail existing : existingList) {
+            String key = buildMaterialMoreDetailKey(existing.getMaterialDetailUniqueId(), existing.getBatchDetailId());
+            existingMap.put(key, existing);
+        }
+        // 分离：需要更新的 以及 需要新增的；跳过空值（保留旧数据）
+        List<MaterialMoreDetail> toUpdate = new ArrayList<>();
+        List<MaterialMoreDetail> toInsert = new ArrayList<>();
+        for (MaterialMoreDetail incoming : materialMoreDetailList) {
+            // attributeValue 为空/空白时跳过，不覆盖已有数据
+            if (StringUtils.isBlank(incoming.getAttributeValue())) {
+                continue;
+            }
+            // 按 materialDetailUniqueId + batchDetailId 构建索引
+            String key = buildMaterialMoreDetailKey(incoming.getMaterialDetailUniqueId(), incoming.getBatchDetailId());
+            // 已存在的批次属性记录
+            MaterialMoreDetail existing = existingMap.get(key);
+            // 存在则更新 ，不存在则新增
+            if (existing != null) {
+                // 设置主键走 update，保留已有记录的 id
+                incoming.setMaterialMoreDetailId(existing.getMaterialMoreDetailId());
+                // 更新现有记录
+                toUpdate.add(incoming);
+            } else {
+                // 插入新的记录
+                toInsert.add(incoming);
+            }
+        }
+        // 判断需更新的记录是否存在，存在则更新
+        if (!toUpdate.isEmpty()) {
+            IMaterialMoreDetailService.updateBatchById(toUpdate);
+        }
+        // 判断是否存在需新增的记录，存在则批量插入
+        if (!toInsert.isEmpty()) {
+            IMaterialMoreDetailService.saveBatch(toInsert);
+        }
+    }
+
+    /**
+     * 构建批次属性索引
+     * @param materialDetailUniqueId 明细唯一ID
+     * @param batchDetailId          批次属性ID
+     * @return 批次属性索引
+     */
+    private static String buildMaterialMoreDetailKey(Long materialDetailUniqueId, Long batchDetailId) {
+        return (materialDetailUniqueId != null ? materialDetailUniqueId : "null") + "_"
+                + (batchDetailId != null ? batchDetailId : "null");
+    }
+
+    /**
+     * 将 total* 指标字段中值为 0 的置为 null。
+     * MyBatis-Plus 默认 NOT_NULL 策略下，null 不参与 SET 子句，已有数据得以保留。
+     * 注意：仅对「未填写」场景生效；用户确实需要填 0 的极端场景不受影响（因前端通常传 null 表示未填）。
+     * @param receiptMaterialDetail 收货明细
+     * 需保证 total* 字段已赋值。
+     * 需保证 alreadyReceipt* 字段已赋值。
+     *      静态方法修改 receiptMaterialDetail 参数
+     **/
+    private static void normalizeZeroMetricsToNull(ReceiptMaterialDetail receiptMaterialDetail) {
+        // entity 为 null 时直接返回
+        if (receiptMaterialDetail == null) {
+            return;
+        }
+        // receiptMaterialDetail totalNetWeight 字段为 0 时置为 null
+        if (isZeroBigDecimal(receiptMaterialDetail.getTotalNetWeight())) {
+            receiptMaterialDetail.setTotalNetWeight(null);
+        }
+        // receiptMaterialDetail totalGrossWeight 字段为 0 时置为 null
+        if (isZeroBigDecimal(receiptMaterialDetail.getTotalGrossWeight())) {
+            receiptMaterialDetail.setTotalGrossWeight(null);
+        }
+        // receiptMaterialDetail totalVolume 字段为 0 时置为 null
+        if (isZeroBigDecimal(receiptMaterialDetail.getTotalVolume())) {
+            receiptMaterialDetail.setTotalVolume(null);
+        }
+        // receiptMaterialDetail totalArea 字段为 0 时置为 null
+        if (isZeroBigDecimal(receiptMaterialDetail.getTotalArea())) {
+            receiptMaterialDetail.setTotalArea(null);
+        }
+        // receiptMaterialDetail alreadyReceiptNetWeight 字段为 0 时置为 null
+        if (isZeroBigDecimal(receiptMaterialDetail.getAlreadyReceiptNetWeight())) {
+            receiptMaterialDetail.setAlreadyReceiptNetWeight(null);
+        }
+        // receiptMaterialDetail alreadyReceiptGrossWeight 字段为 0 时置为 null
+        if (isZeroBigDecimal(receiptMaterialDetail.getAlreadyReceiptGrossWeight())) {
+            receiptMaterialDetail.setAlreadyReceiptGrossWeight(null);
+        }
+        // receiptMaterialDetail alreadyReceiptVolume 字段为 0 时置为 null
+        if (isZeroBigDecimal(receiptMaterialDetail.getAlreadyReceiptVolume())) {
+            receiptMaterialDetail.setAlreadyReceiptVolume(null);
+        }
+        // receiptMaterialDetail alreadyReceiptArea 字段为 0 时置为 null
+        if (isZeroBigDecimal(receiptMaterialDetail.getAlreadyReceiptArea())) {
+            receiptMaterialDetail.setAlreadyReceiptArea(null);
+        }
+    }
+
+    private static boolean isZeroBigDecimal(BigDecimal val) {
+        return val != null && val.compareTo(BigDecimal.ZERO) == 0;
+    }
+
     private void setMore(ReceiptMaterialDetailDO receiptMaterialDetailDO) {
         List<MaterialMoreDetailDO> materialMoreDetailList = receiptMaterialDetailDO.getMaterialMoreDetailList();
         if (!CollectionUtils.isEmpty(materialMoreDetailList)) {

mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/po/ReviewOrderPO.java

@@ -2,6 +2,8 @@ package com.mhd.wms.domain.reviewOrder.repository.po;
 
 import com.mhd.common.core.web.domain.BaseVOEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,24 +20,28 @@ import java.util.List;
 @ApiModel(value = "复核单主表", description = "复核单主表展示")
 public class ReviewOrderPO extends BaseVOEntity {
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty("复核单主键")
     private Long reviewOrderId;
 
     @ApiModelProperty("复核单号")
     private String reviewOrderNumber;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty("出库单ID")
     private Long outOrderId;
 
     @ApiModelProperty("出库单号")
     private String outOrderNumber;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty("组织ID")
     private Long organizationId;
 
     @ApiModelProperty("组织名称")
     private String organizationName;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty("一级组织ID")
     private Long topOrganizationId;
 
@@ -50,6 +56,7 @@ public class ReviewOrderPO extends BaseVOEntity {
     @ApiModelProperty("复核下发时间")
     private Date issuedTime;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty("仓库ID")
     private Long warehouseId;
 
@@ -59,6 +66,7 @@ public class ReviewOrderPO extends BaseVOEntity {
     @ApiModelProperty("仓库名称")
     private String warehouseName;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty("客户ID")
     private Long customerId;
 
@@ -68,6 +76,7 @@ public class ReviewOrderPO extends BaseVOEntity {
     @ApiModelProperty("客户名称")
     private String customerName;
 
+    @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty("货主ID")
     private Long shipperId;
 

mhd_wms/src/main/java/com/mhd/wms/domain/statementStatistics/po/ImmediateInventoryPO.java

@@ -42,6 +42,10 @@ public class ImmediateInventoryPO {
     @Excel(name = "物料条形码")
     private String barCode;
 
+    @ApiModelProperty("规格型号")
+    @Excel(name = "规格型号")
+    private String specificationModel;
+
     @ApiModelProperty("库存数量")
     @Excel(name = "库存数量")
     private BigDecimal inventoryQuantity;

mhd_wms/src/main/java/com/mhd/wms/domain/statementStatistics/todo/ImmediateInventoryDO.java

@@ -44,6 +44,10 @@ public class ImmediateInventoryDO extends BaseVOEntity {
     @Excel(name = "物料条形码")
     private String barCode;
 
+    @ApiModelProperty("规格型号")
+    @Excel(name = "规格型号")
+    private String specificationModel;
+
     @ApiModelProperty("仓库id")
     @Excel(name = "仓库id")
     private Long warehouseId;

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/statementStatistics/ImmediateInventoryDTO.java

@@ -45,6 +45,10 @@ public class ImmediateInventoryDTO {
     @Excel(name = "物料条形码")
     private String barCode;
 
+    @ApiModelProperty("规格型号")
+    @Excel(name = "规格型号")
+    private String specificationModel;
+
     @ApiModelProperty("仓库id")
     @Excel(name = "仓库id")
     private Long warehouseId;

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/statementStatistics/StatementStatisticsApi.java

@@ -23,6 +23,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -48,13 +50,14 @@ public class StatementStatisticsApi {
      */
     @ApiOperation("查询即时库存列表")
     @GetMapping("/queryImmediateInventoryList")
-    public TableDataInfo queryImmediateInventoryList(ImmediateInventoryDTO immediateInventoryDTO)
+    public HashMap<String, Object> queryImmediateInventoryList(ImmediateInventoryDTO immediateInventoryDTO)
     {
         //转换实体
         ImmediateInventoryDO immediateInventoryDO = immediateInventoryAssembler.toDO(immediateInventoryDTO);
         startPage();
         List<ImmediateInventoryPO> list = statementStatisticsService.queryImmediateInventoryList(immediateInventoryDO);
-        return getDataTable(list);
+        BigDecimal bigDecimal = statementStatisticsService.sumImmediateInventoryQuantity(immediateInventoryDO);
+        return getDataTableWarehouse(list,bigDecimal);
     }
     /**
      * 分页查询入库日报表列表
@@ -129,4 +132,18 @@ public class StatementStatisticsApi {
         rspData.setTotal(new PageInfo(list).getTotal());
         return rspData;
     }
+
+    /**
+     * 响应请求分页、仓库数量 数据
+     */
+    protected HashMap<String, Object> getDataTableWarehouse(List<?> list,BigDecimal bigDecimal)
+    {
+        HashMap<String, Object> stringObjectHashMap = new HashMap<>();
+        stringObjectHashMap.put("data",list);
+        stringObjectHashMap.put("total",new PageInfo(list).getTotal());
+        stringObjectHashMap.put("code",HttpStatus.SUCCESS);
+        stringObjectHashMap.put("msg","查询成功");
+        stringObjectHashMap.put("totalInventoryQuantity",bigDecimal);
+        return stringObjectHashMap;
+    }
 }

mhd_wms/src/main/resources/mapper/handoverTaskOrder/HandoverTaskOrderMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.mhd.wms.domain.handoverTaskOrder.repository.mapper.HandoverTaskOrderMapper">
     
     <resultMap type="com.mhd.wms.domain.handoverTaskOrder.repository.po.HandoverTaskOrderPO" id="HandoverTaskOrderResult">
-        <result property="handoverTaskOrderId"    column="handover_task_order_id"    />
+        <id property="handoverTaskOrderId"    column="handover_task_order_id"    />
         <result property="organizationId"    column="organization_id"    />
         <result property="organizationName"    column="organization_name"    />
         <result property="topOrganizationId"    column="top_organization_id"    />
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <sql id="selectHandoverTaskOrderPo">
-        a.handover_task_order_id, a.organization_id, a.organization_name, a.top_organization_id, a.serial_number, a.task_number, a.status, a.platform_id,
+        a.handover_task_order_id AS handover_task_order_id, a.organization_id, a.organization_name, a.top_organization_id, a.serial_number, a.task_number, a.status, a.platform_id,
         a.platform_code, a.platform_name, a.platform_use_time_id, a.platform_use_start_time, a.platform_use_end_time, a.platform_use_status,
         a.order_type_code, a.order_type_name, a.expect_time, a.warehouse_id, a.warehouse_code, a.warehouse_name,         a.shipper_id,
         a.shipper_name, a.order_number, a.picking_order_number, a.remark, a.task_distribution, a.task_distribution_time, a.create_time, a.create_by, a.create_by_name, a.update_time,

mhd_wms/src/main/resources/mapper/materialInventory/MaterialInventoryMapper.xml

@@ -162,7 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and a.material_base_info_id = #{materialBaseInfoId}
         </if>
         <if test="materialDetailId != null ">
-            and a.material_detail_id, = #{materialDetailId}
+            and a.material_detail_id = #{materialDetailId}
         </if>
         <!-- 容器号或批次号：containerOrBatch 优先；若 batchNumber 与 containerCode 相同则按 OR 查（PDA 单输入框传两个相同值） -->
         <choose>
@@ -313,7 +313,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and mi.material_base_info_id = #{materialBaseInfoId}
         </if>
         <if test="materialDetailId != null ">
-            and mi.material_detail_id, = #{materialDetailId}
+            and mi.material_detail_id = #{materialDetailId}
         </if>
         <choose>
             <when test="containerOrBatch != null and containerOrBatch != ''">
@@ -528,6 +528,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  loc.storage_location_id, loc.storage_location_code, loc.storage_location_name order by sort_order, a.update_time desc
     </select>
 
+    <!-- ============ 按货主+物料+仓库+单位 汇总（库存查询第三个页签） ============ -->
+    <!-- SELECT 列：需求字段，全部聚合；包装单位优先库存表，回退物料基础信息表 -->
+    <sql id="selectMaterialInventoryPoByHzWlUnit">
+        a.shipper_id, a.shipper_code, a.shipper_name,
+    b.material_base_info_id, b.material_code, b.material_name, b.SPECIFICATION_MODEL,
+    a.warehouse_id, a.warehouse_code, a.warehouse_name,
+    a.organization_id, a.organization_name, a.top_organization_id,
+    MAX(b.material_type)     AS material_type,
+    MAX(b.material_type_name) AS material_type_name,
+    MAX(b.bar_code)          AS bar_code,
+    MAX(nvl(a.unit_name, b.unit_name)) AS unit_name,
+    MAX(b.pack_id)      AS pack_id,
+    MAX(b.pack_code)    AS pack_code,
+    MAX(b.pack_name)    AS pack_name,
+    MAX(a.unit)         AS unit,
+    IFNULL(SUM(a.freeze_quantity),     0) AS freeze_quantity,
+    IFNULL(SUM(a.inventory_quantity),  0) AS inventory_quantity,
+    IFNULL(SUM(a.allocation_quantity), 0) AS allocation_quantity,
+    IFNULL(SUM(a.area),         0) AS area,
+    IFNULL(SUM(a.NET_WEIGHT),   0) AS NET_WEIGHT,
+    IFNULL(SUM(a.GROSS_WEIGHT), 0) AS GROSS_WEIGHT,
+    IFNULL(SUM(a.VOLUME),       0) AS VOLUME,
+    MIN(a.create_time) AS create_time,   -- 新增：首次入库时间
+    MAX(a.update_time) AS update_time,
+    CASE WHEN IFNULL(SUM(a.inventory_quantity), 0) = 0 THEN 1 ELSE 0 END AS sort_order
+    </sql>
+
+    <select id="queryListByHzWlUnit"
+            parameterType="com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO"
+            resultMap="MaterialInventoryResult">
+        select
+        <include refid="selectMaterialInventoryPoByHzWlUnit"/>
+        from material_inventory a
+        left join material_base_info b on a.material_base_info_id = b.material_base_info_id
+        <where>
+            a.del_flag = 1
+            <include refid="selectMaterialInventoryPo1"/>
+            <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
+            <if test="excludeZeroInventoryQuantity != null and excludeZeroInventoryQuantity == true">
+                and IFNULL(a.inventory_quantity, 0) &gt; 0
+            </if>
+        </where>
+        GROUP BY a.shipper_id, a.shipper_code, a.shipper_name,
+        b.material_base_info_id, b.material_code, b.material_name, b.SPECIFICATION_MODEL,
+        a.warehouse_id, a.warehouse_code, a.warehouse_name,
+        a.organization_id, a.organization_name, a.top_organization_id
+        ORDER BY sort_order, MAX(a.update_time) DESC
+    </select>
+
     <select id="queryListByHz" parameterType="com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO" resultMap="MaterialInventoryResult">
         select
         <include refid="selectMaterialInventoryPo"/>
@@ -781,12 +830,279 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
               and container_id = #{containerId}
     </update>
 
+    <sql id="immediateInventoryQueryWhere">
+        <if test="organizationId != null ">
+            and a.organization_id = #{organizationId}
+        </if>
+
+        <if test="topOrganizationId != null ">
+            and a.top_organization_id = #{topOrganizationId}
+        </if>
+
+        <if test="shipperName != null and shipperName != ''">
+            and (a.shipper_name = #{shipperName} OR b.shipper_name = #{shipperName})
+        </if>
+
+        <if test="shipperId != null and shipperId != '' ">
+            and a.shipper_id = #{shipperId}
+        </if>
+
+        <if test="warehouseId != null and warehouseId != '' ">
+            and a.warehouse_id = #{warehouseId}
+        </if>
+
+        <if test="warehouseCode != null and warehouseCode != '' ">
+            and a.warehouse_code = #{warehouseCode}
+        </if>
+
+        <if test="warehouseName != null and warehouseName != '' ">
+            and a.warehouse_name like concat('%', #{warehouseName}, '%')
+        </if>
+
+        <if test="materialName != null and materialName != '' ">
+            and b.material_name = #{materialName}
+        </if>
+
+        <if test="materialCode != null and materialCode != '' ">
+            and b.material_code = #{materialCode}
+        </if>
+
+        <if test="barCode != null  and barCode != '' ">
+            and b.bar_code = #{barCode}
+        </if>
+
+        <if test="specificationModel != null and specificationModel != ''">
+            and b.specification_model = #{specificationModel}
+        </if>
+
+        <if test="batchNumber != null and batchNumber != ''">
+            and a.batch_number = #{batchNumber}
+        </if>
+
+        <if test="receivedQuantityStart != null   ">
+            and   ifnull(
+            (
+            SELECT
+            sum( c.receipt_quantity )
+            FROM
+            receipt_material_detail c
+            LEFT JOIN stock_receipt_order d ON c.receipt_order_number = d.receipt_order_number
+            AND d.del_flag = 1
+            LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number and e.DEL_FLAG = 1 and d.DEL_FLAG = 1
+            WHERE
+            c.del_flag = 1 and d.STATUS = 3
+            AND e.warehouse_id = a.warehouse_id
+            AND (a.shipper_id IS NULL OR e.shipper_id = a.shipper_id)
+            AND c.material_base_info_id = a.material_base_info_id
+            and (c.BATCH_REF_NO = a.batch_ref_no or (c.BATCH_REF_NO is null and a.BATCH_REF_NO is null))
+            and (c.SHEET_REF_NO = a.sheet_ref_no or (c.SHEET_REF_NO is null and a.SHEET_REF_NO is null))
+            and (c.BOX_PALLET_NO = a.BOX_PALLET_NO or (c.BOX_PALLET_NO is null and a.BOX_PALLET_NO is null))
+            and (c.EXT_ATTR_1 = a.EXT_ATTR_1 or (c.EXT_ATTR_1 is null and a.EXT_ATTR_1 is null))
+            and (c.EXT_ATTR_2 = a.EXT_ATTR_2  or (c.EXT_ATTR_2 is null and a.EXT_ATTR_2 is null))
+            and (c.EXT_ATTR_3 = a.EXT_ATTR_3 or (c.EXT_ATTR_3 is null and a.EXT_ATTR_3 is null))
+            and (c.EXT_ATTR_4 = a.EXT_ATTR_4 or (c.EXT_ATTR_4 is null and a.EXT_ATTR_4 is null))
+            and (c.PRODUCTION_DATE = a.PRODUCTION_DATE or (c.PRODUCTION_DATE is null and a.PRODUCTION_DATE is null))
+            and (c.EXPIRY_DATE = a.EXPIRY_DATE  or (c.EXPIRY_DATE is null and a.EXPIRY_DATE is null))
+            and (c.INVENTORY_DATE = a.INVENTORY_DATE or (c.INVENTORY_DATE is null and a.INVENTORY_DATE is null))
+            ),
+            0
+            )> #{receivedQuantityStart}
+        </if>
+
+        <if test="receivedQuantityEnd != null   ">
+            and  ifnull(
+            (
+            SELECT
+            sum( c.receipt_quantity )
+            FROM
+            receipt_material_detail c
+            LEFT JOIN stock_receipt_order d ON c.receipt_order_number = d.receipt_order_number
+            AND d.del_flag = 1
+            LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number and e.DEL_FLAG = 1 and d.DEL_FLAG = 1
+            WHERE
+            c.del_flag = 1 and d.STATUS = 3
+            AND e.warehouse_id = a.warehouse_id
+            AND (a.shipper_id IS NULL OR e.shipper_id = a.shipper_id)
+            AND c.material_base_info_id = a.material_base_info_id
+            and (c.BATCH_REF_NO = a.batch_ref_no or (c.BATCH_REF_NO is null and a.BATCH_REF_NO is null))
+            and (c.SHEET_REF_NO = a.sheet_ref_no or (c.SHEET_REF_NO is null and a.SHEET_REF_NO is null))
+            and (c.BOX_PALLET_NO = a.BOX_PALLET_NO or (c.BOX_PALLET_NO is null and a.BOX_PALLET_NO is null))
+            and (c.EXT_ATTR_1 = a.EXT_ATTR_1 or (c.EXT_ATTR_1 is null and a.EXT_ATTR_1 is null))
+            and (c.EXT_ATTR_2 = a.EXT_ATTR_2  or (c.EXT_ATTR_2 is null and a.EXT_ATTR_2 is null))
+            and (c.EXT_ATTR_3 = a.EXT_ATTR_3 or (c.EXT_ATTR_3 is null and a.EXT_ATTR_3 is null))
+            and (c.EXT_ATTR_4 = a.EXT_ATTR_4 or (c.EXT_ATTR_4 is null and a.EXT_ATTR_4 is null))
+            and (c.PRODUCTION_DATE = a.PRODUCTION_DATE or (c.PRODUCTION_DATE is null and a.PRODUCTION_DATE is null))
+            and (c.EXPIRY_DATE = a.EXPIRY_DATE  or (c.EXPIRY_DATE is null and a.EXPIRY_DATE is null))
+            and (c.INVENTORY_DATE = a.INVENTORY_DATE or (c.INVENTORY_DATE is null and a.INVENTORY_DATE is null))
+            ),
+            0
+            ) &lt; #{receivedQuantityEnd}
+        </if>
+
+        <if test="shelvesQuantityStart != null   ">
+            and  ifnull(
+            (
+            SELECT
+            sum( c.shelves_quantity )
+            FROM
+            shelf_material_detail c
+            LEFT JOIN stock_shelf_order d ON c.shelf_order_number = d.shelf_order_number
+            AND d.del_flag = 1
+            LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number and e.DEL_FLAG = 1 and d.DEL_FLAG = 1
+            WHERE
+            c.del_flag = 1
+            AND e.warehouse_id = a.warehouse_id
+            AND (a.shipper_id IS NULL OR e.shipper_id = a.shipper_id)
+            AND c.material_base_info_id = a.material_base_info_id
+            ),
+            0
+            ) > #{shelvesQuantityStart}
+        </if>
+
+        <if test="shelvesQuantityEnd != null   ">
+            and  ifnull(
+            (
+            SELECT
+            sum( c.shelves_quantity )
+            FROM
+            shelf_material_detail c
+            LEFT JOIN stock_shelf_order d ON c.shelf_order_number = d.shelf_order_number
+            AND d.del_flag = 1
+            LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number and e.DEL_FLAG = 1 and d.DEL_FLAG = 1
+            WHERE
+            c.del_flag = 1
+            AND e.warehouse_id = a.warehouse_id
+            AND (a.shipper_id IS NULL OR e.shipper_id = a.shipper_id)
+            AND c.material_base_info_id = a.material_base_info_id
+            ),
+            0
+            ) &lt; #{shelvesQuantityEnd}
+        </if>
+
+        <if test="pickQuantityStart != null   ">
+            and  	ifnull(
+            (
+            SELECT
+            sum( c.picking_quantity )
+            FROM
+            picking_material_detail c
+            LEFT JOIN picking_order d ON c.picking_order_number = d.PICKING_ORDER_NUMBER and c.del_flag = 1 and d.del_flag=1
+            left join STOCK_OUT_ORDER e ON d.ORDER_NUMBER = e.OUT_ORDER_NUMBER and e.del_flag = 1
+            WHERE
+            c.del_flag = 1 and d.STATUS = 3 and e.STATUS = 7
+            AND d.warehouse_id = a.warehouse_id
+            AND (a.shipper_id IS NULL OR d.shipper_id = a.shipper_id)
+            AND c.material_base_info_id = a.material_base_info_id
+            AND c.MATERIAL_INVENTORY_ID = a.MATERIAL_INVENTORY_ID
+            ),
+            0
+            ) > #{pickQuantityStart}
+        </if>
+
+        <if test="pickQuantityEnd != null   ">
+            and  	ifnull(
+            (
+            SELECT
+            sum( c.picking_quantity )
+            FROM
+            picking_material_detail c
+            LEFT JOIN picking_order d ON c.picking_order_number = d.PICKING_ORDER_NUMBER and c.del_flag = 1 and d.del_flag=1
+            left join STOCK_OUT_ORDER e ON d.ORDER_NUMBER = e.OUT_ORDER_NUMBER and e.del_flag = 1
+            WHERE
+            c.del_flag = 1 and d.STATUS = 3 and e.STATUS = 7
+            AND d.warehouse_id = a.warehouse_id
+            AND (a.shipper_id IS NULL OR d.shipper_id = a.shipper_id)
+            AND c.material_base_info_id = a.material_base_info_id
+            AND c.MATERIAL_INVENTORY_ID = a.MATERIAL_INVENTORY_ID
+            ),
+            0
+            ) &lt; #{pickQuantityEnd}
+        </if>
+
+        <if test="checkQuantityBegin != null   ">
+            and
+            ifnull(
+            (
+            SELECT
+            SUM(c.CHECK_QUANTITY) AS CHECK_QUANTITY
+            FROM
+            OUT_MATERIAL_DETAIL c
+            LEFT JOIN STOCK_OUT_ORDER d ON c.OUT_ORDER_NUMBER = d.OUT_ORDER_NUMBER and c.del_flag = 1 and d.del_flag = 1
+            LEFT JOIN HANDOVER_TASK_ORDER e ON d.OUT_ORDER_NUMBER = e.ORDER_NUMBER
+            WHERE
+            d.CHECK_STATUS in (2,3)  and e.STATUS = 1 and d.STATUS in (8,12)
+            AND d.DEL_FLAG = 1
+            AND c.DEL_FLAG = 1
+            and e.del_flag = 1
+            AND d.warehouse_id = a.warehouse_id
+            AND (a.shipper_id IS NULL OR d.shipper_id = a.shipper_id)
+            AND c.material_base_info_id = a.material_base_info_id
+            AND c.MATERIAL_INVENTORY_ID = a.MATERIAL_INVENTORY_ID
+            ),
+            0
+            ) > #{checkQuantityBegin}
+        </if>
+
+        <if test="checkQuantityEnd != null   ">
+            and
+            ifnull(
+            (
+            SELECT
+            SUM(c.CHECK_QUANTITY) AS CHECK_QUANTITY
+            FROM
+            OUT_MATERIAL_DETAIL c
+            LEFT JOIN STOCK_OUT_ORDER d ON c.OUT_ORDER_NUMBER = d.OUT_ORDER_NUMBER and c.del_flag = 1 and d.del_flag = 1
+            LEFT JOIN HANDOVER_TASK_ORDER e ON d.OUT_ORDER_NUMBER = e.ORDER_NUMBER
+            WHERE
+            d.CHECK_STATUS in (2,3)  and e.STATUS = 1 and d.STATUS in (8,12)
+            AND d.DEL_FLAG = 1
+            AND c.DEL_FLAG = 1
+            and e.del_flag = 1
+            AND d.warehouse_id = a.warehouse_id
+            AND (a.shipper_id IS NULL OR d.shipper_id = a.shipper_id)
+            AND c.material_base_info_id = a.material_base_info_id
+            AND c.MATERIAL_INVENTORY_ID = a.MATERIAL_INVENTORY_ID
+            ),
+            0
+            ) &lt; #{checkQuantityEnd}
+        </if>
+
+        <if test="inventoryQuantity != null   ">
+            and  a.inventory_quantity = #{inventoryQuantity}
+        </if>
+
+        <if test="inventoryQuantityStart != null   ">
+            and  a.inventory_quantity > #{inventoryQuantityStart}
+        </if>
+
+        <if test="inventoryQuantityEnd != null   ">
+            and  a.inventory_quantity &lt; #{inventoryQuantityEnd}
+        </if>
+
+        <if test="allocationQuantityStart != null   ">
+            and   a.allocation_quantity > #{allocationQuantityStart}
+        </if>
+
+        <if test="allocationQuantityEnd != null   ">
+            and   a.allocation_quantity &lt; #{allocationQuantityEnd}
+        </if>
+
+        <if test="freezeQuantityStart != null   ">
+            and    a.freeze_quantity > #{freezeQuantityStart}
+        </if>
+
+        <if test="freezeQuantityEnd != null   ">
+            and     a.freeze_quantity &lt; #{freezeQuantityEnd}
+        </if>
+    </sql>
+
     <resultMap type="com.mhd.wms.domain.statementStatistics.po.ImmediateInventoryPO" id="queryImmediateInventoryListResult">
 
         <result property="shipperName"    column="shipper_name"    />
         <result property="materialCode"    column="material_code"    />
         <result property="materialName"    column="material_name"    />
         <result property="barCode"    column="bar_code"    />
+        <result property="specificationModel"    column="specification_model"    />
         <result property="warehouseName"    column="warehouse_name"    />
         <result property="inventoryQuantity"    column="inventory_quantity"    />
         <result property="allocationQuantity"    column="allocation_quantity"    />
@@ -826,6 +1142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         b.material_name,
         b.material_code,
         b.bar_code,
+        b.specification_model,
 <!--        sum(a.inventory_quantity) inventory_quantity,
         sum(a.allocation_quantity) allocation_quantity,
         sum(a.freeze_quantity) freeze_quantity,-->
@@ -995,271 +1312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
         a.del_flag = 1
 
-        <if test="organizationId != null ">
-            and a.organization_id = #{organizationId}
-        </if>
-
-        <if test="topOrganizationId != null ">
-            and a.top_organization_id = #{topOrganizationId}
-        </if>
-
-        <if test="shipperName != null and shipperName != ''">
-            and (a.shipper_name = #{shipperName} OR b.shipper_name = #{shipperName})
-        </if>
-
-        <if test="shipperId != null and shipperId != '' ">
-            and a.shipper_id = #{shipperId}
-        </if>
-
-        <if test="warehouseId != null and warehouseId != '' ">
-            and a.warehouse_id = #{warehouseId}
-        </if>
-
-        <if test="warehouseCode != null and warehouseCode != '' ">
-            and a.warehouse_code = #{warehouseCode}
-        </if>
-
-        <if test="warehouseName != null and warehouseName != '' ">
-            and a.warehouse_name like concat('%', #{warehouseName}, '%')
-        </if>
-
-        <if test="materialName != null and materialName != '' ">
-            and b.material_name = #{materialName}
-        </if>
-
-        <if test="materialCode != null and materialCode != '' ">
-            and b.material_code = #{materialCode}
-        </if>
-
-        <if test="barCode != null  and barCode != '' ">
-            and b.bar_code = #{barCode}
-        </if>
-
-        <if test="batchNumber != null and batchNumber != ''">
-            and a.batch_number = #{batchNumber}
-        </if>
-
-        <if test="receivedQuantityStart != null   ">
-            and   ifnull(
-            (
-            SELECT
-            sum( c.receipt_quantity )
-            FROM
-            receipt_material_detail c
-            LEFT JOIN stock_receipt_order d ON c.receipt_order_number = d.receipt_order_number
-            AND d.del_flag = 1
-            LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number and e.DEL_FLAG = 1 and d.DEL_FLAG = 1
-            WHERE
-            c.del_flag = 1 and d.STATUS = 3
-            AND e.warehouse_id = a.warehouse_id
-            AND (a.shipper_id IS NULL OR e.shipper_id = a.shipper_id)
-            AND c.material_base_info_id = a.material_base_info_id
-            and (c.BATCH_REF_NO = a.batch_ref_no or (c.BATCH_REF_NO is null and a.BATCH_REF_NO is null))
-            and (c.SHEET_REF_NO = a.sheet_ref_no or (c.SHEET_REF_NO is null and a.SHEET_REF_NO is null))
-            and (c.BOX_PALLET_NO = a.BOX_PALLET_NO or (c.BOX_PALLET_NO is null and a.BOX_PALLET_NO is null))
-            and (c.EXT_ATTR_1 = a.EXT_ATTR_1 or (c.EXT_ATTR_1 is null and a.EXT_ATTR_1 is null))
-            and (c.EXT_ATTR_2 = a.EXT_ATTR_2  or (c.EXT_ATTR_2 is null and a.EXT_ATTR_2 is null))
-            and (c.EXT_ATTR_3 = a.EXT_ATTR_3 or (c.EXT_ATTR_3 is null and a.EXT_ATTR_3 is null))
-            and (c.EXT_ATTR_4 = a.EXT_ATTR_4 or (c.EXT_ATTR_4 is null and a.EXT_ATTR_4 is null))
-            and (c.PRODUCTION_DATE = a.PRODUCTION_DATE or (c.PRODUCTION_DATE is null and a.PRODUCTION_DATE is null))
-            and (c.EXPIRY_DATE = a.EXPIRY_DATE  or (c.EXPIRY_DATE is null and a.EXPIRY_DATE is null))
-            and (c.INVENTORY_DATE = a.INVENTORY_DATE or (c.INVENTORY_DATE is null and a.INVENTORY_DATE is null))
-            ),
-            0
-            )> #{receivedQuantityStart}
-        </if>
-
-        <if test="receivedQuantityEnd != null   ">
-            and  ifnull(
-            (
-            SELECT
-            sum( c.receipt_quantity )
-            FROM
-            receipt_material_detail c
-            LEFT JOIN stock_receipt_order d ON c.receipt_order_number = d.receipt_order_number
-            AND d.del_flag = 1
-            LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number and e.DEL_FLAG = 1 and d.DEL_FLAG = 1
-            WHERE
-            c.del_flag = 1 and d.STATUS = 3
-            AND e.warehouse_id = a.warehouse_id
-            AND (a.shipper_id IS NULL OR e.shipper_id = a.shipper_id)
-            AND c.material_base_info_id = a.material_base_info_id
-            and (c.BATCH_REF_NO = a.batch_ref_no or (c.BATCH_REF_NO is null and a.BATCH_REF_NO is null))
-            and (c.SHEET_REF_NO = a.sheet_ref_no or (c.SHEET_REF_NO is null and a.SHEET_REF_NO is null))
-            and (c.BOX_PALLET_NO = a.BOX_PALLET_NO or (c.BOX_PALLET_NO is null and a.BOX_PALLET_NO is null))
-            and (c.EXT_ATTR_1 = a.EXT_ATTR_1 or (c.EXT_ATTR_1 is null and a.EXT_ATTR_1 is null))
-            and (c.EXT_ATTR_2 = a.EXT_ATTR_2  or (c.EXT_ATTR_2 is null and a.EXT_ATTR_2 is null))
-            and (c.EXT_ATTR_3 = a.EXT_ATTR_3 or (c.EXT_ATTR_3 is null and a.EXT_ATTR_3 is null))
-            and (c.EXT_ATTR_4 = a.EXT_ATTR_4 or (c.EXT_ATTR_4 is null and a.EXT_ATTR_4 is null))
-            and (c.PRODUCTION_DATE = a.PRODUCTION_DATE or (c.PRODUCTION_DATE is null and a.PRODUCTION_DATE is null))
-            and (c.EXPIRY_DATE = a.EXPIRY_DATE  or (c.EXPIRY_DATE is null and a.EXPIRY_DATE is null))
-            and (c.INVENTORY_DATE = a.INVENTORY_DATE or (c.INVENTORY_DATE is null and a.INVENTORY_DATE is null))
-            ),
-            0
-            ) &lt; #{receivedQuantityEnd}
-        </if>
-
-        <if test="shelvesQuantityStart != null   ">
-            and  ifnull(
-            (
-            SELECT
-            sum( c.shelves_quantity )
-            FROM
-            shelf_material_detail c
-            LEFT JOIN stock_shelf_order d ON c.shelf_order_number = d.shelf_order_number
-            AND d.del_flag = 1
-            LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number and e.DEL_FLAG = 1 and d.DEL_FLAG = 1
-            WHERE
-            c.del_flag = 1
-            AND e.warehouse_id = a.warehouse_id
-            AND (a.shipper_id IS NULL OR e.shipper_id = a.shipper_id)
-            AND c.material_base_info_id = a.material_base_info_id
-            ),
-            0
-            ) > #{shelvesQuantityStart}
-        </if>
-
-        <if test="shelvesQuantityEnd != null   ">
-            and  ifnull(
-            (
-            SELECT
-            sum( c.shelves_quantity )
-            FROM
-            shelf_material_detail c
-            LEFT JOIN stock_shelf_order d ON c.shelf_order_number = d.shelf_order_number
-            AND d.del_flag = 1
-            LEFT JOIN stock_in_order e ON d.in_order_number = e.in_order_number and e.DEL_FLAG = 1 and d.DEL_FLAG = 1
-            WHERE
-            c.del_flag = 1
-            AND e.warehouse_id = a.warehouse_id
-            AND (a.shipper_id IS NULL OR e.shipper_id = a.shipper_id)
-            AND c.material_base_info_id = a.material_base_info_id
-            ),
-            0
-            ) &lt; #{shelvesQuantityEnd}
-        </if>
-
-        <if test="pickQuantityStart != null   ">
-            and  	ifnull(
-            (
-            SELECT
-            sum( c.picking_quantity )
-            FROM
-            picking_material_detail c
-            LEFT JOIN picking_order d ON c.picking_order_number = d.PICKING_ORDER_NUMBER and c.del_flag = 1 and d.del_flag=1
-            left join STOCK_OUT_ORDER e ON d.ORDER_NUMBER = e.OUT_ORDER_NUMBER and e.del_flag = 1
-            WHERE
-            c.del_flag = 1 and d.STATUS = 3 and e.STATUS = 7
-            AND d.warehouse_id = a.warehouse_id
-            AND (a.shipper_id IS NULL OR d.shipper_id = a.shipper_id)
-            AND c.material_base_info_id = a.material_base_info_id
-            AND c.MATERIAL_INVENTORY_ID = a.MATERIAL_INVENTORY_ID
-            ),
-            0
-            ) > #{pickQuantityStart}
-        </if>
-
-        <if test="pickQuantityEnd != null   ">
-            and  	ifnull(
-            (
-            SELECT
-            sum( c.picking_quantity )
-            FROM
-            picking_material_detail c
-            LEFT JOIN picking_order d ON c.picking_order_number = d.PICKING_ORDER_NUMBER and c.del_flag = 1 and d.del_flag=1
-            left join STOCK_OUT_ORDER e ON d.ORDER_NUMBER = e.OUT_ORDER_NUMBER and e.del_flag = 1
-            WHERE
-            c.del_flag = 1 and d.STATUS = 3 and e.STATUS = 7
-            AND d.warehouse_id = a.warehouse_id
-            AND (a.shipper_id IS NULL OR d.shipper_id = a.shipper_id)
-            AND c.material_base_info_id = a.material_base_info_id
-            AND c.MATERIAL_INVENTORY_ID = a.MATERIAL_INVENTORY_ID
-            ),
-            0
-            ) &lt; #{pickQuantityEnd}
-        </if>
-<!--
-        GROUP BY
-        a.warehouse_id,
-        a.material_base_info_id,
-        a.shipper_id
-        HAVING 1=1-->
-
-        <if test="checkQuantityBegin != null   ">
-            and
-            ifnull(
-            (
-            SELECT
-            SUM(c.CHECK_QUANTITY) AS CHECK_QUANTITY
-            FROM
-            OUT_MATERIAL_DETAIL c
-            LEFT JOIN STOCK_OUT_ORDER d ON c.OUT_ORDER_NUMBER = d.OUT_ORDER_NUMBER and c.del_flag = 1 and d.del_flag = 1
-            LEFT JOIN HANDOVER_TASK_ORDER e ON d.OUT_ORDER_NUMBER = e.ORDER_NUMBER
-            WHERE
-            d.CHECK_STATUS in (2,3)  and e.STATUS = 1 and d.STATUS in (8,12)
-            AND d.DEL_FLAG = 1
-            AND c.DEL_FLAG = 1
-            and e.del_flag = 1
-            AND d.warehouse_id = a.warehouse_id
-            AND (a.shipper_id IS NULL OR d.shipper_id = a.shipper_id)
-            AND c.material_base_info_id = a.material_base_info_id
-            AND c.MATERIAL_INVENTORY_ID = a.MATERIAL_INVENTORY_ID
-            ),
-            0
-            ) > #{checkQuantityBegin}
-        </if>
-
-        <if test="checkQuantityEnd != null   ">
-            and
-            ifnull(
-            (
-            SELECT
-            SUM(c.CHECK_QUANTITY) AS CHECK_QUANTITY
-            FROM
-            OUT_MATERIAL_DETAIL c
-            LEFT JOIN STOCK_OUT_ORDER d ON c.OUT_ORDER_NUMBER = d.OUT_ORDER_NUMBER and c.del_flag = 1 and d.del_flag = 1
-            LEFT JOIN HANDOVER_TASK_ORDER e ON d.OUT_ORDER_NUMBER = e.ORDER_NUMBER
-            WHERE
-            d.CHECK_STATUS in (2,3)  and e.STATUS = 1 and d.STATUS in (8,12)
-            AND d.DEL_FLAG = 1
-            AND c.DEL_FLAG = 1
-            and e.del_flag = 1
-            AND d.warehouse_id = a.warehouse_id
-            AND (a.shipper_id IS NULL OR d.shipper_id = a.shipper_id)
-            AND c.material_base_info_id = a.material_base_info_id
-            AND c.MATERIAL_INVENTORY_ID = a.MATERIAL_INVENTORY_ID
-            ),
-            0
-            ) &lt; #{checkQuantityEnd}
-        </if>
-
-        <if test="inventoryQuantity != null   ">
-            and  a.inventory_quantity = #{inventoryQuantity}
-        </if>
-
-        <if test="inventoryQuantityStart != null   ">
-            and  a.inventory_quantity > #{inventoryQuantityStart}
-        </if>
-
-        <if test="inventoryQuantityEnd != null   ">
-            and  a.inventory_quantity &lt; #{inventoryQuantityEnd}
-        </if>
-
-        <if test="allocationQuantityStart != null   ">
-            and   a.allocation_quantity > #{allocationQuantityStart}
-        </if>
-
-        <if test="allocationQuantityEnd != null   ">
-            and   a.allocation_quantity &lt; #{allocationQuantityEnd}
-        </if>
-
-        <if test="freezeQuantityStart != null   ">
-            and    a.freeze_quantity > #{freezeQuantityStart}
-        </if>
-
-        <if test="freezeQuantityEnd != null   ">
-            and     a.freeze_quantity &lt; #{freezeQuantityEnd}
-        </if>
+        <include refid="immediateInventoryQueryWhere"/>
         ORDER BY GREATEST(
             IFNULL(a.update_time, '1970-01-01 00:00:00'),
             IFNULL((
@@ -1330,6 +1383,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
 
+    <select id="sumImmediateInventoryQuantity" parameterType="com.mhd.wms.domain.statementStatistics.todo.ImmediateInventoryDO"
+            resultType="java.math.BigDecimal">
+        SELECT IFNULL(SUM(a.inventory_quantity), 0)
+        FROM material_inventory a
+        left join material_base_info b on a.material_base_info_id = b.material_base_info_id
+        WHERE a.del_flag = 1
+        <include refid="immediateInventoryQueryWhere"/>
+    </select>
+
 
     <select id="selectListByWhere" parameterType="com.mhd.wms.domain.materialInventory.entity.MaterialInventory"
             resultMap="MaterialInventoryResult">

mhd_wms/src/main/resources/mapper/reviewOrder/ReviewOrderMapper.xml

@@ -4,7 +4,7 @@
 <mapper namespace="com.mhd.wms.domain.reviewOrder.repository.mapper.ReviewOrderMapper">
 
     <resultMap type="com.mhd.wms.domain.reviewOrder.repository.po.ReviewOrderPO" id="ReviewOrderResult">
-        <result property="reviewOrderId" column="review_order_id"/>
+        <id property="reviewOrderId" column="review_order_id"/>
         <result property="reviewOrderNumber" column="review_order_number"/>
         <result property="outOrderId" column="out_order_id"/>
         <result property="outOrderNumber" column="out_order_number"/>
@@ -84,7 +84,7 @@
     </resultMap>
 
     <sql id="reviewOrderSelectColumns">
-        a.review_order_id,
+        a.review_order_id AS review_order_id,
         a.review_order_number,
         a.out_order_id,
         a.out_order_number,