From aabc45d4eaa8e8ff4aec23f777e50ed139ece711 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 26 三月 2025 01:14:20 +0800
Subject: [PATCH] 任务状态获取接口
---
src/main/java/com/whyc/service/WmsService.java | 4 ++--
src/main/java/com/whyc/pojo/db_wms/Task.java | 23 +++++++++++++++++++----
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/pojo/db_wms/Task.java b/src/main/java/com/whyc/pojo/db_wms/Task.java
index f079ff5..c774a4c 100644
--- a/src/main/java/com/whyc/pojo/db_wms/Task.java
+++ b/src/main/java/com/whyc/pojo/db_wms/Task.java
@@ -41,11 +41,26 @@
@ApiModelProperty(value = "鐘舵�佹椂闂�")
private Date statusTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "娲诲寲鎴栬�呮祴鍘嬪姩浣滅殑寮�濮嬫椂闂�")
- private Date executeTime;
+ @ApiModelProperty(value = "寮�濮嬪彇璐ф椂闂�")
+ private Date pickUpStartTime;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "娲诲寲鎴栬�呮祴鍘嬪姩浣滅殑缁撴潫鏃堕棿")
- private Date executeEndTime;
+ @ApiModelProperty(value = "鍙栧埌璐ф椂闂�")
+ private Date pickUpTime;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鏀剧疆鍒版椿鍖栦粨鐨勬椂闂�")
+ private Date activationChamberStartTime;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "寮�濮嬪彇娲诲寲浠撶數姹犵殑鏃堕棿")
+ private Date activationChamberPickUpTime;
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鍙栧埌娲诲寲浠撶數姹犵殑鏃堕棿")
+ private Date activationChamberEndTime;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "杩斿洖搴撲綅鏃堕棿,鏀捐揣瀹屾垚鏃堕棿")
+ private Date backFinishTime;
+
+
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
private Date createTime;
diff --git a/src/main/java/com/whyc/service/WmsService.java b/src/main/java/com/whyc/service/WmsService.java
index db957ee..422fef7 100644
--- a/src/main/java/com/whyc/service/WmsService.java
+++ b/src/main/java/com/whyc/service/WmsService.java
@@ -109,7 +109,7 @@
}
public Response sendTaskStatus(Task task) {
- //瀵规帴鏀跺埌鐨勪换鍔¤繘琛岄�昏緫鍒ゆ柇鍜屾暟鎹瓨鍌�
+ //瀵规帴鏀跺埌鐨勪换鍔¤繘琛岄�昏緫鍒ゆ柇鍜屾暟鎹瓨鍌� TODO
/*String taskNo = task.getTaskNo();
Integer status = task.getStatus();
if(status == 13 || status == 23){ //鐢垫睜鏀剧疆鍦ㄦ椿鍖栦粨鍐�
@@ -118,6 +118,6 @@
task.setExecuteEndTime(task.getStatusTime());
}*/
- return null;
+ return new Response().setII(1,"涓婃姤鐘舵�佸畬鎴�");
}
}
--
Gitblit v1.9.1