From 223ce7dcb236cad6679275d8941e1a909f8a1efc Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 21 一月 2026 10:12:30 +0800
Subject: [PATCH] #库区分配
---
src/main/java/com/zy/asrs/entity/Mat.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index bee0346..3501573 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -5,8 +5,10 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.AreaService;
import com.zy.asrs.service.TagService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -325,9 +327,16 @@
@TableField("store_max_date")
private Integer storeMaxDate;
+ /**
+ * 搴撳尯id
+ */
+ @ApiModelProperty(value= "搴撳尯id")
+ @TableField("area_id")
+ private String areaId;
+
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) {
+ 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,String areaId) {
this.uuid = uuid;
this.tagId = tagId;
this.matnr = matnr;
@@ -365,6 +374,7 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.areaId = areaId;
}
// Mat mat = new Mat(
@@ -416,6 +426,18 @@
return null;
}
+ public String getAreaId$(){
+ if (Cools.isEmpty(this.areaId)){
+ return null;
+ }
+ AreaService service = SpringUtils.getBean(AreaService.class);
+ Area area = service.selectOne(new EntityWrapper<Area>().eq("area_id", this.areaId));
+ if (!Cools.isEmpty(area)){
+ return String.valueOf(area.getAreaName());
+ }
+ return null;
+ }
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
--
Gitblit v1.9.1