From d07154d92334ba2ec312bf738a2a02a60350d5d9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 29 九月 2025 13:34:21 +0800
Subject: [PATCH] 2. pda 组托加减号 应该是整数加减(完成) 3. 站点状态,显示清楚	(完成) 4. 站点保存报错,	修改人,创建人员显示 错误(完成) 5. agv入库不显示 历史库位记录	(完成) 6. 任务类型,应该为入库	(完成)

---
 src/main/java/com/zy/asrs/entity/OrderDetlPakin.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
index 19ed434..935e58b 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
@@ -20,6 +20,7 @@
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Objects;
 
 @Data
 @TableName("man_order_detl_pakin")
@@ -418,6 +419,7 @@
     }
 
     public String getPakinPakoutStatus$(){
+        if (Objects.isNull(pakinPakoutStatus)) {return  null;}
         switch (this.pakinPakoutStatus){
             case 1:
                 return "Y";
@@ -467,6 +469,7 @@
         }
     }
 
+
     public String getStatus$(){
         if (null == this.status){ return null; }
         switch (this.status){
@@ -515,9 +518,6 @@
         if (null != this.anfme && this.workQty != null) {
             return this.anfme - this.workQty;
         }
-//        if (null != this.anfme && this.qty != null) {
-//            return this.anfme - this.qty;
-//        }
         return null;
     }
 

--
Gitblit v1.9.1