Merge branch 'dev' into feature/dev-0729

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/mapper/BiPlatformRealDataMapper.java

@@ -0,0 +1,34 @@
+package com.mhd.bi.domain.biPlatformRealData.repository.mapper;
+
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformVehiclePO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformOverviewPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealVehicleStatusPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealTaskLoadPO;
+
+import java.util.List;
+
+/**
+ * 月台监测-真实数据 Mapper
+ * 数据来源：TEST_NGWL_YMS 库（达梦，跨库访问）
+ * 注：列名按达梦默认大写规则；若实际库中小写请反馈调整
+ */
+public interface BiPlatformRealDataMapper {
+
+    /** 作业车辆状态列表 */
+    List<RealPlatformVehiclePO> queryVehicles();
+
+    /** 月台实时概览（总数 / 当前作业中） */
+    RealPlatformOverviewPO queryPlatformOverview();
+
+    /** 今日作业任务数 */
+    Long countTodayTasks();
+
+    /** 车辆状态统计（今日） */
+    RealVehicleStatusPO queryVehicleStatusToday();
+
+    /** 本月任务量 */
+    Long countMonthTasks();
+
+    /** 任务负荷（今日 24 小时） */
+    List<RealTaskLoadPO> queryTaskLoadToday();
+}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealPlatformOverviewPO.java

@@ -0,0 +1,18 @@
+package com.mhd.bi.domain.biPlatformRealData.repository.po;
+
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * 月台实时概览（真实数据，来自 TEST_NGWL_YMS.QMS_WINDOW_INFO）
+ */
+@Data
+public class RealPlatformOverviewPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 月台总数 */
+    private Long totalPlatforms;
+
+    /** 当前作业中（月台作业状态=占用） */
+    private Long operatingPlatforms;
+}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealPlatformVehiclePO.java

@@ -0,0 +1,30 @@
+package com.mhd.bi.domain.biPlatformRealData.repository.po;
+
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * 月台监测-作业车辆（真实数据，来自 TEST_NGWL_YMS.QMS_MAIN_BUSINESS 等）
+ */
+@Data
+public class RealPlatformVehiclePO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 车牌号（qms_main_business.CARNO） */
+    private String plateNumber;
+
+    /** 流程状态（qms_main_business.FLOWSTATUS） */
+    private String status;
+
+    /** 叫号月台（qms_queue_list.WINDOWNAME） */
+    private String platformId;
+
+    /** 月台作业时长，分钟（EXITTIME - ENTRYTIME） */
+    private Long platformDuration;
+
+    /** 预约申请时间（qms_main_business.CREATE_TIME） */
+    private String appointmentTime;
+
+    /** 作业楼层（qms_window_info.PLATFORMFLOOR） */
+    private String workFloor;
+}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealTaskLoadPO.java

@@ -0,0 +1,18 @@
+package com.mhd.bi.domain.biPlatformRealData.repository.po;
+
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * 任务负荷统计（按小时，来自 TEST_NGWL_YMS.QMS_MAIN_BUSINESS）
+ */
+@Data
+public class RealTaskLoadPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 0-23 小时 */
+    private Integer hourOfDay;
+
+    /** 该小时段任务数 */
+    private Long taskCount;
+}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/repository/po/RealVehicleStatusPO.java

@@ -0,0 +1,24 @@
+package com.mhd.bi.domain.biPlatformRealData.repository.po;
+
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * 作业车辆状态统计（真实数据，来自 TEST_NGWL_YMS.QMS_MAIN_BUSINESS）
+ */
+@Data
+public class RealVehicleStatusPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 今日预约车辆 */
+    private Long todayReservedVehicles;
+
+    /** 当前未签到 */
+    private Long notCheckedIn;
+
+    /** 当前作业中 */
+    private Long operatingVehicles;
+
+    /** 作业完成 */
+    private Long completedVehicles;
+}

mhd-bi/src/main/java/com/mhd/bi/domain/biPlatformRealData/service/BiPlatformRealDataService.java

