From 16daa2a44e5fa705e671f5ff18631eb26ad70d40 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 18 二月 2024 14:24:34 +0800
Subject: [PATCH] 库区管理bug修复
---
src/main/java/com/zy/asrs/entity/Mat.java | 24 ++++++++++++++++++++++--
1 files changed, 22 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..7a187c2 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -8,6 +8,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
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 +152,7 @@
* 鍘傚
*/
@ApiModelProperty(value= "鍘傚")
- @ExcelProperty(value = "鍟嗗搧缂栧彿")
+ @ExcelProperty(value = "鍘傚")
private String manu;
/**
@@ -306,9 +307,22 @@
@ExcelProperty(value = "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("inventory_max")
+ private Integer inventoryMax;
+
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("inventory_min")
+ private Integer inventoryMin;
+
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("inventory_age_max")
+ private Integer inventoryAgeMax;
+
+
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,Integer inventoryMin,Integer inventoryMax,Integer inventoryAgeMax) {
this.uuid = uuid;
this.tagId = tagId;
this.matnr = matnr;
@@ -346,6 +360,9 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.inventoryAgeMax = inventoryAgeMax;
+ this.inventoryMax = inventoryMax;
+ this.inventoryMin = inventoryMin;
}
// Mat mat = new Mat(
@@ -491,5 +508,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