From bcb19e8c93c3cabf0d8eb3ee34ed819b3c5a10ef Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 25 十一月 2024 13:14:11 +0800
Subject: [PATCH] #优化地图
---
src/main/java/com/zy/asrs/entity/LocRule.java | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocRule.java b/src/main/java/com/zy/asrs/entity/LocRule.java
index 12d5d00..b56eccb 100644
--- a/src/main/java/com/zy/asrs/entity/LocRule.java
+++ b/src/main/java/com/zy/asrs/entity/LocRule.java
@@ -1,24 +1,21 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("asr_loc_rule")
@@ -36,7 +33,8 @@
/**
* 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
+ @ExcelProperty(value = "鐗╂枡缂栫爜鍓�4浣�")
private String matnr;
/**
@@ -61,12 +59,14 @@
* 鎵瑰彿
*/
@ApiModelProperty(value= "鎵瑰彿")
+ @ExcelProperty(value = "鎵瑰彿")
private String batch;
/**
* 鍏朵粬
*/
@ApiModelProperty(value= "鍏朵粬")
+ @ExcelProperty(value = "搴撳尯")
private String other;
/**
@@ -74,6 +74,7 @@
*/
@ApiModelProperty(value= "寮�濮嬫帓")
@TableField("row_beg")
+ @ExcelProperty(value = "寮�濮嬫帓")
private Integer rowBeg;
/**
@@ -81,6 +82,7 @@
*/
@ApiModelProperty(value= "缁撴潫鎺�")
@TableField("row_end")
+ @ExcelProperty(value = "缁撴潫鎺�")
private Integer rowEnd;
/**
@@ -88,6 +90,7 @@
*/
@ApiModelProperty(value= "寮�濮嬪垪")
@TableField("bay_beg")
+ @ExcelProperty(value = "寮�濮嬪垪")
private Integer bayBeg;
/**
@@ -95,6 +98,7 @@
*/
@ApiModelProperty(value= "缁撴潫鍒�")
@TableField("bay_end")
+ @ExcelProperty(value = "缁撴潫鍒�")
private Integer bayEnd;
/**
@@ -102,6 +106,7 @@
*/
@ApiModelProperty(value= "寮�濮嬪眰")
@TableField("lev_beg")
+ @ExcelProperty(value = "寮�濮嬪眰")
private Integer levBeg;
/**
@@ -109,6 +114,7 @@
*/
@ApiModelProperty(value= "缁撴潫灞�")
@TableField("lev_end")
+ @ExcelProperty(value = "缁撴潫灞�")
private Integer levEnd;
/**
@@ -128,6 +134,7 @@
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
@TableField("create_by")
+ @ExcelProperty(value = "娣诲姞浜哄憳")
private Long createBy;
/**
@@ -159,9 +166,22 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鏄惁鏀寔娣疯浇{0:涓嶆敮鎸�,1:鏀寔}
+ */
+ @ApiModelProperty(value= "鏄惁鏀寔娣疯浇")
+ private Integer mixed;
+
+ /**
+ * 鏀寔娣疯浇鎯呭喌涓�,娌℃壘鍒板簱浣嶆槸鍚︾户缁鎵緖0:鍚�,1:鏄瘆
+ */
+ @ApiModelProperty(value= "鏄惁缁х画瀵绘壘")
+ @TableField("keep_go")
+ private Integer keepGo;
+
public LocRule() {}
- public LocRule(String matnr,String specs,String model,String cstmr,String batch,String other,Integer rowBeg,Integer rowEnd,Integer bayBeg,Integer bayEnd,Integer levBeg,Integer levEnd,Integer limit,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public LocRule(String matnr,String specs,String model,String cstmr,String batch,String other,Integer rowBeg,Integer rowEnd,Integer bayBeg,Integer bayEnd,Integer levBeg,Integer levEnd,Integer limit,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer mixed) {
this.matnr = matnr;
this.specs = specs;
this.model = model;
@@ -181,6 +201,7 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.mixed = mixed;
}
// LocRule locRule = new LocRule(
@@ -249,5 +270,18 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
+ public String getMixed$() {
+ if (this.mixed == null) {
+ return "";
+ }
+ return this.mixed == 1 ? "鏄�" : "鍚�";
+ }
+
+ public String getKeepGo$() {
+ if (this.keepGo == null) {
+ return "";
+ }
+ return this.keepGo == 1 ? "鏄�" : "鍚�";
+ }
}
--
Gitblit v1.9.1