From 7769adbcc0be1105e1ff457de0dd262dd3e202ba Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 26 九月 2024 15:28:30 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java | 44 ++++++++++++++++++++--
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java | 42 +++++++++++++++++++-
2 files changed, 79 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
index 19c3150..914afbe 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
@@ -1,7 +1,9 @@
package com.zy.asrs.wcs.core.timer;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.common.utils.HttpHandler;
import com.zy.asrs.wcs.core.entity.*;
import com.zy.asrs.wcs.core.model.enums.LocStsType;
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
@@ -12,9 +14,7 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
@Slf4j
@Component
@@ -45,6 +45,12 @@
.eq(Task::getStatus, 1)
.in(Task::getTaskSts, taskSts));
for (Task task : tasks) {
+
+ boolean httpRequest = doHttpRequest(task, "127.0.0.1:8080", "/wms/open/asrs//wrkMast/finish/v1");
+ if (!httpRequest) {
+ return;
+ }
+
//璁板綍搴撳瓨淇℃伅
updateRecordLoc(task);
//浠诲姟杞巻鍙叉。
@@ -52,6 +58,36 @@
}
}
+ private boolean doHttpRequest(Task requestParam, String url, String path){
+ String response = "";
+ boolean success = false;
+ try {
+ Map<String, Object> map = new HashMap<>();
+ map.put("appkey", "ea1f0459efc02a79f046f982767939ae");
+ Map<String, Object> map2 = new HashMap<>();
+ map2.put("taskNo", requestParam.getWmsTaskNo());
+ log.info("璇锋眰鎶ユ枃:"+ JSONObject.toJSONString(requestParam));
+
+ response = new HttpHandler.Builder()
+ .setHeaders(map)
+ .setUri(url)
+ .setPath(path)
+ .setJson(JSONObject.toJSONString(map2))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ log.info("璇锋眰杩斿洖:"+response);
+ String code = jsonObject.get("code").toString();
+ if(code.equals("200")){
+ success = true;
+ }
+
+ }catch (Exception e){
+ log.info("璇锋眰鎶ラ敊"+e.getMessage());
+ }
+ return success;
+ }
+
//鏇存柊搴撳瓨淇℃伅
@Transactional
public void updateRecordLoc(Task task) {
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
index 9648ec7..32bfa74 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/ShuttleDispatcher.java
@@ -9,10 +9,7 @@
import com.zy.asrs.wcs.core.entity.*;
import com.zy.asrs.wcs.core.kernel.AnalyzeService;
import com.zy.asrs.wcs.core.model.NavigateNode;
-import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
-import com.zy.asrs.wcs.core.model.enums.NavigationMapType;
-import com.zy.asrs.wcs.core.model.enums.TaskCtgType;
-import com.zy.asrs.wcs.core.model.enums.TaskStsType;
+import com.zy.asrs.wcs.core.model.enums.*;
import com.zy.asrs.wcs.core.service.*;
import com.zy.asrs.wcs.rcs.News;
import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
@@ -402,6 +399,45 @@
}
+ //鎼滅储鏄惁瀛樺湪鍓嶅線鐩爣妤煎眰鐨勫皬杞﹀伐浣滄。
+ for (Task task : taskService.list(new LambdaQueryWrapper<Task>()
+ .in(Task::getTaskSts, TaskStsType.NEW_INBOUND.sts, TaskStsType.ANALYZE_INBOUND.sts, TaskStsType.EXECUTE_INBOUND.sts, TaskStsType.COMPLETE_INBOUND.sts
+ , TaskStsType.NEW_OUTBOUND.sts, TaskStsType.ANALYZE_OUTBOUND.sts, TaskStsType.EXECUTE_OUTBOUND.sts, TaskStsType.COMPLETE_OUTBOUND.sts))) {
+
+ List<Motion> motions = motionService.list(new LambdaQueryWrapper<Motion>()
+ .eq(Motion::getTaskNo, task.getTaskNo())
+ .in(Motion::getMotionCtg, MotionCtgType.SHUTTLE_MOVE
+ , MotionCtgType.SHUTTLE_MOVE_LIFT_PALLET
+ , MotionCtgType.SHUTTLE_MOVE_DOWN_PALLET
+ , MotionCtgType.SHUTTLE_MOVE_FROM_LIFT
+ , MotionCtgType.SHUTTLE_MOVE_TO_LIFT
+ , MotionCtgType.SHUTTLE_MOVE_FROM_CONVEYOR
+ , MotionCtgType.SHUTTLE_MOVE_TO_CONVEYOR
+ , MotionCtgType.SHUTTLE_MOVE_FROM_LIFT_TO_CONVEYOR
+ ));
+
+ boolean isUpdateLev = false;
+ for (Motion motion : motions) {
+ if (motion.getOrigin() == null || motion.getTarget() == null) {
+ continue;
+ }
+
+ int sourceLev = Utils.getLev(motion.getOrigin());//鍔ㄤ綔婧愭ゼ灞�
+ int targetLev = Utils.getLev(motion.getTarget());//鍔ㄤ綔鐩爣妤煎眰
+ if (sourceLev != targetLev) {
+ isUpdateLev = true;
+ break;
+ }
+ }
+
+ if(isUpdateLev) {
+ levCount++;//宸ヤ綔妗ｅ睘浜庤法灞備换鍔★紝灏忚溅褰掑睘浜庣洰鏍囨ゼ灞�
+ continue;
+ }
+
+ }
+
+
return levCount < Integer.parseInt(dict.getValue());
}
--
Gitblit v1.9.1