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 | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 0a02150..3501573 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -5,9 +5,12 @@
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;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -151,7 +154,7 @@
* 鍘傚
*/
@ApiModelProperty(value= "鍘傚")
- @ExcelProperty(value = "鍟嗗搧缂栧彿")
+ @ExcelProperty(value = "鍘傚")
private String manu;
/**
@@ -306,9 +309,34 @@
@ExcelProperty(value = "澶囨敞")
private String memo;
+ /**
+ * 搴撳瓨棰勮鏁伴噺涓婇檺
+ */
+ @TableField("store_max")
+ private Double storeMax;
+
+ /**
+ * 搴撳瓨棰勮鏁伴噺涓嬮檺
+ */
+ @TableField("store_min")
+ private Double storeMin;
+
+ /**
+ * 搴撻緞棰勮涓婇檺
+ */
+ @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;
@@ -346,6 +374,7 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.areaId = areaId;
}
// Mat mat = new Mat(
@@ -393,6 +422,18 @@
Tag tag = service.selectById(this.tagId);
if (!Cools.isEmpty(tag)){
return String.valueOf(tag.getName());
+ }
+ 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;
}
@@ -491,5 +532,8 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
}
--
Gitblit v1.9.1