From bad969e058368490346907faa25baa7d73ea6bc1 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 20 八月 2024 16:13:49 +0800
Subject: [PATCH] #任务增加缓存队列
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 9535a52..7c4c9f9 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
@@ -422,34 +422,42 @@
for (Task task : taskService.selectWaitAnalyzeInBoundTask()) {
BasConveyorSta basConveyorSta = basConveyorStaService.getOne(new LambdaQueryWrapper<BasConveyorSta>().eq(BasConveyorSta::getSiteNo, task.getDestSite()));
if (basConveyorSta == null) {
+ log.error("瑙ｆ瀽鍏ュ簱浠诲姟閫�鍑猴紝杈撻��");
continue;
}
BasConveyor basConveyor = basConveyorService.getById(basConveyorSta.getConveyorId());
if (basConveyor == null) {
+ log.error("瑙ｆ瀽鍏ュ簱浠诲姟閫�鍑猴紝杈撻��2");
continue;
}
DeviceBarcode deviceBarcode = deviceBarcodeService.getById(basConveyorSta.getBarcodeId());
if (deviceBarcode == null) {
+ log.error("瑙ｆ瀽鍏ュ簱浠诲姟閫�鍑猴紝鏉＄爜");
continue;
}
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, Integer.parseInt(deviceBarcode.getDeviceId()));
if (barcodeThread == null) {
+ log.error("瑙ｆ瀽鍏ュ簱浠诲姟閫�鍑猴紝鏉＄爜绾跨▼");
continue;
}
if (!barcodeThread.getBarcode().equals(task.getZpallet())) {
+ log.error("瑙ｆ瀽鍏ュ簱浠诲姟閫�鍑猴紝鏉＄爜涓嶇鍚堬紝浠诲姟鏉＄爜锛�"+task.getZpallet()+",绾跨▼鏉＄爜:"+barcodeThread.getBarcode());
continue;
}
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, basConveyor.getDeviceId().intValue());
if (devpThread == null) {
+ log.error("瑙ｆ瀽鍏ュ簱浠诲姟閫�鍑猴紝杈撻�佺嚎绋�");
continue;
}
StaProtocol staProtocol = devpThread.getStation().get(basConveyorSta.getSiteNo());
if (staProtocol == null) {
+ log.error("瑙ｆ瀽鍏ュ簱浠诲姟閫�鍑猴紝杈撻�佺珯鐐�");
continue;
}
if (!(staProtocol.isAutoing()
&& staProtocol.isLoading()
&& staProtocol.isInEnable())) {
+ log.error("瑙ｆ瀽鍏ュ簱浠诲姟閫�鍑猴紝杈撻�佷俊鍙蜂笉绗﹀悎锛�"+staProtocol.isAutoing()+","+staProtocol.isLoading()+","+staProtocol.isInEnable());
continue;
}
@@ -472,8 +480,16 @@
}
// generate motion list
- List<Motion> motionList = analyzeService.generateMotion(task);
+ List<Motion> motionList = null;
+ try {
+ motionList = analyzeService.generateMotion(task);
+ }catch (Exception e) {
+ log.error("motion瑙ｆ瀽鍑洪敊锛�"+e.getMessage());
+ continue;
+ }
+
if (motionList.isEmpty()) {
+ log.error("motion涓虹┖閫�鍑�");
continue;
}
motionService.batchInsert(motionList, task.getUuid(), Integer.valueOf(task.getTaskNo()), task.getHostId());
@@ -484,7 +500,7 @@
if (!taskService.updateById(task)) {
News.error("鏇存柊宸ヤ綔妗ｅけ璐ワ紒锛侊紒 [宸ヤ綔鍙凤細{}]", task.getTaskNo());
}else {
- if ("06YZ".equals(task.getMemo().substring(0,4))){
+ 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");
@@ -494,14 +510,14 @@
Map<String, Object> map = new HashMap<>();
map.put("carrierCode",task.getZpallet());
- map.put("siteCode",task.getMemo());
+ map.put("siteCode","06YZ0001");
map.put("extra",null);
try {
response = new HttpHandler.Builder()
.setHeaders(headers)
.setUri("172.18.16.248:443")
.setHttps(true)
- .setPath("/rtas/api/robot/controller/carrier/unbind")
+ .setPath("/rcs/rtas/api/robot/controller/carrier/unbind")
.setJson(JSONObject.toJSONString(map))
.build()
.doPost();
--
Gitblit v1.9.1