From 8ef2c9bf15e8d3b70fcf1cffe98d4f6ff0fc9ed6 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 21 十一月 2025 09:40:09 +0800
Subject: [PATCH] Merge branch 'devlop_whxrwms' of http://47.97.1.152:5880/r/wms-master into devlop_whxrwms

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
index da508bf..40aa121 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
@@ -179,6 +179,10 @@
     @ApiModelProperty(value= "娣诲姞浜哄憳")
     private Long createBy;
 
+    /**鐜板搧绁ㄥ彿*/
+    @TableField(exist = false)
+    private String crushNo;
+
     /**
      * 娣诲姞鏃堕棿
      */
@@ -263,6 +267,19 @@
         return dictDatas.getLabel();
     }
 
+    public String getWkType$(){
+        if (Cools.isEmpty(this.wkType)){
+            return "";
+        }
+        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE).eq(DictData::getValue, this.wkType));
+        if (Objects.isNull(dictData)) {
+            return null;
+        }
+        return dictData.getLabel();
+    }
+
+
     public String getIsptResult$(){
         if (Cools.isEmpty(this.isptResult)){
             return null;

--
Gitblit v1.9.1