From d57d1ec5df1181244c0a9e425910d562feb2f5a2 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期二, 16 一月 2024 09:36:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index ef45851..6c1ba9c 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -236,7 +236,7 @@
private Integer deadWarn;
/**
- * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 銆併�佹睙閾滐細鏄惁纭 1: 纭 2: 鏈‘璁�
*/
@ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
@@ -294,6 +294,10 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+ @ApiModelProperty(value = "閫�搴撴爣璁�")
+ @TableField("tk_type")
+ private Integer tkType;
public OrderDetl() {}
@@ -360,17 +364,26 @@
}
}
+// public String getSource$(){
+// if (null == this.source){ return null; }
+// switch (this.source){
+// case 1:
+// return "鍒堕��";
+// case 2:
+// return "閲囪喘";
+// case 3:
+// return "澶栧崗";
+// default:
+// return String.valueOf(this.source);
+// }
+// }
public String getSource$(){
- if (null == this.source){ return null; }
+ if (null == this.source){ return "鏈‘璁�"; }
switch (this.source){
case 1:
- return "鍒堕��";
- case 2:
- return "閲囪喘";
- case 3:
- return "澶栧崗";
+ return "宸茬‘璁�";
default:
- return String.valueOf(this.source);
+ return "鏈‘璁�";
}
}
@@ -384,6 +397,14 @@
default:
return String.valueOf(this.inspect);
}
+ }
+
+ public String getTkType$(){
+ if (null == this.tkType) return "姝ｅ父";
+ if (this.tkType == 1) {
+ return "閫�搴�";
+ }
+ return "姝ｅ父";
}
public String getDanger$(){
@@ -442,6 +463,13 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
+ public String getQty$(){
+ if (getAnfme().equals(getQty())){
+ return "宸插畬鎴�";
+ }
+ return "鏈畬鎴�";
+ }
+
public Double getEnableQty() {
if (null != this.anfme && this.workQty != null) {
return this.anfme - this.workQty;
--
Gitblit v1.9.1