From 3e8d4b125c75539a5526eab17908b70005ea85a0 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 22 五月 2023 10:55:19 +0800
Subject: [PATCH] WMS任务完成、取消功能
---
src/main/java/com/zy/asrs/entity/WmsWrk.java | 40 ++++++++++++++++++----------------------
1 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WmsWrk.java b/src/main/java/com/zy/asrs/entity/WmsWrk.java
index ac4efbb..b11d78d 100644
--- a/src/main/java/com/zy/asrs/entity/WmsWrk.java
+++ b/src/main/java/com/zy/asrs/entity/WmsWrk.java
@@ -10,32 +10,10 @@
import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasCrnpService;
-import com.zy.asrs.entity.BasCrnp;
-import com.core.common.SpringUtils;
import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.entity.LocMast;
-import com.core.common.SpringUtils;
import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.entity.BasDevp;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.entity.BasDevp;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.entity.LocMast;
-import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -176,6 +154,14 @@
@TableField("barcode")
private String barcode;
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @ApiModelProperty(value= "缁撴潫鏃堕棿")
+ @TableField("end_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
public WmsWrk() {}
public WmsWrk(Integer wmsWrkNo, Integer wmsStatus, Integer wrkNo, Date createTime, Integer ioType, Double ioPri, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String locSts, String picking, Long modiUser, Date modiTime, Long appeUser, Date appeTime, String memo, String barcode) {
@@ -309,6 +295,13 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public String getEndTime$(){
+ if (Cools.isEmpty(this.endTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
+ }
+
/**
* 鑾峰彇鎸佺画鏃堕棿
*/
@@ -318,6 +311,9 @@
}
Date endDate = new Date();
+ if (!Cools.isEmpty(this.endTime)) {
+ endDate = this.endTime;
+ }
//鐢ㄦ潵鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勬绉掓暟
long l = this.createTime.getTime() - endDate.getTime();
--
Gitblit v1.9.1