From fd4ce2e507d27baceae451027ea1273c17739830 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 24 一月 2024 19:12:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkMastSta.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSta.java b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
index 75e3427..a500865 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastSta.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
@@ -80,7 +80,7 @@
/**
* 绫诲瀷 0:闈炵┖ 1:绌烘澘
*/
- @ApiModelProperty(value= "绫诲瀷 0:闈炵┖ 1:绌烘澘")
+ @ApiModelProperty(value= "绫诲瀷 1:婊＄増 2:绌烘澘")
private Integer type;
/**
@@ -100,9 +100,16 @@
/**
* 宸ヤ綔绫诲瀷
*/
- @ApiModelProperty(value= "宸ヤ綔绫诲瀷")
+ @ApiModelProperty(value= "宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭媶鐩� 5锛氭弧鍙� 6锛氭弧鏀�")
@TableField("wrk_type")
private Integer wrkType;
+
+ /**
+ * 宸ヤ綔绫诲瀷
+ */
+ @ApiModelProperty(value= "宸ヤ綔绫诲瀷")
+ @TableField("wrk_crn")
+ private Integer wrkCrn;
/**
* 鏍囪鏃堕棿
@@ -113,6 +120,18 @@
private Date bignTime;
public WrkMastSta() {}
+
+ public WrkMastSta(Date now, Integer staStart) {
+ this.wrkNo = staStart.longValue()+19999;
+ this.wrkStart = staStart;
+ this.wrkEnd = staStart;
+ this.staStart = staStart;
+ this.staEnd = staStart;
+ this.createTime = now;
+ this.updateTime = now;
+ this.wrkSts = 0;
+ this.bignTime = now;
+ }
public WrkMastSta(Long wrkNo, Integer wrkStart, Integer wrkEnd, Integer staStart, Integer staEnd, Date createTime, Date updateTime, Integer type, Integer wrkSts, Integer lineNumber, Integer wrkType, Date bignTime) {
this.wrkNo = wrkNo;
@@ -129,6 +148,20 @@
this.bignTime = bignTime;
}
+ public Integer getStaEnd(Integer souSta) {
+ switch (souSta) {
+ case 100:
+ case 103:
+ case 106:
+ case 109:
+ case 112:
+ case 115:
+ return souSta + 1;
+ default:
+ return souSta;
+ }
+ }
+
// WrkMastSta wrkMastSta = new WrkMastSta(
// null, // 宸ヤ綔鍙穂闈炵┖]
// null, // 宸ヤ綔妗ｅ紑濮嬩綅缃甗闈炵┖]
--
Gitblit v1.9.1