From 1096df7b05cb00d0771d9f8c6cc43d8022099c7b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 24 五月 2025 10:10:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 220 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 144 insertions(+), 76 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index b784d74..c54e0fb 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -1,27 +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.CommandInfo;
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.entity.param.TaskOverToWms;
-import com.zy.asrs.entity.param.TaskStatusFeedbackParam;
-import com.zy.asrs.service.CommandInfoService;
-import com.zy.asrs.service.TaskWrkService;
-import com.zy.asrs.utils.PostMesDataUtils;
-import com.zy.common.utils.HttpHandler;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.TaskWrkLogServiceImpl;
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.HashMap;
+import java.util.Date;
import java.util.List;
-import java.util.Map;
/**
* 瀹氭椂灏嗕换鍔�(瀹屾垚銆佸彇娑�)杞垚鏃ュ織
@@ -33,78 +24,155 @@
@Autowired
private TaskWrkService taskWrkService;
@Autowired
- private CommandInfoService commandInfoService;
-
- @Value("${wms.url}")
- private String wmsUrl;
- @Value("${wms.movePath}")
- private String movePath;
+ private LocMastService locMastService;
+ @Autowired
+ 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.COMPLETE.id)) {//瀹屾垚
- taskStatusFeedbackParam.setTaskStatus("done");
- Map<String, Object> map = new HashMap<>();
- map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
- TaskOverToWms taskOverToWms = new TaskOverToWms();
- taskOverToWms.setFeedbackFrom("WCS"); //鏉ユ簮
- taskOverToWms.setWarehouseId("1688469798893297665"); //浠撳簱鏍囪瘑
- taskOverToWms.setTaskNo(taskWrk.getTaskNo()); //浠诲姟鍙�
- taskOverToWms.setTaskType(taskStatusFeedbackParam.getTaskType()); // 浠诲姟绫诲瀷
- taskOverToWms.setContainerCode(taskWrk.getBarcode()); // 瀹瑰櫒缂栫爜
- if (taskWrk.getIoType() ==1 ){
- taskOverToWms.setEquipmentCode(String.valueOf(taskWrk.getCrnNo())); //璁惧缂栫爜
- taskOverToWms.setTargetLocationCode(taskWrk.getOriginTargetPoint()); //鐩爣搴撲綅
- }else if (taskWrk.getIoType() ==2){
- Map<Integer,String> map1 = new HashMap<>();
- map1.put(102,"J-1101");
- map1.put(106,"J-1103");
- map1.put(110,"J-1105");
- map1.put(114,"J-1107");
- map1.put(118,"J-1109");
- map1.put(122,"J-1111");
- taskOverToWms.setEquipmentCode(map1.get(taskWrk.getTargetPoint())); //璁惧缂栫爜
- taskOverToWms.setSourceLocationCode(taskWrk.getOriginStartPoint()); //婧愬簱浣�
+ 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);
}
- taskOverToWms.setTaskStatus("done"); //浠诲姟鐘舵��
- String response = null;
- try {
- response = new HttpHandler.Builder()
- .setHeaders(map)
- .setUri(wmsUrl)
- .setPath("wcsManager/wcsInterface/taskStatusFeedback")
- .setJson(JSON.toJSONString(taskOverToWms))
- .build()
- .doPost();
- }catch (Exception e){
- continue;
- }
+ //鏇存柊鐩爣搴撶姸鎬佷负鍦ㄥ簱
+ 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);
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)){
+ //鏇存柊鐩爣搴撶姸鎬佷负鍦ㄥ簱
+ LocMast locMast2 = locMastService.selectByLocNo(taskWrk.getTargetPoint());
+ locMast2.setLocSts("F");
+ locMastService.updateById(locMast2);
- }else {
- continue;
- }
-
- //new PostMesDataUtils().postMesData("瀹屾垚涓婃姤",wmsUrl,movePath,taskWrk);
- } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
- taskStatusFeedbackParam.setTaskStatus("cancelled");
- //new PostMesDataUtils().postMesData("鍙栨秷浠诲姟瀹屾垚",wmsUrl,movePath,taskWrk);
+ 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");
+ 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");
+ 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");
+ 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