From 5c0ac8adccb4d895148ee32ca7afc9a07d50e635 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 21 五月 2025 18:47:13 +0800
Subject: [PATCH] 添加作业临时库存表 优化拣料出库作业

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
index 52d60b1..b64b727 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
@@ -56,6 +56,8 @@
     @ApiModelProperty(value= "浠诲姟鐘舵��")
     private Short taskStatus;
 
+    @ApiModelProperty("涓婄骇浠诲姟ID")
+    private Long parentId;
 
     @ApiModelProperty("浠撳簱绫诲瀷")
     private Short warehType;
@@ -253,7 +255,7 @@
         if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
             return null;
         }
-        return dictDatas.getLabel();
+        return dictDatas.getValue() + "." + dictDatas.getLabel();
     }
 
     public String getTaskType$() {
@@ -267,7 +269,7 @@
         if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
             return null;
         }
-        return dictDatas.getLabel();
+        return dictDatas.getValue() + "." + dictDatas.getLabel();
     }
 
     public String getStartTime$(){

--
Gitblit v1.9.1