From 3fe5a42be56373c1906053298808473474558212 Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Tue, 15 Oct 2024 17:11:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?=
 =?UTF-8?q?=201.=20=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceImplements/WmsTaskServiceImplements.java    |  2 +-
 .../java/com/wms/utils/excel/vo/TaskRecordExcelVo.java | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java b/src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java
index 10f0454..166a7bc 100644
--- a/src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java
+++ b/src/main/java/com/wms/service/business/serviceImplements/WmsTaskServiceImplements.java
@@ -326,7 +326,7 @@ public class WmsTaskServiceImplements implements IWmsTaskService {
                             .apply("goods_related ->> '$.remainNum' > 0")
                             .last("limit 1"));
                     if (stock == null) {
-                        // 没有库存，
+                        // 没有库存
                         outsideVehicle.setRemainNum(BigDecimal.ZERO);
                         outsideVehiclesService.updateById(outsideVehicle);
                     } else {
diff --git a/src/main/java/com/wms/utils/excel/vo/TaskRecordExcelVo.java b/src/main/java/com/wms/utils/excel/vo/TaskRecordExcelVo.java
index aeadd20..d3b0d58 100644
--- a/src/main/java/com/wms/utils/excel/vo/TaskRecordExcelVo.java
+++ b/src/main/java/com/wms/utils/excel/vo/TaskRecordExcelVo.java
@@ -139,10 +139,12 @@ public class TaskRecordExcelVo {
         recordExcelVo.setCreateTime(recordPo.getCreateTime());
         recordExcelVo.setFinishTime(recordPo.getFinishTime());
         recordExcelVo.setUserName(recordPo.getUserName());
-        recordExcelVo.setGoodsId(recordPo.getGoodsRelated().getGoodsId());
-        recordExcelVo.setGoodsName(recordPo.getGoodsRelated().getGoodsName());
-        recordExcelVo.setOpNum(recordPo.getGoodsRelated().getOpNum());
-        recordExcelVo.setOriginNum(recordPo.getGoodsRelated().getOriginNum());
+        if (recordPo.getGoodsRelated() != null) {
+            recordExcelVo.setGoodsId(recordPo.getGoodsRelated().getGoodsId());
+            recordExcelVo.setGoodsName(recordPo.getGoodsRelated().getGoodsName());
+            recordExcelVo.setOpNum(recordPo.getGoodsRelated().getOpNum());
+            recordExcelVo.setOriginNum(recordPo.getGoodsRelated().getOriginNum());
+        }
         recordExcelVo.setPreTask(recordPo.getPreTask());
         recordExcelVo.setIsPicking(recordPo.getIsPicking());
         recordExcelVo.setPickStand(recordPo.getPickStand());