From 75d0daa4f8dc2010ec92f35cac08a19d240ca45d Mon Sep 17 00:00:00 2001
From: ynhfasrs <ynhfasrs@qq.com>
Date: 星期五, 27 六月 2025 14:23:37 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/LocMast.java |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index cd931b9..8495902 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -6,6 +6,7 @@
 import com.baomidou.mybatisplus.enums.IdType;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasLocStsService;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
@@ -163,7 +164,11 @@
     @ApiModelProperty(value= "")
     private String mk;
 
-    @ApiModelProperty(value= "")
+    /**
+     * 鎵樼洏鐮�
+     */
+    @ApiModelProperty(value= "鎵樼洏鐮�")
+    @TableField("barcode")
     private String barcode;
 
     @ApiModelProperty(value= "")
@@ -174,6 +179,26 @@
     @TableField("ctn_no")
     private String ctnNo;
 
+    @ApiModelProperty(value= "")
+    private String status;
+
+    @TableField(exist = false)
+    private String containerCode;
+    @TableField(exist = false)
+    private String containerTypeCode;
+    @TableField(exist = false)
+    private String emptyContainer;
+
+    public String getEmptyContainer$(){
+        if (Cools.isEmpty(this.emptyContainer)){
+            return "";
+        }
+        if (this.emptyContainer.equals("1")){
+            return "Y";
+        }else {
+            return "N";
+        }
+    }
     public String getIoTime$(){
         if (Cools.isEmpty(this.ioTime)){
             return "";
@@ -269,4 +294,13 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
     }
 
+    public String getLocSts$(){
+        BasLocStsService service = SpringUtils.getBean(BasLocStsService.class);
+        BasLocSts basLocSts = service.selectById(this.locSts);
+        if (!Cools.isEmpty(basLocSts)){
+            return String.valueOf(basLocSts.getLocDesc());
+        }
+        return null;
+    }
+
 }

--
Gitblit v1.9.1