From ee81afd33e786beb38c9074113ccafa997c8c1d0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 21 十一月 2023 08:56:20 +0800
Subject: [PATCH] #指令日志更新
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index e896efc..9ac98fe 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -13,10 +13,12 @@
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
@Data
@TableName("asr_wrk_mast")
@@ -308,6 +310,25 @@
@TableField("full_plt")
private String fullPlt;
+ /**
+ * wms浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "wms浠诲姟鍙�")
+ @TableField("task_no")
+ private String taskNo;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @ApiModelProperty(value= "缁撴潫鏃堕棿")
+ @TableField("end_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+ //鍛戒护list
+ @TableField(exist = false)
+ private List<CommandInfo> children;
+
public String getWrkSts$(){
BasWrkStatusMapper mapper = SpringUtils.getBean(BasWrkStatusMapper.class);
BasWrkStatus entity = mapper.selectById(this.wrkSts);
@@ -484,4 +505,36 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
}
+ public String getEndTime$(){
+ if (Cools.isEmpty(this.endTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
+ }
+
+ /**
+ * 鑾峰彇鎸佺画鏃堕棿
+ */
+ public String getDurationTime() {
+ if (Cools.isEmpty(this.ioTime)) {
+ return "";
+ }
+
+ Date endDate = new Date();
+ if (!Cools.isEmpty(this.endTime)) {
+ endDate = this.endTime;
+ }
+
+ //鐢ㄦ潵鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勬绉掓暟
+ long l = this.ioTime.getTime() - endDate.getTime();
+
+ //鍒嗗埆璁＄畻鐩稿樊鐨勫ぉ銆佸皬鏃躲�佸垎銆佺
+ long day = l / (24 * 60 * 60 * 1000);
+ long hour = (l / (60 * 60 * 1000) - day * 24);
+ long min = ((l / (60 * 1000)) - day * 24 * 60 - hour * 60);
+ long s = (l / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
+
+ return Math.abs(day) + "澶�" + Math.abs(hour) + "灏忔椂" + Math.abs(min) + "鍒�" + Math.abs(s) + "绉�";
+ }
+
}
--
Gitblit v1.9.1