From 0d04bc5d8080b82338302fba0a59fccff2eaedfc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 06 七月 2025 11:28:29 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java | 71 +++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 24 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
index 7c4c9f9..3f68905 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
@@ -500,32 +500,36 @@
if (!taskService.updateById(task)) {
News.error("鏇存柊宸ヤ綔妗ｅけ璐ワ紒锛侊紒 [宸ヤ綔鍙凤細{}]", task.getTaskNo());
}else {
- if ("0601".equals(task.getMemo().substring(0,4))){
- String response = "";
- Map<String, Object> headers = new HashMap<>();
- headers.put("Content-Type", "application/json;charset=UTF-8");
- headers.put("X-lr-request-id", task.getWmsTaskNo());
- headers.put("X-lr-version", 4.1);
- headers.put("X-lr-trace-id", "{{$guid}}");
+ try {
+ if ("0601".equals(task.getMemo().substring(0, 4))) {
+ String response = "";
+ Map<String, Object> headers = new HashMap<>();
+ headers.put("Content-Type", "application/json;charset=UTF-8");
+ headers.put("X-lr-request-id", task.getWmsTaskNo());
+ headers.put("X-lr-version", 4.1);
+ headers.put("X-lr-trace-id", "{{$guid}}");
- Map<String, Object> map = new HashMap<>();
- map.put("carrierCode",task.getZpallet());
- map.put("siteCode","06YZ0001");
- map.put("extra",null);
- try {
- response = new HttpHandler.Builder()
- .setHeaders(headers)
- .setUri("172.18.16.248:443")
- .setHttps(true)
- .setPath("/rcs/rtas/api/robot/controller/carrier/unbind")
- .setJson(JSONObject.toJSONString(map))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- log.info("agv瑙ｇ粦绠卞彿,璇锋眰浣�:"+JSONObject.toJSONString(map)+",杩斿洖:"+response);
- }catch (Exception e){
- log.info("agv瑙ｇ粦绠卞彿璇锋眰鎶ラ敊"+e.getMessage());
+ Map<String, Object> map = new HashMap<>();
+ map.put("carrierCode", task.getZpallet());
+ map.put("siteCode", "06YZ0001");
+ map.put("extra", null);
+ try {
+ response = new HttpHandler.Builder()
+ .setHeaders(headers)
+ .setUri("172.18.16.248:443")
+ .setHttps(true)
+ .setPath("/rcs/rtas/api/robot/controller/carrier/unbind")
+ .setJson(JSONObject.toJSONString(map))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ log.info("agv瑙ｇ粦绠卞彿,璇锋眰浣�:" + JSONObject.toJSONString(map) + ",杩斿洖:" + response);
+ } catch (Exception e) {
+ log.info("agv瑙ｇ粦绠卞彿璇锋眰鎶ラ敊" + e.getMessage());
+ }
}
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
}
@@ -541,6 +545,11 @@
}
for (Task task : tasks) {
+ List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getTaskSts, TaskStsType.ANALYZE_OUTBOUND.sts, TaskStsType.EXECUTE_OUTBOUND.sts));
+ if (!list.isEmpty()) {
+ continue;//瀛樺湪姝ｅ湪瑙ｆ瀽锛屾鍦ㄦ墽琛屼换鍔�
+ }
+
BasConveyorSta originStaObj = basConveyorStaService.selectBySiteNo(task.getOriginSite());//鑾峰彇婧愮珯
if (originStaObj == null) {
continue;
@@ -718,6 +727,20 @@
continue;
}
+ List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>()
+ .in(Task::getTaskSts
+ , TaskStsType.NEW_INBOUND.sts
+ , TaskStsType.ANALYZE_INBOUND.sts
+ , TaskStsType.EXECUTE_INBOUND.sts
+ , TaskStsType.NEW_OUTBOUND.sts
+ , TaskStsType.ANALYZE_OUTBOUND.sts
+ , TaskStsType.EXECUTE_OUTBOUND.sts)
+ );
+ if (!taskList.isEmpty()) {
+ News.info("{}鍙峰皬杞︼紝绯荤粺瀛樺湪姝ｅ湪鎵ц浠诲姟锛屾殏鍋滃厖鐢典换鍔�", shuttleProtocol.getShuttleNo());
+ continue;//姝ｅ湪鎵ц浠诲姟锛屼笉鎵ц鍏呯數
+ }
+
String currentLocNo = shuttleProtocol.getCurrentLocNo();
int lev = Utils.getLev(currentLocNo);//鑾峰彇灏忚溅妤煎眰
//鎼滅储灏忚溅褰撳墠妤煎眰鍏呯數妗�
--
Gitblit v1.9.1