From 3ad65283c54059e0c61110589fb19398ac3525fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 08 七月 2025 08:32:32 +0800
Subject: [PATCH] 完善拣料转全板
---
src/main/java/com/zy/asrs/entity/Mat.java | 91 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 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 bb98001..b37f282 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -59,8 +59,15 @@
* 鍟嗗搧缂栧彿
*/
@ApiModelProperty(value= "鍟嗗搧缂栧彿")
- @ExcelProperty(value = "鍟嗗搧缂栫爜")
+ @ExcelProperty(value = "鍟嗗搧缂栧彿")
private String matnr;
+
+ /**
+ * 鍟嗗搧缂栧彿
+ */
+ @ApiModelProperty(value= "鏂板晢鍝佺紪鍙�")
+ @ExcelProperty(value = "鏂板晢鍝佺紪鍙�")
+ private String matnrNew;
/**
@@ -306,6 +313,37 @@
@ExcelProperty(value = "澶囨敞")
private String memo;
+ /**
+ * 搴撳瓨棰勮鏁伴噺涓婇檺
+ */
+ @TableField("store_max")
+ private Double storeMax;
+
+ /**
+ * 搴撳瓨棰勮鏁伴噺涓嬮檺
+ */
+ @TableField("store_min")
+ private Double storeMin;
+
+ /**
+ * 搴撻緞棰勮涓婇檺
+ */
+ @TableField("store_max_date")
+ private Integer storeMaxDate;
+
+ /**
+ * 楂橀鍏ュ嚭搴撶墿鏂�
+ */
+ @TableField("inout_everyday")
+ private Boolean inoutEveryday;
+
+ /**
+ * 涓婃灦鍖哄煙{1:鍗曞搧鍖�,2:楂橀娣锋斁鍖�,3:浣庨娣锋斁鍖簘
+ */
+ @ApiModelProperty(value= "涓婃灦鍖哄煙")
+ @TableField("mat_type")
+ private Integer matType;
+
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) {
@@ -492,4 +530,55 @@
}
+ public String getStoreMax$(){
+ if (Cools.isEmpty(this.storeMax)) {
+ return "";
+ }else {
+ return this.storeMax + "";
+ }
+ }
+
+ public String getStoreMin$(){
+ if (Cools.isEmpty(this.storeMin)) {
+ return "";
+ }else {
+ return this.storeMin + "";
+ }
+ }
+
+ public String getStoreMaxDate$(){
+ if (Cools.isEmpty(this.storeMaxDate)) {
+ return "";
+ }else {
+ return this.storeMaxDate + "";
+ }
+ }
+
+ public String getInoutEveryday$(){
+ if (this.inoutEveryday == null){
+ return "鍚�";
+ }
+ if (this.inoutEveryday){
+ return "鏄�";
+ }else {
+ return "鍚�";
+ }
+ }
+
+ public String getMatType$() {
+ if (this.matType == null) {
+ return "";
+ }
+ switch (this.matType) {
+ case 1:
+ return "鍗曞搧鍖�";
+ case 2:
+ return "楂橀娣锋斁鍖�";
+ case 3:
+ return "浣庨娣锋斁鍖�";
+ default:
+ return "";
+ }
+ }
+
}
--
Gitblit v1.9.1