From 69cfd1cfd760e6af3f0c5353eacdf38c7af8b56a Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 05 一月 2024 12:59:43 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
index 767a28c..faca236 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
@@ -3,7 +3,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.zy.asrs.common.wms.service.ManTagService;
+import com.zy.asrs.common.wms.service.TagService;
import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +19,7 @@
import java.io.Serializable;
@Data
-@TableName("wms_man_mat")
+@TableName("wms_mat")
public class Mat implements Serializable {
private static final long serialVersionUID = 1L;
@@ -255,6 +255,12 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 浠撳簱ID
+ */
+ @ApiModelProperty(value= "浠撳簱ID")
+ private Long hostId;
+
public Mat() {}
public Mat(String uuid, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
@@ -338,10 +344,10 @@
// );
public String getTagId$(){
- ManTagService manTagService = SpringUtils.getBean(ManTagService.class);
- Tag tag = manTagService.getById(this.tagId);
+ TagService tagService = SpringUtils.getBean(TagService.class);
+ Tag tag = tagService.getById(this.tagId);
if (!Cools.isEmpty(tag)){
- return String.valueOf(tag.getId());
+ return String.valueOf(tag.getName());
}
return null;
}
--
Gitblit v1.9.1