From 44ed3bb171d716cec71b276763740e97488df037 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 08 六月 2024 09:54:21 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 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 db25c37..ad43e7a 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;
/**
@@ -372,6 +374,19 @@
list.add(mapNode.clone());
}
+ //鏈�鍚庝竴娆℃娴嬪湴鍥捐妭鐐规槸鍚﹀畬鏁达紝鍦板浘鐭╅樀row鍧囪杈惧埌鏈�闀縭ow
+ for (ArrayList<MapNode> list : lists) {
+ int len = (row + 2);//row+2鏄洜涓哄ご鑺傜偣鍜屽熬鑺傜偣瀛樺湪浜轰负娣诲姞鐨�-1鑺傜偣
+ if (list.size() == len) {
+ continue;
+ }
+ //鑺傜偣闀垮害涓嶆弧瓒筹紝杩涜琛ヨ冻
+ for (int i = list.size(); i < len; i++) {
+ list.add(mapNode.clone());
+ }
+ }
+
+
ArrayList<MapNode> headNodes = new ArrayList<>();
ArrayList<MapNode> footerNodes = new ArrayList<>();
for (int i = 0; i < row+2; i++) {
@@ -430,7 +445,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 +460,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