From 364b9ccc44bc6863280c5cc00aa8512cfff548d4 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 25 四月 2025 15:27:18 +0800
Subject: [PATCH] 123

---
 src/main/java/com/zy/asrs/task/TaskLogScheduler.java |   75 ++++++++++++++-----------------------
 1 files changed, 28 insertions(+), 47 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 8463ff2..7e7df3d 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -1,28 +1,19 @@
 package com.zy.asrs.task;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.exception.CoolException;
-import com.zy.asrs.domain.enums.TaskStatusType;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.TaskOverToWms;
-import com.zy.asrs.entity.param.TaskStatusFeedbackParam;
-import com.zy.asrs.service.*;
+import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.entity.TaskWrkLog;
+import com.zy.asrs.entity.TaskWrkReport;
+import com.zy.asrs.service.TaskWrkReportService;
+import com.zy.asrs.service.TaskWrkService;
 import com.zy.asrs.service.impl.TaskWrkLogServiceImpl;
-import com.zy.asrs.utils.PostMesDataUtils;
-import com.zy.common.utils.HttpHandler;
+import com.zy.common.utils.Synchro;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 瀹氭椂灏嗕换鍔�(瀹屾垚銆佸彇娑�)杞垚鏃ュ織
@@ -33,47 +24,37 @@
 
     @Autowired
     private TaskWrkService taskWrkService;
-    @Autowired
-    private CommandInfoService commandInfoService;
-    @Autowired
-    private ApiLogService apiLogService;
-    @Autowired
-    private BasDevpService basDevpService;
 
-    @Autowired
-    private StaDescService staDescService;
-    @Autowired
-    private LocMastService locMastService;
     @Autowired
     private TaskWrkLogServiceImpl wrkLogService;
 
-    @Value("${wms.url}")
-    private String wmsUrl;
-    @Value("${wms.movePath}")
-    private String movePath;
+
+    @Autowired
+    private TaskWrkReportService taskWrkReportService;
+
 
     @Scheduled(cron = "0/3 * * * * ? ")
     public void execute() throws IOException {
         for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
-            if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)||taskWrk.getStatus()==7) {//瀹屾垚
-                //鍖哄垎鍏ュ嚭搴�
-                TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
-                if (!wrkLogService.insert(taskWrkLog)) {
-                    throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
-                }
-                if (!taskWrkService.deleteById(taskWrk)) {
-                    throw new CoolException("浠诲姟妗e垹闄ゅけ璐�" + taskWrkLog);
-                }
-            } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
-                TaskWrkLog taskWrkLog=new TaskWrkLog(taskWrk);
-                if(!wrkLogService.insert(taskWrkLog)){
-                    throw new CoolException("杞巻鍙叉。澶辫触"+taskWrkLog);
-                }
-                if(!taskWrkService.deleteById(taskWrk)){
-                    throw new CoolException("浠诲姟妗e垹闄ゅけ璐�"+taskWrkLog);
-                }
+            switch (taskWrk.getStatus()) {
+                case 4:
+                    break;
+                case 5:
+                    break;
             }
-
+            TaskWrkReport taskWrkReport = new TaskWrkReport();
+            TaskWrkLog taskWrkLog = new TaskWrkLog();
+            Synchro.Copy(taskWrk, taskWrkReport);
+            Synchro.Copy(taskWrk, taskWrkLog);
+            if (!taskWrkReportService.insert(taskWrkReport)) {
+                throw new CoolException("杞Щ鑷充笂鎶ヨ〃" + taskWrk);
+            }
+            if (!wrkLogService.insert(taskWrkLog)) {
+                throw new CoolException("杞巻鍙叉。澶辫触" + taskWrk);
+            }
+            if (!taskWrkService.deleteById(taskWrk)) {
+                throw new CoolException("浠诲姟妗e垹闄ゅけ璐�" + taskWrk);
+            }
         }
     }
 

--
Gitblit v1.9.1