From d04fe2f4e7fc1f46ef4e85e640eefdd9127b4db3 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 11 十二月 2025 15:01:48 +0800
Subject: [PATCH] 入库单功能优化
---
src/main/java/com/zy/asrs/entity/Mat.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index bdd9654..f266c7b 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -7,6 +7,8 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zy.api.enums.MatLocType;
import com.zy.asrs.enums.ContainerType;
import com.zy.asrs.service.BasContainerService;
import com.zy.asrs.service.TagService;
@@ -305,10 +307,12 @@
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("update_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@ApiModelProperty("搴撲綅绫诲瀷")
@TableField("loc_type")
+ @ExcelProperty(value = "搴撲綅绫诲瀷")
private Long locType;
/**
@@ -419,12 +423,12 @@
// );
public String getTagId$(){
- TagService service = SpringUtils.getBean(TagService.class);
- Tag tag = service.selectById(this.tagId);
- if (!Cools.isEmpty(tag)){
- return String.valueOf(tag.getName());
- }
- return null;
+// TagService service = SpringUtils.getBean(TagService.class);
+// Tag tag = service.selectById(this.tagId);
+// if (!Cools.isEmpty(tag)){
+// return String.valueOf(tag.getName());
+// }
+ return MatLocType.getTagName(this.tagId + "");
}
public String getLocType$(){
--
Gitblit v1.9.1