diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java
index 95d681fe..ef518a22 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java
@@ -25,6 +25,7 @@ public class WmsProductVo {
     /**
      * 主键ID
      */
+    @ExcelProperty(value = "ID")
     private Long productId;
 
     /**
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsRawMaterialVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsRawMaterialVo.java
index 6bb16664..da8f4df0 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsRawMaterialVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsRawMaterialVo.java
@@ -25,6 +25,7 @@ public class WmsRawMaterialVo {
     /**
      * 主键ID
      */
+    @ExcelProperty(value = "ID")
     private Long rawMaterialId;
 
     /**
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java
index 8c206f32..feb36869 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java
@@ -85,7 +85,30 @@ public class WmsProductServiceImpl implements IWmsProductService {
     @Override
     public List<WmsProductVo> queryList(WmsProductBo bo) {
         LambdaQueryWrapper<WmsProduct> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        List<WmsProductVo> wmsProductVos = baseMapper.selectVoList(lqw);
+        // 处理空值替换为"空置"
+        if (wmsProductVos != null) {
+            for (WmsProductVo vo : wmsProductVos) {
+                if (vo.getSpecification() == null) {
+                    vo.setSpecification("空置");
+                }
+                if (vo.getMaterial() == null) {
+                    vo.setMaterial("空置");
+                }
+                if (vo.getManufacturer() == null) {
+                    vo.setManufacturer("空置");
+                }
+                if (vo.getSurfaceTreatmentDesc() == null) {
+                    vo.setSurfaceTreatmentDesc("空置");
+                }
+                if (vo.getZincLayer() == null) {
+                    vo.setZincLayer("空置");
+                }
+            }
+        } else {
+            wmsProductVos = new java.util.ArrayList<>();
+        }
+        return wmsProductVos;
     }
 
     private LambdaQueryWrapper<WmsProduct> buildQueryWrapper(WmsProductBo bo) {
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java
index 3e81dce8..9e8cfbac 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java
@@ -91,7 +91,30 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService {
     @Override
     public List<WmsRawMaterialVo> queryList(WmsRawMaterialBo bo) {
         LambdaQueryWrapper<WmsRawMaterial> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        List<WmsRawMaterialVo> wmsRawMaterialVos = baseMapper.selectVoList(lqw);
+        // 处理空值替换为"空置"
+        if (wmsRawMaterialVos != null) {
+            for (WmsRawMaterialVo vo : wmsRawMaterialVos) {
+                if (vo.getSpecification() == null) {
+                    vo.setSpecification("空置");
+                }
+                if (vo.getMaterial() == null) {
+                    vo.setMaterial("空置");
+                }
+                if (vo.getManufacturer() == null) {
+                    vo.setManufacturer("空置");
+                }
+                if (vo.getSurfaceTreatmentDesc() == null) {
+                    vo.setSurfaceTreatmentDesc("空置");
+                }
+                if (vo.getZincLayer() == null) {
+                    vo.setZincLayer("空置");
+                }
+            }
+        } else {
+            wmsRawMaterialVos = new java.util.ArrayList<>();
+        }
+        return wmsRawMaterialVos;
     }
 
     /**