From 94e3cc94d83f5ec1bb64e48360a15d057f3643d9 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 12 十二月 2025 15:32:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jsxswms' into jsxswms
---
src/main/java/com/zy/asrs/entity/TaskDetl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/TaskDetl.java b/src/main/java/com/zy/asrs/entity/TaskDetl.java
index cde2747..f683c1f 100644
--- a/src/main/java/com/zy/asrs/entity/TaskDetl.java
+++ b/src/main/java/com/zy/asrs/entity/TaskDetl.java
@@ -1,9 +1,14 @@
package com.zy.asrs.entity;
import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.zy.asrs.service.MatService;
+import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
@@ -22,6 +27,7 @@
import java.io.Serializable;
@Data
+@Accessors(chain = true)
@TableName("agv_task_detl")
public class TaskDetl implements Serializable {
@@ -473,6 +479,15 @@
return null;
}
+ public String getTag$() {
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat order = service.selectOne(new EntityWrapper<Mat>().eq("matnr", this.matnr));
+ if (Cools.isEmpty(order)){
+ return null;
+ }
+ return order.getTagId$();
+ }
+
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
--
Gitblit v1.9.1