From b0bdf9ac3afec7e027ab8c8d41c12c11b57a46e0 Mon Sep 17 00:00:00 2001
From: Comair <1464848666@qq.com>
Date: Tue, 20 May 2025 09:40:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=A1=A8=E6=B7=BB=E5=8A=A0ag?=
 =?UTF-8?q?v=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/shkj/wcs/domain/BusinDataTask.java  | 11 +++++------
 .../wcs/service/impl/BusinDataTaskServiceImpl.java    |  8 +++++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/shkj-wms/src/main/java/com/shkj/wcs/domain/BusinDataTask.java b/shkj-wms/src/main/java/com/shkj/wcs/domain/BusinDataTask.java
index cbdd52a..d4d66ad 100644
--- a/shkj-wms/src/main/java/com/shkj/wcs/domain/BusinDataTask.java
+++ b/shkj-wms/src/main/java/com/shkj/wcs/domain/BusinDataTask.java
@@ -117,17 +117,11 @@ public class BusinDataTask implements Serializable {
     @Excel(name = "AGV编号")
     private String agvNo;
 
-    /** 冲孔机编号 */
-    @Excel(name = "冲孔机编号")
-    private String punchNo;
 
     /** 立库输送线 */
     @Excel(name = "立库输送线")
     private String dpsNoOne;
 
-    /** 立库输送线 */
-    @Excel(name = "立库输送线")
-    private String dpsNoTwo;
 
     /** 过点时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+7")
@@ -172,5 +166,10 @@ public class BusinDataTask implements Serializable {
      */
     private String destination;
 
+    /**
+     * AGV任务状态
+     */
+    private String agvTaskStatus;
+
 
 }
diff --git a/shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinDataTaskServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinDataTaskServiceImpl.java
index 5ae8bee..7282ebe 100644
--- a/shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinDataTaskServiceImpl.java
+++ b/shkj-wms/src/main/java/com/shkj/wcs/service/impl/BusinDataTaskServiceImpl.java
@@ -172,20 +172,25 @@ public class BusinDataTaskServiceImpl extends ServiceImpl<BusinDataTaskMapper, B
             return RcsResponseVo.error("未找到对应任务");
         }
 
-        String taskType = businDataTask.getTaskType();
         switch (method) {
             case "start":
+                businDataTask.setTaskStarttime(new Date());
+                businDataTask.setTaskStatus(TaskStatusEnum.wait_callback.getValue());
+                break;
             case "outbin":
                 businDataTask.setTaskStatus(TaskStatusEnum.wait_callback.getValue());
                 break;
             case "end":
                 businDataTask.setTaskStatus(TaskStatusEnum.finished.getValue());
                 businDataTask.setDestination(slotName);
+                businDataTask.setTaskEntime(new Date());
                 break;
             default:
                 return  RcsResponseVo.error("任务状态未知！");
         }
+        businDataTask.setAgvTaskStatus(method);
         businDataTask.setUpdateTime(new Date());
+        businDataTask.setAgvNo(bo.getSingleRobotCode());
         boolean isUpdated  = iBusinDataTaskService.updateById(businDataTask);
         if (!isUpdated) {
             log.error("任务状态更新失败，任务号：{}", robotTaskCode);
@@ -194,6 +199,7 @@ public class BusinDataTaskServiceImpl extends ServiceImpl<BusinDataTaskMapper, B
         log.info("任务状态更新成功，任务号：{}", robotTaskCode);
         UploadWCSTaskStatusDto uploadWCSTaskStatusDto = new UploadWCSTaskStatusDto();
         WcsCreateTaskHeader header = new WcsCreateTaskHeader();
+        String taskType = businDataTask.getTaskType();
         switch (taskType) {
             case "1":
                 header.setBusinessType("stockOutReturn");