From ef02b023bbf06206e95876690f9c5eb5a3f0f7c8 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 08 六月 2024 08:16:21 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java | 16 ++++++++--------
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/BasConveyorStaServiceImpl.java | 6 ++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/BasConveyorStaService.java | 2 ++
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/BasConveyorStaService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/BasConveyorStaService.java
index cae77ab..1d1d1b6 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/BasConveyorStaService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/BasConveyorStaService.java
@@ -5,4 +5,6 @@
public interface BasConveyorStaService extends IService<BasConveyorSta> {
+ BasConveyorSta selectBySiteNo(String siteNo);
+
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/BasConveyorStaServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/BasConveyorStaServiceImpl.java
index c021b3e..958df4e 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/BasConveyorStaServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/BasConveyorStaServiceImpl.java
@@ -1,5 +1,6 @@
package com.zy.asrs.wcs.core.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.wcs.core.mapper.BasConveyorStaMapper;
import com.zy.asrs.wcs.core.entity.BasConveyorSta;
import com.zy.asrs.wcs.core.service.BasConveyorStaService;
@@ -9,4 +10,9 @@
@Service("basConveyorStaService")
public class BasConveyorStaServiceImpl extends ServiceImpl<BasConveyorStaMapper, BasConveyorSta> implements BasConveyorStaService {
+ @Override
+ public BasConveyorSta selectBySiteNo(String siteNo) {
+ return this.baseMapper.selectOne(new LambdaQueryWrapper<BasConveyorSta>()
+ .eq(BasConveyorSta::getSiteNo, siteNo));
+ }
}
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 db25c37..d97582d 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
@@ -79,6 +79,8 @@
@Autowired
private BasConveyorService basConveyorService;
@Autowired
+ private BasConveyorStaService basConveyorStaService;
+ @Autowired
private BasLedService basLedService;
/**
@@ -430,7 +432,12 @@
}
for (Task task : tasks) {
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, 1);
+ BasConveyorSta originStaObj = basConveyorStaService.selectBySiteNo(task.getOriginSite());//鑾峰彇婧愮珯
+ if (originStaObj == null) {
+ continue;
+ }
+
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Conveyor, originStaObj.getConveyorId().intValue());
StaProtocol staProtocol = devpThread.getStation().get(Integer.parseInt(task.getOriginSite()));//婧愮珯
StaProtocol staProtocol1 = devpThread.getStation().get(Integer.parseInt(task.getDestSite()));//鐩爣绔�
if (staProtocol == null || staProtocol1 == null) {
@@ -440,15 +447,8 @@
staProtocol1 = staProtocol1.clone();
}
-// // 鏌ヨ绔欑偣璇︾粏淇℃伅
-// BasDevp staDetl = basDevpService.selectById(outSta.getStaNo());
-// if (staDetl == null) {
-// log.error("鍑哄簱 ===>> 绔欑偣鍦ㄦ暟鎹簱涓嶅瓨鍦�, 绔欑偣缂栧彿={}", outSta.getStaNo());
-// continue;
-// }
// 鍒ゆ柇鍫嗗灈鏈哄嚭搴撶珯鐘舵��
if (staProtocol.isAutoing() && !staProtocol.isLoading() && staProtocol.getWorkNo() == 0 && staProtocol.isOutEnable()) {
-
if (!(staProtocol1.isAutoing() && !staProtocol1.isLoading() && staProtocol1.getWorkNo() == 0 && staProtocol1.isOutEnable())) {
continue;
}
--
Gitblit v1.9.1