From bc48a855d98e360042a7e2fff5594a91a82578c6 Mon Sep 17 00:00:00 2001
From: taisheng <taisheng@qq.com>
Date: 星期四, 24 七月 2025 16:16:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 192 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 145 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 327ca4c..b119d10 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -1,28 +1,18 @@
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.service.impl.TaskWrkLogServiceImpl;
-import com.zy.asrs.utils.PostMesDataUtils;
-import com.zy.common.utils.HttpHandler;
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;
/**
* 瀹氭椂灏嗕换鍔�(瀹屾垚銆佸彇娑�)杞垚鏃ュ織
@@ -34,50 +24,158 @@
@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;
+ private TaskWrkLogServiceImpl taskWrkLogService;
@Scheduled(cron = "0/3 * * * * ? ")
- public void execute() throws IOException {
- for (TaskWrk taskWrk : taskWrkService.selectToBeHistoryData()) {
- TaskStatusFeedbackParam taskStatusFeedbackParam = new TaskStatusFeedbackParam(taskWrk);
- if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)) {//瀹屾垚
- //鍖哄垎鍏ュ嚭搴�
- TaskWrkLog taskWrkLog=new TaskWrkLog(taskWrk);
- if(!wrkLogService.insert(taskWrkLog)){
- throw new CoolException("杞巻鍙叉。澶辫触"+taskWrkLog);
- }
- if(!taskWrkService.deleteById(taskWrk)){
- throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�"+taskWrkLog);
- }
- } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
- taskStatusFeedbackParam.setTaskStatus("cancelled");
- //new PostMesDataUtils().postMesData("鍙栨秷浠诲姟瀹屾垚",wmsUrl,movePath,taskWrk);
+ public void executeIn() {
+ List<TaskWrk> taskWrkList = taskWrkService.selectList(new EntityWrapper<TaskWrk>().eq("wrk_sts", 8));
+ for (TaskWrk taskWrk : taskWrkList) {
+ Date now = new Date();
+ if (taskWrk.getIoType() == 1) {
+ if (taskWrk.getOriginStartPoint().equals("1")) {
+ //鏇存柊婧愬簱浣嶇姸鎬佷负绌哄簱浣�
+ LocMast locMast = locMastService.selectByLocNo("0900601");
+ locMast.setLocSts("O");
+ locMastService.updateById(locMast);
+ }
+
+ //鏇存柊鐩爣搴撶姸鎬佷负鍦ㄥ簱
+ LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast2.setLocSts("F");
+ locMastService.updateById(locMast2);
+
+ taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
+ taskWrk.setModiUser(9998L);//鎿嶄綔鍛�
+ taskWrkService.updateById(taskWrk);
+ } else if (taskWrk.getIoType() == 3) {
+ //鏇存柊婧愬簱浣嶇姸鎬佷负绌哄簱浣�
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMast.setLocSts("O");
+ locMastService.updateById(locMast);
+
+ //鏇存柊鐩爣搴撶姸鎬佷负鍦ㄥ簱
+ LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast2.setLocSts("F");
+ locMastService.updateById(locMast2);
+
+ taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
+ taskWrk.setModiUser(9998L);//鎿嶄綔鍛�
+ taskWrkService.updateById(taskWrk);
+ }else {
+ throw new CoolException("浠诲姟绫诲瀷寮傚父");
}
- if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) > 0) {
- //浠诲姟宸茬粡杞棩蹇楋紝灏嗚浠诲姟涓嬮潰鐨勬寚浠よ浆鏃ュ織
- commandInfoService.saveToHistory(taskWrk.getTaskNo());
+ TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
+ if (!taskWrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
+ }
+ }
+ }
- //鍒犻櫎浠诲姟
- taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
- //鍒犻櫎鎸囦护
- commandInfoService.delete(new EntityWrapper<CommandInfo>().eq("task_no", taskWrk.getTaskNo()));
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void executeOut() {
+ List<TaskWrk> taskWrkList = taskWrkService.selectList(new EntityWrapper<TaskWrk>().eq("wrk_sts", 18));
+ for (TaskWrk taskWrk : taskWrkList) {
+ Date now = new Date();
+ if (taskWrk.getIoType() == 2) {
+ if (taskWrk.getTargetPoint().equals("101")) {
+ //鏇存柊搴撲綅鐘舵�佷负鍦ㄥ簱
+ LocMast locMast = locMastService.selectByLocNo("1100601");
+ locMast.setLocSts("F");
+ locMastService.updateById(locMast);
+ }
+
+ //鏇存柊婧愬簱鐘舵�佷负绌哄簱浣�
+ LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMast2.setLocSts("O");
+ locMastService.updateById(locMast2);
+
+ taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
+ taskWrk.setModiUser(9998L);//鎿嶄綔鍛�
+ taskWrkService.updateById(taskWrk);
+ }else {
+ throw new CoolException("浠诲姟绫诲瀷寮傚父");
+ }
+
+ TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
+ if (!taskWrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
+ }
+ }
+ }
+
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public void executeCancel() {
+ List<TaskWrk> taskWrkList = taskWrkService.selectList(new EntityWrapper<TaskWrk>().eq("status", TaskStatusType.CANCEL.id));
+ for (TaskWrk taskWrk : taskWrkList) {
+ Date now = new Date();
+ if(taskWrk.getIoType() == 1) {
+ if (taskWrk.getOriginStartPoint().equals("1")) {
+ //鏇存柊婧愬簱浣嶇姸鎬佷负鍦ㄥ簱
+ LocMast locMast = locMastService.selectByLocNo("0900601");
+ locMast.setLocSts("F");
+ locMast.setBarcode(taskWrk.getBarcode());
+ locMastService.updateById(locMast);
+ }
+
+ //鏇存柊鐩爣搴撶姸鎬佷负绌哄簱
+ LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast2.setLocSts("O");
+ locMastService.updateById(locMast2);
+
+ taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
+ taskWrk.setModiUser(9998L);//鎿嶄綔鍛�
+ taskWrkService.updateById(taskWrk);
+ } else if (taskWrk.getIoType() == 2) {
+ if (taskWrk.getTargetPoint().equals("101")) {
+ //鏇存柊搴撲綅鐘舵�佷负绌哄簱
+ LocMast locMast = locMastService.selectByLocNo("1100601");
+ locMast.setLocSts("O");
+ locMastService.updateById(locMast);
+ }
+
+ //鏇存柊婧愬簱鐘舵�佷负鍦ㄥ簱
+ LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMast2.setLocSts("F");
+ locMast2.setBarcode(taskWrk.getBarcode());
+ locMastService.updateById(locMast2);
+
+ taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
+ taskWrk.setModiUser(9998L);//鎿嶄綔鍛�
+ taskWrkService.updateById(taskWrk);
+ } else if (taskWrk.getIoType() == 3) {
+ //鏇存柊婧愬簱浣嶇姸鎬佷负鍦ㄥ簱
+ LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
+ locMast.setLocSts("F");
+ locMast.setBarcode(taskWrk.getBarcode());
+ locMastService.updateById(locMast);
+
+ //鏇存柊鐩爣搴撶姸鎬佷负绌哄簱浣�
+ LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast2.setLocSts("O");
+ locMastService.updateById(locMast2);
+
+ taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
+ taskWrk.setModiUser(9998L);//鎿嶄綔鍛�
+ taskWrkService.updateById(taskWrk);
+ } else {
+ throw new CoolException("浠诲姟绫诲瀷寮傚父");
+ }
+
+ TaskWrkLog taskWrkLog = new TaskWrkLog(taskWrk);
+ if (!taskWrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrkLog);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrkLog);
}
}
}
--
Gitblit v1.9.1