From c9b270dae703ee077a4e41013d7662c5e61afd29 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 26 五月 2025 23:02:15 +0800
Subject: [PATCH] #ZH

---
 src/main/java/com/zy/asrs/entity/param/WcsTaskListParam.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/WcsTaskListParam.java b/src/main/java/com/zy/asrs/entity/param/WcsTaskListParam.java
index 285a9be..b4e968e 100644
--- a/src/main/java/com/zy/asrs/entity/param/WcsTaskListParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/WcsTaskListParam.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.entity.param;
 
+import com.core.common.Cools;
 import com.zy.asrs.entity.WrkMast;
 import lombok.Data;
 
@@ -24,10 +25,12 @@
 
     public WcsTaskListParam(WrkMast wrkMast){
         this.taskNo = wrkMast.getWrkNo().toString();
-        this.rgvNo = wrkMast.getRgvNo().toString();
+        this.rgvNo = Cools.isEmpty(wrkMast.getRgvNo()) ? null:wrkMast.getRgvNo().toString();
         this.startSta = wrkMast.getSourceStaNo().toString();
         this.endSta = wrkMast.getStaNo().toString();
         this.status = wrkMast.getWrkSts().intValue();
-        this.error.add(wrkMast.getErrorMemo());
+        if (!Cools.isEmpty(wrkMast.getErrorMemo())){
+            this.error.add(wrkMast.getErrorMemo());
+        }
     }
 }

--
Gitblit v1.9.1