From 3c7c81ce7f573322c46618aabd455a2d06fe879a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 22 七月 2024 08:33:02 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java | 18 +++++++++++++++++-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java | 2 +-
2 files changed, 18 insertions(+), 2 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 5353f35..4c238ad 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("瑙ｆ瀽鍏ュ簱浠诲姟閫�鍑猴紝鏉＄爜涓嶇鍚�");
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());
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 404649e..5041bed 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
@@ -128,7 +128,7 @@
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()
--
Gitblit v1.9.1