From 9f3f31e66b2ffb217155b9bcd294da4ec12b6e34 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 16 十月 2023 15:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs' into tzskasrs
---
src/main/java/com/zy/asrs/entity/LocRule.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 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..7449fae 100644
--- a/src/main/java/com/zy/asrs/entity/LocRule.java
+++ b/src/main/java/com/zy/asrs/entity/LocRule.java
@@ -159,9 +159,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 +194,7 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.mixed = mixed;
}
// LocRule locRule = new LocRule(
@@ -249,5 +263,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