From e38cf917b19b91bf6c8f07c70fb7bb391e1e80c0 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 18 十二月 2024 13:10:44 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/LocDetl.java |   41 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 40 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 5876784..58d036c 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -103,7 +103,7 @@
     private Double weight;
 
     @ApiModelProperty(value= "闀垮害")
-    private Double length;
+    private Double man_length;
 
     @ApiModelProperty(value= "浣撶Н")
     private Double volume;
@@ -164,6 +164,30 @@
      */
     @ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠   ")
     private Integer owner;
+
+    /**
+     * 澶囩敤1
+     */
+    @ApiModelProperty(value= "澶囩敤1")
+    private String standby1;
+
+    /**
+     * 澶囩敤2
+     */
+    @ApiModelProperty(value= "澶囩敤2")
+    private String standby2;
+
+    /**
+     * 澶囩敤3
+     */
+    @ApiModelProperty(value= "澶囩敤3")
+    private String standby3;
+
+    /**
+     * 鏄惁鍐荤粨
+     */
+    @ApiModelProperty(value= "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�")
+    private Integer frozen;
 
     public String getLocNo$(){
         LocMastService service = SpringUtils.getBean(LocMastService.class);
@@ -265,6 +289,9 @@
 
     public long getStoreDate(){
         long timeNow = new Date().getTime();
+        if (this.appeTime == null){
+            return 0;
+        }
         long timeCreate = this.appeTime.getTime();
 
         return (timeNow - timeCreate) /24/60/60/1000;
@@ -274,4 +301,16 @@
         Synchro.Copy(source, this);
     }
 
+    public String getFrozen$() {
+        if (null == this.frozen){ return null; }
+        switch (this.frozen){
+            case 0:
+                return "鏈喕缁�";
+            case 1:
+                return "宸插喕缁�";
+            default:
+                return null;
+        }
+    }
+
 }

--
Gitblit v1.9.1