@@ -0,0 +1,184 @@
+package com.mhd.bi.domain.biPlatformRealData.service;
+
+import com.mhd.bi.domain.biPlatformRealData.repository.mapper.BiPlatformRealDataMapper;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformVehiclePO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformOverviewPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealVehicleStatusPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealTaskLoadPO;
+import com.mhd.bi.domain.biSnapshotSync.support.BiSnapshotWeeklyRandomDataBuilder;
+import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.PlatformSurveillanceVO;
+import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.PlatformVehicleItemVO;
+import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.TaskLoadItemVO;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+/**
+ * 月台监测-真实数据业务层（封装 YMS 跨库查询）
+ * 注：列名大小写、字段类型需以实际库为准；若 YMS 库无数据/无权限，相关方法应返回空/0，不影响写死字段写入快照
+ */
+@Service
+public class BiPlatformRealDataService {
+
+    @Resource
+    private BiPlatformRealDataMapper biPlatformRealDataMapper;
+
+    public List<RealPlatformVehiclePO> queryVehicles() {
+        try {
+            return biPlatformRealDataMapper.queryVehicles();
+        } catch (Exception e) {
+            return java.util.Collections.emptyList();
+        }
+    }
+
+    public RealPlatformOverviewPO queryPlatformOverview() {
+        try {
+            RealPlatformOverviewPO po = biPlatformRealDataMapper.queryPlatformOverview();
+            if (po == null) {
+                po = new RealPlatformOverviewPO();
+            }
+            if (po.getTotalPlatforms() == null) po.setTotalPlatforms(0L);
+            if (po.getOperatingPlatforms() == null) po.setOperatingPlatforms(0L);
+            return po;
+        } catch (Exception e) {
+            RealPlatformOverviewPO po = new RealPlatformOverviewPO();
+            po.setTotalPlatforms(0L);
+            po.setOperatingPlatforms(0L);
+            return po;
+        }
+    }
+
+    public long countTodayTasks() {
+        try {
+            Long n = biPlatformRealDataMapper.countTodayTasks();
+            return n == null ? 0L : n;
+        } catch (Exception e) {
+            return 0L;
+        }
+    }
+
+    public RealVehicleStatusPO queryVehicleStatusToday() {
+        try {
+            RealVehicleStatusPO po = biPlatformRealDataMapper.queryVehicleStatusToday();
+            if (po == null) po = new RealVehicleStatusPO();
+            if (po.getTodayReservedVehicles() == null) po.setTodayReservedVehicles(0L);
+            if (po.getNotCheckedIn() == null) po.setNotCheckedIn(0L);
+            if (po.getOperatingVehicles() == null) po.setOperatingVehicles(0L);
+            if (po.getCompletedVehicles() == null) po.setCompletedVehicles(0L);
+            return po;
+        } catch (Exception e) {
+            RealVehicleStatusPO po = new RealVehicleStatusPO();
+            po.setTodayReservedVehicles(0L);
+            po.setNotCheckedIn(0L);
+            po.setOperatingVehicles(0L);
+            po.setCompletedVehicles(0L);
+            return po;
+        }
+    }
+
+    public long countMonthTasks() {
+        try {
+            Long n = biPlatformRealDataMapper.countMonthTasks();
+            return n == null ? 0L : n;
+        } catch (Exception e) {
+            return 0L;
+        }
+    }
+
+    public List<RealTaskLoadPO> queryTaskLoadToday() {
+        try {
+            return biPlatformRealDataMapper.queryTaskLoadToday();
+        } catch (Exception e) {
+            return java.util.Collections.emptyList();
+        }
+    }
+
+    /**
+     * 实时组装月台监测数据：真实字段查 YMS 库，写死字段保留静态值。
+     * 每次调用实时查库，不经过快照表。
+     */
+    public PlatformSurveillanceVO buildRealTimePlatformSurveillance() {
+        Random r = new Random();
+        PlatformSurveillanceVO template = BiSnapshotWeeklyRandomDataBuilder.platformSurveillance(r);
+
+        // 作业车辆列表
+        List<RealPlatformVehiclePO> realVehicles = queryVehicles();
+        List<PlatformVehicleItemVO> vehicleVos = new ArrayList<>();
+        for (RealPlatformVehiclePO rv : realVehicles) {
+            PlatformVehicleItemVO v = new PlatformVehicleItemVO();
+            v.setAppointmentTime(rv.getAppointmentTime());
+            v.setWorkFloor(rv.getWorkFloor());
+            v.setPlateNumber(rv.getPlateNumber());
+            v.setStatus(rv.getStatus());
+            v.setPlatformId(rv.getPlatformId());
+            v.setPlatformDuration(rv.getPlatformDuration() == null ? 0 : rv.getPlatformDuration().intValue());
+            vehicleVos.add(v);
+        }
+        if (!vehicleVos.isEmpty()) {
+            template.setVehicles(vehicleVos);
+        }
+
+        // 月台实时概览
+        RealPlatformOverviewPO ov = queryPlatformOverview();
+        if (template.getPlatformOverview() != null) {
+            template.getPlatformOverview().setTotalPlatforms(ov.getTotalPlatforms().intValue());
+            template.getPlatformOverview().setOperatingPlatforms(ov.getOperatingPlatforms().intValue());
+            int total = ov.getTotalPlatforms().intValue();
+            int occ = ov.getOperatingPlatforms().intValue();
+            int rate = total > 0 ? (int) Math.round(((double) occ / total) * 100.0) : 0;
+            template.getPlatformOverview().setCurrentOccupancyRate(rate);
+        }
+        long todayTasks = countTodayTasks();
+        if (template.getPlatformOverview() != null) {
+            template.getPlatformOverview().setTodayTasks((int) todayTasks);
+        }
+
+        // 作业车辆状态统计
+        RealVehicleStatusPO vs = queryVehicleStatusToday();
+        if (template.getVehicleStatus() != null) {
+            template.getVehicleStatus().setTodayReservedVehicles(vs.getTodayReservedVehicles().intValue());
+            template.getVehicleStatus().setNotCheckedIn(vs.getNotCheckedIn().intValue());
+            template.getVehicleStatus().setOperatingVehicles(vs.getOperatingVehicles().intValue());
+            template.getVehicleStatus().setCompletedVehicles(vs.getCompletedVehicles().intValue());
+        }
+
+        // 本月任务统计 taskTotal
+        long monthTasks = countMonthTasks();
+        if (template.getMonthlyTaskStatistics() != null) {
+            template.getMonthlyTaskStatistics().setTaskTotal((int) monthTasks);
+        }
+
+        // 任务负荷（今日 24 小时）
+        List<RealTaskLoadPO> loads = queryTaskLoadToday();
+        if (!loads.isEmpty() && template.getTaskLoadStatistics() != null) {
+            Map<Integer, Long> hourMap = new HashMap<>();
+            for (RealTaskLoadPO l : loads) {
+                hourMap.put(l.getHourOfDay(), l.getTaskCount());
+            }
+            for (TaskLoadItemVO item : template.getTaskLoadStatistics()) {
+                Integer hour = parseHourFromLabel(item.getTime());
+                if (hour != null) {
+                    Long n = hourMap.get(hour);
+                    if (n != null) item.setTaskCount(n.intValue());
+                }
+            }
+        }
+
+        return template;
+    }
+
+    private static Integer parseHourFromLabel(String label) {
+        if (label == null) return null;
+        try {
+            String s = label.replace("时", "").trim();
+            return Integer.parseInt(s);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+}

mhd-bi/src/main/java/com/mhd/bi/domain/biSnapshotSync/service/BiReportSnapshotSyncService.java

@@ -13,10 +13,20 @@ import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.PlatformSurveillance
 import com.mhd.bi.interfaces.facadeApi.biReport.vo.hkMacaoZone.HkMacaoServiceZoneVO;
 import com.mhd.bi.interfaces.facadeApi.biReport.vo.transportZone.TransportOperationZoneVO;
 import com.mhd.bi.interfaces.facadeApi.biReport.vo.warehouseZone.WarehouseOperationZoneVO;
+import com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.PlatformVehicleItemVO;
+import com.mhd.bi.domain.biPlatformRealData.service.BiPlatformRealDataService;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformVehiclePO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformOverviewPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealVehicleStatusPO;
+import com.mhd.bi.domain.biPlatformRealData.repository.po.RealTaskLoadPO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
 import java.util.Random;
 
 /**
@@ -34,6 +44,7 @@ public class BiReportSnapshotSyncService {
 
     private final BiSnapshotWriteMapper biSnapshotWriteMapper;
     private final ObjectMapper objectMapper;
+    private final BiPlatformRealDataService biPlatformRealDataService;
 
     /**
      * 依次同步各快照表；单表失败不影响其它表，只记日志。
@@ -137,9 +148,87 @@ public class BiReportSnapshotSyncService {
         return BiSnapshotWeeklyRandomDataBuilder.warehouseTransport(new Random());
     }
 
-    /** TODO 业务落地：改为查询真实数据。临时实现见 {@link BiSnapshotWeeklyRandomDataBuilder#platformSurveillance(Random)}。 */
+    /** TODO 业务落地：部分字段改为真实数据，其余仍写死。 */
     protected PlatformSurveillanceVO buildPlatformSurveillanceSnapshot() {
-        return BiSnapshotWeeklyRandomDataBuilder.platformSurveillance(new Random());
+        Random r = new Random();
+        // 写死数据复用原 builder
+        PlatformSurveillanceVO template = BiSnapshotWeeklyRandomDataBuilder.platformSurveillance(r);
+
+        // ====== 真实数据：作业车辆列表 ======
+        List<RealPlatformVehiclePO> realVehicles = biPlatformRealDataService.queryVehicles();
+        List<PlatformVehicleItemVO> vehicleVos = new ArrayList<>();
+        for (RealPlatformVehiclePO rv : realVehicles) {
+            PlatformVehicleItemVO v = new PlatformVehicleItemVO();
+            v.setAppointmentTime(rv.getAppointmentTime());
+            v.setWorkFloor(rv.getWorkFloor());
+            v.setPlateNumber(rv.getPlateNumber());
+            v.setStatus(rv.getStatus());
+            v.setPlatformId(rv.getPlatformId());
+            v.setPlatformDuration(rv.getPlatformDuration() == null ? 0 : rv.getPlatformDuration().intValue());
+            vehicleVos.add(v);
+        }
+        if (!vehicleVos.isEmpty()) {
+            template.setVehicles(vehicleVos);
+        }
+
+        // ====== 真实数据：月台实时概览 ======
+        RealPlatformOverviewPO ov = biPlatformRealDataService.queryPlatformOverview();
+        if (template.getPlatformOverview() != null) {
+            template.getPlatformOverview().setTotalPlatforms(ov.getTotalPlatforms().intValue());
+            template.getPlatformOverview().setOperatingPlatforms(ov.getOperatingPlatforms().intValue());
+            int total = ov.getTotalPlatforms().intValue();
+            int occ = ov.getOperatingPlatforms().intValue();
+            int rate = total > 0 ? (int) Math.round(((double) occ / total) * 100.0) : 0;
+            template.getPlatformOverview().setCurrentOccupancyRate(rate);
+        }
+        long todayTasks = biPlatformRealDataService.countTodayTasks();
+        if (template.getPlatformOverview() != null) {
+            template.getPlatformOverview().setTodayTasks((int) todayTasks);
+        }
+
+        // ====== 真实数据：作业车辆状态统计 ======
+        RealVehicleStatusPO vs = biPlatformRealDataService.queryVehicleStatusToday();
+        if (template.getVehicleStatus() != null) {
+            template.getVehicleStatus().setTodayReservedVehicles(vs.getTodayReservedVehicles().intValue());
+            template.getVehicleStatus().setNotCheckedIn(vs.getNotCheckedIn().intValue());
+            template.getVehicleStatus().setOperatingVehicles(vs.getOperatingVehicles().intValue());
+            template.getVehicleStatus().setCompletedVehicles(vs.getCompletedVehicles().intValue());
+        }
+
+        // ====== 真实数据：本月任务统计 taskTotal ======
+        long monthTasks = biPlatformRealDataService.countMonthTasks();
+        if (template.getMonthlyTaskStatistics() != null) {
+            template.getMonthlyTaskStatistics().setTaskTotal((int) monthTasks);
+        }
+
+        // ====== 真实数据：任务负荷（今日 24 小时） ======
+        List<RealTaskLoadPO> loads = biPlatformRealDataService.queryTaskLoadToday();
+        if (!loads.isEmpty() && template.getTaskLoadStatistics() != null) {
+            Map<Integer, Long> hourMap = new HashMap<>();
+            for (RealTaskLoadPO l : loads) {
+                hourMap.put(l.getHourOfDay(), l.getTaskCount());
+            }
+            for (com.mhd.bi.interfaces.facadeApi.biReport.vo.platform.TaskLoadItemVO item : template.getTaskLoadStatistics()) {
+                Integer hour = parseHourFromLabel(item.getTime());
+                if (hour != null) {
+                    Long n = hourMap.get(hour);
+                    if (n != null) item.setTaskCount(n.intValue());
+                }
+            }
+        }
+
+        return template;
+    }
+
+    private static Integer parseHourFromLabel(String label) {
+        if (label == null) return null;
+        // "15时" -> 15
+        try {
+            String s = label.replace("时", "").trim();
+            return Integer.parseInt(s);
+        } catch (Exception e) {
+            return null;
+        }
     }
 
     /**

mhd-bi/src/main/java/com/mhd/bi/interfaces/facadeApi/biReport/BiReportApi.java

@@ -3,6 +3,7 @@ package com.mhd.bi.interfaces.facadeApi.biReport;
 import com.mhd.bi.domain.biSnapshotSync.service.BiReportSnapshotSyncService;
 import com.mhd.bi.domain.biComprehensive.service.BiComprehensiveReportService;
 import com.mhd.bi.domain.biPlatformSurveillance.service.BiPlatformSurveillanceReportService;
+import com.mhd.bi.domain.biPlatformRealData.service.BiPlatformRealDataService;
 import com.mhd.bi.domain.biOverallOperation.service.BiOverallOperationReportService;
 import com.mhd.bi.domain.biHkMacaoServiceZone.service.BiHkMacaoServiceZoneReportService;
 import com.mhd.bi.domain.biTransportOperationZone.service.BiTransportOperationZoneReportService;
@@ -48,6 +49,9 @@ public class BiReportApi extends BaseController {
     @Autowired
     private BiPlatformSurveillanceReportService biPlatformSurveillanceReportService;
 
+    @Autowired
+    private BiPlatformRealDataService biPlatformRealDataService;
+
     @Autowired
     private BiOverallOperationReportService biOverallOperationReportService;
 
@@ -92,12 +96,12 @@ public class BiReportApi extends BaseController {
     }
 
     /**
-     * 月台监测指标查询（按照 del_flag=1，按 create_time 最新一条）
+     * 月台监测指标查询（实时查 YMS 库，真实字段 + 写死字段）
      */
-    @ApiOperation(value = "月台监测指标查询", notes = "返回 DEL_FLAG=1 且 CREATE_TIME 最新的一条快照")
+    @ApiOperation(value = "月台监测指标查询", notes = "每次调用实时查询 YMS 库组装；部分字段为真实业务数据，部分为写死数据")
     @GetMapping("/platformSurveillance")
     public BiApiResult<PlatformSurveillanceVO> platformSurveillance() {
-        PlatformSurveillanceVO data = biPlatformSurveillanceReportService.loadLatestPlatformSurveillance();
+        PlatformSurveillanceVO data = biPlatformRealDataService.buildRealTimePlatformSurveillance();
         return BiApiResult.ok(data);
     }
 //园区物流大屏接口----------------------------------------------------------------------

mhd-bi/src/main/resources/mapper/biPlatformRealData/BiPlatformRealDataMapper.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mhd.bi.domain.biPlatformRealData.repository.mapper.BiPlatformRealDataMapper">
+
+    <!-- 作业车辆状态列表（vehicles）：
+         plateNumber  <- qms_main_business.CARNO
+         status       <- qms_main_business.FLOWSTATUS
+         platformId   <- qms_queue_list.WINDOWNAME（按主业务的某个窗口关联键关联；此处用 businessNo = windowNo 关联，根据实际表调整）
+         platformDuration <- qms_main_business.EXITTIME - ENTRYTIME（分钟）
+         appointmentTime <- qms_main_business.CREATE_TIME（创建时间）
+         workFloor    <- qms_window_info.PLATFORMFLOOR（按 platformId 关联窗口号）
+         注：列名按达梦默认大写规则；若实际为小写，请反馈调整 -->
+    <select id="queryVehicles" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformVehiclePO">
+        SELECT
+            mb.CARNO             AS plateNumber,
+            mb.FLOWSTATUS        AS status,
+            ql.WINDOWNAME        AS platformId,
+            CASE
+                WHEN mb.EXITTIME IS NOT NULL AND mb.ENTRYTIME IS NOT NULL
+                THEN CAST((mb.EXITTIME - mb.ENTRYTIME) AS BIGINT)
+                ELSE 0
+            END                  AS platformDuration,
+            TO_CHAR(mb.CREATE_TIME, 'YYYY-MM-DD HH24:MI:SS') AS appointmentTime,
+            wi.PLATFORMFLOOR     AS workFloor
+        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS mb
+        LEFT JOIN NGWL_TEST_YMS.QMS_QUEUE_LIST ql ON ql.MAIN_BUSINESS_ID = mb.ID
+        LEFT JOIN NGWL_TEST_YMS.QMS_WINDOW_INFO wi ON wi.WINDOW_NO = ql.WINDOWNAME
+        WHERE 1=1
+          AND mb.DEL_FLAG = 1
+        ORDER BY mb.CREATE_TIME DESC
+        LIMIT 50
+    </select>
+
+    <!-- 月台概览：totalPlatforms（总条数）、operatingPlatforms（作业状态=占用/作业中） -->
+    <select id="queryPlatformOverview" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealPlatformOverviewPO">
+        SELECT
+            COUNT(1) AS totalPlatforms,
+            SUM(CASE WHEN STATUS = 2 THEN 1 ELSE 0 END) AS operatingPlatforms
+        FROM NGWL_TEST_YMS.QMS_WINDOW_INFO
+        WHERE DEL_FLAG = 1
+    </select>
+
+    <!-- 今日作业任务：实际进入时间是今日的 -->
+    <select id="countTodayTasks" resultType="java.lang.Long">
+        SELECT COUNT(1)
+        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
+        WHERE DEL_FLAG = 1
+          AND TRUNC(ENTRYTIME) = TRUNC(SYSDATE)
+    </select>
+
+    <!-- 车辆状态统计：今日的统计（按预约申请时间 / 流程状态） -->
+    <select id="queryVehicleStatusToday" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealVehicleStatusPO">
+        SELECT
+            SUM(CASE WHEN TRUNC(CREATE_TIME) = TRUNC(SYSDATE) THEN 1 ELSE 0 END) AS todayReservedVehicles,
+            SUM(CASE WHEN FLOWSTATUS = '已预约' AND TRUNC(CREATE_TIME) = TRUNC(SYSDATE) THEN 1 ELSE 0 END) AS notCheckedIn,
+            SUM(CASE WHEN FLOWSTATUS IN ('已进场','已称重','已装车','二次称重','已结算','已还卡') AND TRUNC(CREATE_TIME) = TRUNC(SYSDATE) THEN 1 ELSE 0 END) AS operatingVehicles,
+            SUM(CASE WHEN FLOWSTATUS = '已出场' AND TRUNC(CREATE_TIME) = TRUNC(SYSDATE) THEN 1 ELSE 0 END) AS completedVehicles
+        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
+        WHERE DEL_FLAG = 1
+    </select>
+
+    <!-- 本月任务量：实际进入时间是本月的 -->
+    <select id="countMonthTasks" resultType="java.lang.Long">
+        SELECT COUNT(1)
+        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
+        WHERE DEL_FLAG = 1
+          AND ENTRYTIME IS NOT NULL
+          AND TO_CHAR(ENTRYTIME, 'YYYY-MM') = TO_CHAR(SYSDATE, 'YYYY-MM')
+    </select>
+
+    <!-- 任务负荷（今日 24 小时时段）：按 HOUR(ENTRYTIME) 统计 -->
+    <select id="queryTaskLoadToday" resultType="com.mhd.bi.domain.biPlatformRealData.repository.po.RealTaskLoadPO">
+        SELECT
+            HOUR(ENTRYTIME) AS hourOfDay,
+            COUNT(1) AS taskCount
+        FROM NGWL_TEST_YMS.QMS_MAIN_BUSINESS
+        WHERE DEL_FLAG = 1
+          AND ENTRYTIME IS NOT NULL
+          AND TRUNC(ENTRYTIME) = TRUNC(SYSDATE)
+        GROUP BY HOUR(ENTRYTIME)
+        ORDER BY HOUR(ENTRYTIME)
+    </select>
+</mapper>

mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocation/StorageLocationMapper.xml

@@ -185,8 +185,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryList" parameterType="com.mhd.basic.domain.storageLocation.repository.todo.StorageLocationDO" resultMap="StorageLocationResult">
         <include refid="selectStorageLocationPo"/>
         <include refid="selectStorageLocationPo1"/>
--- 按照创建时间倒序排序
-        order by a.create_time desc
+-- 按照库位名称正序排序，名称相同时按创建时间倒序
+        order by a.storage_location_name asc, a.create_time desc
     </select>
 
     <select id="getStorageLocationCount" parameterType="com.mhd.basic.domain.storageLocation.repository.todo.StorageLocationDO" resultType="java.lang.Long">

mhd-modules/mhd-system/src/main/resources/mapper/basic/storageSection/StorageSectionMapper.xml

@@ -100,6 +100,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryList" parameterType="com.mhd.basic.domain.storageSection.repository.todo.StorageSectionDO" resultMap="StorageSectionResult">
         <include refid="selectStorageSectionPo"/>
         <include refid="selectStorageSectionPo1"/>
-        order by a.create_time desc
+        order by a.storage_name asc, a.create_time desc
     </select>
 </mapper>

mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java

@@ -234,7 +234,7 @@ public class ReviewOrderApplicationService {
             }
             db.setPendingReviewQty(pending.subtract(qty));
             db.setReviewedQty(reviewed.add(qty));
-            // 同步页面传入的重量/体积/面积
+            // 同步页面传入的重量/体积/面积/尺寸
             if (i.getNetWeightKg() != null) {
                 db.setNetWeightKg(i.getNetWeightKg());
             }
@@ -247,6 +247,9 @@ public class ReviewOrderApplicationService {
             if (i.getAreaSqm() != null) {
                 db.setAreaSqm(i.getAreaSqm());
             }
+            if (i.getSize() != null) {
+                db.setSize(i.getSize());
+            }
             fillOperator(db);
             reviewMaterialDetailMapper.updateById(db);
         }
@@ -288,7 +291,7 @@ public class ReviewOrderApplicationService {
             db.setReviewedQty(reviewed.subtract(qty));
             db.setPendingReviewQty(pending.add(qty));
             db.setCancelQty(cancel.add(qty));
-            // 同步页面传入的重量/体积/面积
+            // 同步页面传入的重量/体积/面积/尺寸
             if (i.getNetWeightKg() != null) {
                 db.setNetWeightKg(i.getNetWeightKg());
             }
@@ -301,6 +304,9 @@ public class ReviewOrderApplicationService {
             if (i.getAreaSqm() != null) {
                 db.setAreaSqm(i.getAreaSqm());
             }
+            if (i.getSize() != null) {
+                db.setSize(i.getSize());
+            }
             fillOperator(db);
             reviewMaterialDetailMapper.updateById(db);
         }
@@ -337,16 +343,16 @@ public class ReviewOrderApplicationService {
             // 与出库单「复核确认」一致：复核数量与拣货数量不一致时生成复核异常单（FHYC）
             genOutOrderAbnormalAfterReviewConfirm(reviewOrderId);
             // 校验：复核确认前，已复核数量必须等于计划数量
-            List<ReviewMaterialDetailPO> details = reviewOrderMapper.queryDetailByReviewOrderId(reviewOrderId);
-            if (!CollectionUtils.isEmpty(details)) {
-                for (ReviewMaterialDetailPO detail : details) {
-                    BigDecimal reviewed = nz(detail.getReviewedQty());
-                    BigDecimal plan = nz(detail.getMaterialPlanQty());
-                    if (reviewed.compareTo(plan) != 0) {
-                        throw new ServiceException("该物料已复核数量不等于计划数量");
-                    }
-                }
-            }
+//            List<ReviewMaterialDetailPO> details = reviewOrderMapper.queryDetailByReviewOrderId(reviewOrderId);
+//            if (!CollectionUtils.isEmpty(details)) {
+//                for (ReviewMaterialDetailPO detail : details) {
+//                    BigDecimal reviewed = nz(detail.getReviewedQty());
+//                    BigDecimal plan = nz(detail.getMaterialPlanQty());
+//                    if (reviewed.compareTo(plan) != 0) {
+//                        throw new ServiceException("该物料已复核数量不等于计划数量");
+//                    }
+//                }
+//            }
             ReviewOrder order = reviewOrderMapper.selectById(reviewOrderId);
             if (order == null) {
                 continue;
@@ -751,8 +757,11 @@ public class ReviewOrderApplicationService {
             if (i.getAreaSqm() != null) {
                 db.setAreaSqm(i.getAreaSqm());
             }
+            if (i.getSize() != null) {
+                db.setSize(i.getSize());
+            }
             if (qtyTouched || i.getNetWeightKg() != null || i.getGrossWeightKg() != null
-                    || i.getVolumeCbm() != null || i.getAreaSqm() != null) {
+                    || i.getVolumeCbm() != null || i.getAreaSqm() != null || i.getSize() != null) {
                 fillOperator(db);
                 reviewMaterialDetailMapper.updateById(db);
             }
@@ -792,11 +801,18 @@ public class ReviewOrderApplicationService {
 
     private void refreshReviewOrderStatus(Long reviewOrderId) {
         List<ReviewMaterialDetailPO> rows = reviewOrderMapper.queryDetailByReviewOrderId(reviewOrderId);
-        // 业务口径：只有全部明细待复核=0 时，状态才置为 2；部分复核仍保持 1。
-        // 状态 3 仅在 checkConfirm 中设置。
-        boolean allReviewed = !CollectionUtils.isEmpty(rows)
-                && rows.stream().allMatch(r -> nz(r.getPendingReviewQty()).compareTo(BigDecimal.ZERO) == 0);
-        Integer targetStatus = allReviewed ? 2 : 1;
+        // ================== 旧口径：全部明细待复核=0 置 2，部分复核保持 1 ==================
+//        // 业务口径：只有全部明细待复核=0 时，状态才置为 2；部分复核仍保持 1。
+//        // 状态 3 仅在 checkConfirm 中设置。
+//        boolean allReviewed = !CollectionUtils.isEmpty(rows)
+//                && rows.stream().allMatch(r -> nz(r.getPendingReviewQty()).compareTo(BigDecimal.ZERO) == 0);
+//        Integer targetStatus = allReviewed ? 2 : 1;
+        // ================== 新口径：部分复核/全部复核完未确认均置 复核中(2)，完全未复核保持 待复核(1) ==================
+        // 只要有任意明细已复核数量>0（部分复核 / 全部复核完未确认）即为复核中(2)；
+        // 完全未复核（全部已复核=0）保持待复核(1)。状态 3 仅在 checkConfirm 中设置。
+        boolean anyReviewed = !CollectionUtils.isEmpty(rows)
+                && rows.stream().anyMatch(r -> nz(r.getReviewedQty()).compareTo(BigDecimal.ZERO) > 0);
+        Integer targetStatus = anyReviewed ? 2 : 1;
 
         ReviewOrder order = reviewOrderMapper.selectById(reviewOrderId);
         if (order == null) {

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

@@ -3,7 +3,7 @@ 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.mhd.common.core.exception.ServiceException;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.mhd.common.core.constant.SnowFlakeConstants;
 import com.mhd.common.core.domain.po.UserPo;
@@ -175,7 +175,7 @@ public class InventoryAdjustmentRecordDomainService {
                         }
                         materialInventory.setAllocationQuantity(materialInventory.getAllocationQuantity().subtract(inventoryAdjustmentRecordDO.getAdjustQuantity()));
                         if (materialInventory.getAllocationQuantity().compareTo(BigDecimal.ZERO) < 0) {
-                            throw new ServiceException("可用数量调整之后不能小于0");
+                            throw new ServiceException("调整之后可用数量不能小于0");
                         }
                     }
                     inventoryAdjustmentRecord.setInventoryAfterQuantity(materialInventory.getInventoryQuantity());
@@ -231,7 +231,7 @@ public class InventoryAdjustmentRecordDomainService {
                 }
                 materialInventory.setAllocationQuantity(materialInventory.getAllocationQuantity().subtract(inventoryAdjustmentRecordDO.getAdjustQuantity()));
                 if (materialInventory.getAllocationQuantity().compareTo(BigDecimal.ZERO) < 0) {
-                    throw new ServiceException("可用数量调整之后不能小于0");
+                    throw new ServiceException("调整之后可用数量不能小于0");
                 }
                 inventoryAdjustmentRecord.setInventoryAfterQuantity(materialInventory.getInventoryQuantity());
                 inventoryAdjustmentRecord.setAllocationAfterQuantity(materialInventory.getAllocationQuantity());
@@ -292,7 +292,7 @@ public class InventoryAdjustmentRecordDomainService {
         //推送oms库存调整记录
         try{
             // 当仓库启用 oms 才进行推送
-            if (warehousePO.getIsEnable() == 1) {
+            if (ObjectUtil.isNotNull(warehousePO) && warehousePO.getIsEnable() == 1) {
                 Boolean pushSuccess = pushOms(materialInventory, inventoryAdjustmentRecordDO);
                 if (!pushSuccess) {
                     throw new ServiceException("库存调整推送OMS失败，请稍后重试");

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

@@ -78,7 +78,8 @@ public class MaterialInventoryImpl extends ServiceImpl<MaterialInventoryMapper,
         if ("hz".equals(queryRule)) {
             return materialInventoryMapper.queryListByHz(materialInventoryDO);
         } else if ("hzwl".equals(queryRule)) {          //  货主查询
-            return materialInventoryMapper.queryListByHzWl(materialInventoryDO);
+            return materialInventoryMapper.queryListByHz(materialInventoryDO);
+//            return materialInventoryMapper.queryListByHzWl(materialInventoryDO);
         } else if ("wl".equals(queryRule)) {          //  物料查询
             return materialInventoryMapper.queryListByWl(materialInventoryDO);
         } else if ("kw".equals(queryRule)) {

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

@@ -406,7 +406,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="selectMaterialInventoryPo1"/>
             <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
         </where>
-        GROUP BY a.MATERIAL_BASE_INFO_ID,a.WAREHOUSE_ID,a.STORAGE_SECTION_ID,a.STORAGE_LOCATION_ID order by sort_order, a.update_time desc
+        GROUP BY a.SHIPPER_ID,a.MATERIAL_BASE_INFO_ID,a.WAREHOUSE_ID,a.STORAGE_SECTION_ID,a.STORAGE_LOCATION_ID order by sort_order, a.update_time desc
     </select>
 
     <select id="queryListByKw" parameterType="com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO" resultMap="MaterialInventoryResult">
@@ -429,37 +429,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from material_inventory a
         left join material_base_info b on a.material_base_info_id = b.material_base_info_id
         inner join (
-            select material_base_info_id, warehouse_id, warehouse_code, warehouse_name,
-                   storage_section_id, storage_code, storage_name,
-                   storage_location_id, storage_location_code, storage_location_name
-            from (
-                select mi.material_base_info_id, mi.warehouse_id, mi.warehouse_code, mi.warehouse_name,
-                       mi.storage_section_id, mi.storage_code, mi.storage_name,
-                       mi.storage_location_id, mi.storage_location_code, mi.storage_location_name,
-                       row_number() over (partition by mi.material_base_info_id order by mi.create_time desc, mi.material_inventory_id desc) as wl_rn
-                from material_inventory mi
-                left join material_base_info b on mi.material_base_info_id = b.material_base_info_id
-                <where>
-                    <include refid="selectMaterialInventoryPo1Mi"/>
-                    <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
-                </where>
-            ) wl_ranked where wl_ranked.wl_rn = 1
-        ) loc on loc.material_base_info_id = a.material_base_info_id
+        select material_base_info_id, warehouse_id, warehouse_code, warehouse_name,
+        storage_section_id, storage_code, storage_name,
+        storage_location_id, storage_location_code, storage_location_name
+        from (
+        select mi.material_base_info_id, mi.warehouse_id, mi.warehouse_code, mi.warehouse_name,
+        mi.storage_section_id, mi.storage_code, mi.storage_name,
+        mi.storage_location_id, mi.storage_location_code, mi.storage_location_name,
+        row_number() over (partition by mi.material_base_info_id, mi.warehouse_id order by mi.create_time desc, mi.material_inventory_id desc) as wl_rn
+        from material_inventory mi
+        left join material_base_info b on mi.material_base_info_id = b.material_base_info_id
+        <where>
+            <include refid="selectMaterialInventoryPo1Mi"/>
+            <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
+        </where>
+        ) wl_ranked where wl_ranked.wl_rn = 1
+        ) loc on loc.material_base_info_id = a.material_base_info_id and loc.warehouse_id = a.warehouse_id
         <where>
             <include refid="selectMaterialInventoryPo1"/>
             <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
         </where>
-        GROUP BY a.MATERIAL_BASE_INFO_ID,
-                 loc.warehouse_id, loc.warehouse_code, loc.warehouse_name,
-                 loc.storage_section_id, loc.storage_code, loc.storage_name,
-                 loc.storage_location_id, loc.storage_location_code, loc.storage_location_name order by sort_order, a.update_time desc
+        GROUP BY a.MATERIAL_BASE_INFO_ID, a.WAREHOUSE_ID,
+        loc.warehouse_id, loc.warehouse_code, loc.warehouse_name,
+        loc.storage_section_id, loc.storage_code, loc.storage_name,
+        loc.storage_location_id, loc.storage_location_code, loc.storage_location_name order by sort_order, a.update_time desc
     </select>
 
     <!-- 按物料+过期日期汇总：相同物料+相同过期日期合并，不同过期日期分开 -->
     <select id="queryListByWlExpiry" parameterType="com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO" resultMap="MaterialInventoryResult">
         select
-            a.material_base_info_id, a.expiry_date, a.shipper_id, a.shipper_code, a.shipper_name,
-            a.organization_id, a.organization_name, a.top_organization_id,
+            a.material_base_info_id, a.expiry_date, a.shipper_id,
+            MAX(a.shipper_code) AS shipper_code, MAX(a.shipper_name) AS shipper_name,
+            a.organization_id, MAX(a.organization_name) AS organization_name, a.top_organization_id,
             MAX(a.warehouse_id) AS warehouse_id, MAX(a.warehouse_code) AS warehouse_code, MAX(a.warehouse_name) AS warehouse_name,
             MAX(a.storage_section_id) AS storage_section_id, MAX(a.storage_code) AS storage_code, MAX(a.storage_name) AS storage_name,
             MAX(a.storage_location_id) AS storage_location_id, MAX(a.storage_location_code) AS storage_location_code, MAX(a.storage_location_name) AS storage_location_name,
@@ -479,8 +480,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             MAX(a.batch_ref_no) AS batch_ref_no, MAX(a.sheet_ref_no) AS sheet_ref_no, MAX(a.box_pallet_no) AS box_pallet_no,
             MAX(a.bar_code) AS inv_bar_code,
             MAX(a.in_order_number) AS in_order_number, MAX(a.lot_number) AS lot_number,
-            b.specification_model,
-            b.material_code, b.material_name,
+            MAX(b.specification_model) AS specification_model,
+            MAX(b.material_code) AS material_code, MAX(b.material_name) AS material_name,
             CASE WHEN IFNULL(SUM(a.inventory_quantity), 0) = 0 THEN 1 ELSE 0 END AS sort_order
         from material_inventory a
         left join material_base_info b on a.material_base_info_id = b.material_base_info_id
@@ -488,9 +489,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="selectMaterialInventoryPo1"/>
             <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
         </where>
-        GROUP BY a.MATERIAL_BASE_INFO_ID, a.EXPIRY_DATE, a.shipper_id, a.shipper_code, a.shipper_name,
-                 a.organization_id, a.organization_name, a.top_organization_id,
-                 b.material_code, b.material_name, b.specification_model
+        GROUP BY a.MATERIAL_BASE_INFO_ID, a.EXPIRY_DATE, a.shipper_id,
+                 a.organization_id, a.top_organization_id
         order by sort_order, MAX(a.update_time) desc
     </select>
 
@@ -531,28 +531,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!-- ============ 按货主+物料+仓库+单位 汇总（库存查询第三个页签） ============ -->
     <!-- 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
+        a.shipper_id,
+        MAX(a.shipper_code) AS shipper_code,
+        MAX(a.shipper_name) AS shipper_name,
+        MAX(b.material_base_info_id) AS material_base_info_id,
+        MAX(b.material_code)       AS material_code,
+        MAX(b.material_name)       AS material_name,
+        MAX(b.SPECIFICATION_MODEL) AS SPECIFICATION_MODEL,
+        a.warehouse_id,
+        MAX(a.warehouse_code) AS warehouse_code,
+        MAX(a.warehouse_name) AS warehouse_name,
+        a.organization_id,
+        MAX(a.organization_name) AS 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"
@@ -570,10 +579,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 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
+        GROUP BY a.shipper_id,
+        b.material_code,
+        a.warehouse_id,
+        a.organization_id, a.top_organization_id
         ORDER BY sort_order, MAX(a.update_time) DESC
     </select>
 
@@ -587,7 +596,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <include refid="selectMaterialInventoryPo1"/>
             <include refid="com.mhd.wms.domain.materialBaseInfo.repository.mapper.MaterialBaseInfoMapper.JoinMaterialBaseInfoPoWhere"/>
         </where>
-        GROUP BY a.SHIPPER_ID order by sort_order, a.update_time desc
+        GROUP BY a.SHIPPER_ID, a.WAREHOUSE_ID order by sort_order, a.update_time desc
     </select>
 
     <resultMap type="com.mhd.wms.domain.materialInventory.repository.po.MaterialInventoryQueryListPO" id="MaterialQueryListResult">