From 4c98ecfe56a77a17352d01163b9b86fa98f0f2a9 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期三, 24 五月 2023 14:47:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs --- src/main/java/com/zy/asrs/entity/Mat.java | 71 ++++++++++++++++++++++++++++++++++- 1 files changed, 69 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..0e6d939 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; /** @@ -151,7 +158,7 @@ * 鍘傚 */ @ApiModelProperty(value= "鍘傚") - @ExcelProperty(value = "鍟嗗搧缂栧彿") + @ExcelProperty(value = "鍘傚") private String manu; /** @@ -305,6 +312,31 @@ @ApiModelProperty(value= "澶囨敞") @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; + public Mat() {} @@ -492,4 +524,39 @@ } + 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 "鍚�"; + } + } + } -- Gitblit v1.9.1