From 81623fbb54875cb0b745012f52bfa5c53c00de82 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 30 Jan 2026 18:21:34 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E5=AE=9E=E7=8E=B0=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E5=92=8C=E5=8E=9F=E6=9D=90=E6=96=99=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=A9=BA=E5=80=BC=E5=A4=84=E7=90=86=E5=8F=8A=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 WmsProductServiceImpl 中添加空值检查逻辑，将 null 值替换为"空置"
- 在 WmsRawMaterialServiceImpl 中添加空值检查逻辑，将 null 值替换为"空置"
- 为 WmsProductVo 的 productId 字段添加 Excel 导出注解
- 为 WmsRawMaterialVo 的 rawMaterialId 字段添加 Excel 导出注解
- 统一处理两个服务中的空值显示问题，提升数据展示一致性
- 增强列表查询方法的健壮性，避免返回 null 情况下的异常
---
 .../java/com/klp/domain/vo/WmsProductVo.java  |  1 +
 .../com/klp/domain/vo/WmsRawMaterialVo.java   |  1 +
 .../service/impl/WmsProductServiceImpl.java   | 25 ++++++++++++++++++-
 .../impl/WmsRawMaterialServiceImpl.java       | 25 ++++++++++++++++++-
 4 files changed, 50 insertions(+), 2 deletions(-)

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;
     }
 
     /**