From 8b75fe61a3eefe36761aa0f82a79b59342aa6709 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 20 十月 2025 16:10:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkMastSta.java | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSta.java b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
index ae3679d..cb3fba4 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastSta.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
@@ -34,6 +34,20 @@
private Long wrkNo;
/**
+ * rvg鍙�
+ */
+ @ApiModelProperty(value = "RGV缂栧彿")
+ @TableField("rgv_no")
+ private Integer rgvNo;
+
+ /**
+ * 宸ヤ綅鍙�
+ */
+ @ApiModelProperty(value = "宸ヤ綅鍙�")
+ @TableField("work_sta")
+ private Integer workSta;
+
+ /**
* 宸ヤ綔妗ｅ紑濮嬩綅缃�
*/
@ApiModelProperty(value = "宸ヤ綔妗ｅ紑濮嬩綅缃�")
@@ -114,6 +128,8 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date bignTime;
+ private Integer mk;
+
public WrkMastSta() {
}
@@ -121,12 +137,13 @@
this.wrkNo = wrkMast.getWrkNo().longValue();
this.wrkStart = wrkMast.getSourceStaNo();
this.wrkEnd = wrkMast.getStaNo();
- this.staStart = basDevp.getDevNo();
+ this.staStart = getStaSta(basDevp.getDevNo());
this.staEnd = getStaEnd(wrkMast.getStaNo());
this.createTime = now;
this.updateTime = now;
this.wrkSts = 0;
this.bignTime = now;
+ this.mk = 0;
}
public WrkMastSta(Date now, Integer staStart) {
@@ -194,11 +211,11 @@
public Integer getStaEnd(Integer souSta) {
switch (souSta) {
- case 100:
- case 103:
- case 106:
- case 109:
- case 112:
+ case 2010: return 2012;
+ case 2004: return 2006;
+ case 2016: return 2018;
+ case 2022: return 2024;
+ case 2028: return 2030;
case 115:
return souSta + 1;
default:
@@ -206,6 +223,27 @@
}
}
+ public Integer getStaSta(Integer souSta) {
+ switch (souSta) {
+ case 1043: return 1042;
+ case 1104: return 1105;
+ case 1005: return 1007;
+ case 1008: return 1010;
+ case 1019: return 1021;
+ case 1022: return 1024;
+ case 1029: return 1031;
+ case 2001: return 2003;
+ case 2007: return 2009;
+ case 2013: return 2015;
+ case 2019: return 2021;
+ case 2025: return 2027;
+ default:
+ return souSta;
+ }
+ }
+
+
+
public String getType$() {
if (Cools.isEmpty(this.type)) {
return "";
--
Gitblit v1.9.1