From fe0b22ed3a56a53f0d9ccd95e09d009634d34b65 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期日, 13 七月 2025 16:05:01 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/entity/WrkDetlLog.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index dd5ee4c..988850b 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -2,8 +2,10 @@
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasBoxTypeService;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,6 +14,7 @@
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName("asr_wrk_detl_log")
@@ -268,6 +271,13 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    /**
+     * 鍗蜂俊鎭疘D
+     */
+    @ApiModelProperty(value= "鍗蜂俊鎭疘D")
+    @TableField("roll_up")
+    private Long rollUp;
+
     public String getIoTime$(){
         if (Cools.isEmpty(this.ioTime)){
             return "";
@@ -305,7 +315,7 @@
         if (null == this.source){ return "鏈‘璁�"; }
         switch (this.source){
             case 1:
-                return "纭";
+                return "宸茬‘璁�";
             default:
                 return "鏈‘璁�";
         }
@@ -315,7 +325,7 @@
         if (null == this.source){ return "鏈‘璁�"; }
         switch (this.source){
             case 1:
-                return "纭";
+                return "宸茬‘璁�";
             default:
                 return "鏈‘璁�";
         }
@@ -337,9 +347,11 @@
         if (null == this.danger){ return null; }
         switch (this.danger){
             case 1:
-                return "鏄�";
+                return "鍚堟牸";
+            case 2:
+                return "涓嶅悎鏍�";
             case 0:
-                return "鍚�";
+                return "寰呭垽";
             default:
                 return String.valueOf(this.danger);
         }
@@ -377,5 +389,14 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
 
+    public String getBrand$(){
+        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
+        for (BasBoxType basBoxType:basBoxTypes){
+            return String.valueOf(basBoxType.getBoxSpecs());
+        }
+        return this.brand;
+    }
+
 
 }

--
Gitblit v1.9.1