From f873c89d87eb16ee83c0058d9a841a97d8e2bf14 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 08 七月 2024 18:12:11 +0800
Subject: [PATCH] gwcs请求入库参数修改
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 61 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index f33acd0..b917411 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -65,6 +65,10 @@
@TableField("crn_no")
private Integer crnNo;
+
+ /**
+ * 寰愬伐姹変簯鎷嗗灈鏍囪 0: 鍒濆 1銆佹湭鎷嗗凡涓婃姤 2: 宸叉媶 3:宸插鐞嗗彲涓嬩竴姝ワ紙杞巻鍙叉。锛�
+ */
@ApiModelProperty(value= "")
@TableField("sheet_no")
private String sheetNo;
@@ -374,21 +378,22 @@
}
public String getStaNo$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.staNo);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
+// BasDevpService service = SpringUtils.getBean(BasDevpService.class);
+// BasDevp basDevp = service.selectById(this.staNo);
+// if (!Cools.isEmpty(basDevp)){
+// return String.valueOf(basDevp.getDevNo());
+// }
+ return String.valueOf(this.staNo);
}
public String getSourceStaNo$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.sourceStaNo);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
+
+// BasDevpService service = SpringUtils.getBean(BasDevpService.class);
+// BasDevp basDevp = service.selectById(this.sourceStaNo);
+// if (!Cools.isEmpty(basDevp)){
+// return String.valueOf(basDevp.getDevNo());
+// }
+ return String.valueOf(this.sourceStaNo);
}
public String getSourceLocNo$(){
@@ -481,12 +486,12 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
- public void setErrorMemo(String errorMemo) {
- if (errorMemo.length() > 255) {
- errorMemo = errorMemo.substring(0, 150);
- }
- this.errorMemo = errorMemo;
- }
+// public void setErrorMemo(String errorMemo) {
+// if (errorMemo.length() > 255) {
+// errorMemo = errorMemo.substring(0, 150);
+// }
+// this.errorMemo = errorMemo;
+// }
public String getLogErrTime$(){
if (Cools.isEmpty(this.logErrTime)){
@@ -495,6 +500,26 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
}
+ public String getSheetNo$(){
+ if (null == this.sheetNo){ return "鏈煡"; }
+ switch (this.sheetNo){
+ case "0":
+ return "榛樿";
+ case "1":
+ return "鏈烘鑷傛姄鍙栦腑";
+ case "2":
+ return "鎶撳彇瀹屾垚";
+ case "3":
+ return "浠诲姟瀹屾垚";
+ case "4":
+ return "鏈烘鑷傛姄鍙栦腑";
+ case "5":
+ return "鐮佸灈瀹屾垚";
+ default:
+ return this.sheetNo;
+ }
+ }
+
}
--
Gitblit v1.9.1