From 2cfa8856fb1fd1ad7f642fd998d1644879abcdb5 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 25 七月 2024 10:02:24 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java | 815 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 400 insertions(+), 415 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
index 2e5d418..edde4cb 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/AnalyzeService.java
@@ -1,26 +1,22 @@
package com.zy.asrs.wcs.core.kernel;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.wcs.core.domain.dto.MotionDto;
-import com.zy.asrs.wcs.core.entity.ShuttleStandby;
-import com.zy.asrs.wcs.core.entity.Task;
+import com.zy.asrs.wcs.core.entity.*;
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
import com.zy.asrs.wcs.core.model.enums.MotionCtgType;
+import com.zy.asrs.wcs.core.model.enums.TaskCtgType;
import com.zy.asrs.wcs.core.model.enums.TaskStsType;
-import com.zy.asrs.wcs.core.service.ShuttleStandbyService;
-import com.zy.asrs.wcs.core.service.TaskService;
+import com.zy.asrs.wcs.core.service.*;
import com.zy.asrs.wcs.core.utils.ConveyorDispatcher;
import com.zy.asrs.wcs.core.utils.LiftDispatcher;
import com.zy.asrs.wcs.core.utils.ShuttleDispatcher;
import com.zy.asrs.wcs.core.utils.Utils;
import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
-import com.zy.asrs.wcs.core.entity.Motion;
import com.zy.asrs.wcs.rcs.entity.Device;
import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
import com.zy.asrs.wcs.rcs.model.protocol.LiftProtocol;
import com.zy.asrs.wcs.rcs.model.protocol.ShuttleProtocol;
-import com.zy.asrs.wcs.core.service.MotionService;
import com.zy.asrs.wcs.rcs.service.DeviceService;
import com.zy.asrs.wcs.rcs.thread.LiftThread;
import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
@@ -53,6 +49,14 @@
private DeviceService deviceService;
@Autowired
private ShuttleStandbyService shuttleStandbyService;
+ @Autowired
+ private BasConveyorPathService basConveyorPathService;
+ @Autowired
+ private BasConveyorStaService basConveyorStaService;
+ @Autowired
+ private BasConveyorService basConveyorService;
+ @Autowired
+ private TaskCtgService taskCtgService;
public List<Motion> generateMotion(Task task) {
List<Motion> motionList = new ArrayList<>();
@@ -65,12 +69,6 @@
/**
* 鍏ュ簱
- * 涓�銆佸叆搴撶洰鏍囧眰鏈夌┛姊溅
- * 1.鎻愬崌鏈哄崌闄嶅埌婧愬眰
- * 2.璐х墿浠庤緭閫佺嚎鍒版彁鍗囨満
- * 3.鎻愬崌鏈鸿浇璐хЩ鍔紙闈炲繀闇�锛�
- * 4.绌挎杞﹁蛋琛岃嚦鎻愬崌鏈�
- * 5.绌挎杞﹀叆搴撹嚦鐩爣搴撲綅
*/
if (task.getTaskSts() == TaskStsType.NEW_INBOUND.sts) {
// locNo
@@ -115,13 +113,6 @@
return motionList;
}
- //妫�娴嬫彁鍗囨満鏄惁鏈変换鍔＄粦瀹�
- boolean liftResult = Utils.checkLiftHasBinding(Integer.parseInt(transferLiftDevice.getDeviceNo()));
- if (liftResult) {
- //瀛樺湪浠诲姟锛岀姝㈣В鏋�
- return motionList;
- }
-
//鑾峰彇灏忚溅寰呮満搴撲綅 ==> 杩涙彁鍗囨満
ShuttleStandby shuttleStandbyTo = shuttleStandbyService.getOne(new LambdaQueryWrapper<ShuttleStandby>()
.eq(ShuttleStandby::getDeviceId, transferLiftDevice.getId())
@@ -156,13 +147,14 @@
motionList.addAll(kernelService.liftMoveGoods(
MotionDto.build((dto -> {
dto.setLiftNo(transferLiftDevice.getId().intValue());
- dto.setLev(5);//绱㈢墝椤圭洰5灞傛槸杈撻�佺嚎灞�
- dto.setStaNo(1);//鎻愬崌鏈哄乏渚�
+ dto.setLev(1);//鍏夋嘲1灞傛槸杈撻�佺嚎灞�
+ dto.setStaNo(31004);//鍏ュ簱绔欑偣
}))
, MotionDto.build((dto -> {
dto.setLiftNo(transferLiftDevice.getId().intValue());
dto.setLev(Utils.getLev(task.getDestLoc()));
- dto.setStaNo(0);//鎻愬崌鏈哄唴渚�
+ dto.setStaNo(Integer.parseInt(task.getDestSite()));
+ dto.setSync(0);//寮傛鎵ц
}))
));
@@ -174,32 +166,9 @@
})),
MotionDto.build((dto -> {
dto.setShuttleNo(shuttleDevice.getId().intValue());
- dto.setLiftNo(transferLiftDevice.getId().intValue());
dto.setLocNo(standbyLocNoTo);
})),
MotionCtgType.SHUTTLE_MOVE
- ));
-
- // 閿佸畾鎻愬崌鏈�
- motionList.addAll(kernelService.liftLock(
- null
- , MotionDto.build((dto -> {
- dto.setLiftNo(transferLiftDevice.getId().intValue());
- }))
- ));
-
- // 绌挎杞﹀緟鏈轰綅鑷虫彁鍗囨満
- motionList.addAll(kernelService.shuttleMove(
- MotionDto.build((dto -> {
- dto.setShuttleNo(shuttleDevice.getId().intValue());
- dto.setLocNo(standbyLocNoTo);
- })),
- MotionDto.build((dto -> {
- dto.setShuttleNo(shuttleDevice.getId().intValue());
- dto.setLiftNo(transferLiftDevice.getId().intValue());
- dto.setLocNo(liftLocNoTo);
- })),
- MotionCtgType.SHUTTLE_MOVE_TO_LIFT
));
// 绌挎杞﹀叆搴撻《鍗�
@@ -209,28 +178,6 @@
dto.setShuttleNo(shuttleDevice.getId().intValue());
})),
MotionCtgType.SHUTTLE_PALLET_LIFT
- ));
-
- // 绌挎杞﹀叆搴撶Щ鍔ㄨ嚦鎻愬崌鏈哄緟鏈轰綅
- motionList.addAll(kernelService.shuttleMove(
- MotionDto.build((dto -> {
- dto.setShuttleNo(shuttleDevice.getId().intValue());
- dto.setLiftNo(transferLiftDevice.getId().intValue());
- dto.setLocNo(liftLocNoFrom);
- })),
- MotionDto.build((dto -> {
- dto.setShuttleNo(shuttleDevice.getId().intValue());
- dto.setLocNo(standbyLocNoFrom);
- })),
- MotionCtgType.SHUTTLE_MOVE_FROM_LIFT
- ));
-
- // 瑙ｉ攣鎻愬崌鏈�
- motionList.addAll(kernelService.liftUnlock(
- null
- , MotionDto.build((dto -> {
- dto.setLiftNo(transferLiftDevice.getId().intValue());
- }))
));
// 绌挎杞﹁蛋琛岃嚦鐩爣搴撲綅
@@ -258,14 +205,22 @@
/**
* 浜屻�佸叆搴撶洰鏍囧眰娌℃湁绌挎杞�
- * 1.鎻愬崌鏈哄崌闄嶅埌绌挎杞﹀眰
- * 2.绌挎杞﹁蛋琛岃嚦鎻愬崌鏈哄緟鏈轰綅
- * 3.鎻愬崌鏈烘惉杩愮┛姊溅鑷崇洰鏍囧眰
- * 4.璐х墿浠庤緭閫佺嚎鍒版彁鍗囨満
- * 5.鎻愬崌鏈鸿浇杞︿笌璐хЩ鍔紙闈炲繀闇�锛�
- * 6.绌挎杞﹀叆搴撹嚦鐩爣搴撲綅
*/
} else {
+
+ // 鎻愬崌鏈鸿浇璐хЩ鍔�
+ motionList.addAll(kernelService.liftMoveGoods(
+ MotionDto.build((dto -> {
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ dto.setLev(1);//鍏夋嘲1灞傛槸杈撻�佺嚎灞�
+ dto.setStaNo(31004);//鍏ュ簱绔欑偣
+ }))
+ , MotionDto.build((dto -> {
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ dto.setLev(Utils.getLev(task.getDestLoc()));
+ dto.setStaNo(Integer.parseInt(task.getDestSite()));
+ }))
+ ));
// 绌挎杞﹁蛋琛岃嚦鎻愬崌鏈哄簱浣嶅緟鏈轰綅
motionList.addAll(kernelService.shuttleMove(
@@ -320,17 +275,15 @@
}))
));
- // 鎻愬崌鏈鸿浇璐хЩ鍔�
- motionList.addAll(kernelService.liftMoveGoods(
+ // 鎻愬崌鏈烘惉杞� 鑷� 鐩爣浣嶇疆灞�
+ motionList.addAll(kernelService.liftMoveShuttle(
MotionDto.build((dto -> {
dto.setLiftNo(transferLiftDevice.getId().intValue());
- dto.setLev(5);//绱㈢墝椤圭洰5灞傛槸杈撻�佺嚎灞�
- dto.setStaNo(1);//鎻愬崌鏈哄乏渚�
- }))
- , MotionDto.build((dto -> {
+ dto.setLev(Utils.getLev(shuttleLocNo));
+ })),
+ MotionDto.build((dto -> {
dto.setLiftNo(transferLiftDevice.getId().intValue());
- dto.setLev(Utils.getLev(task.getDestLoc()));
- dto.setStaNo(0);//鎻愬崌鏈哄唴渚�
+ dto.setLev(Utils.getLev(destLoc));
}))
));
@@ -342,15 +295,6 @@
}))
));
- // 绌挎杞﹀叆搴撻《鍗�
- motionList.addAll(kernelService.shuttleAction(
- null,
- MotionDto.build((dto -> {
- dto.setShuttleNo(shuttleDevice.getId().intValue());
- })),
- MotionCtgType.SHUTTLE_PALLET_LIFT
- ));
-
// 鏇存柊灏忚溅鍧愭爣
motionList.addAll(kernelService.shuttleUpdateLocation(
null
@@ -360,7 +304,7 @@
}))
));
- // 绌挎杞﹀叆搴撶Щ鍔ㄨ嚦鎻愬崌鏈哄緟鏈轰綅
+ // 绌挎杞︾Щ鍔ㄨ嚦鎻愬崌鏈哄緟鏈轰綅
motionList.addAll(kernelService.shuttleMove(
MotionDto.build((dto -> {
dto.setShuttleNo(shuttleDevice.getId().intValue());
@@ -379,7 +323,17 @@
null
, MotionDto.build((dto -> {
dto.setLiftNo(transferLiftDevice.getId().intValue());
+ dto.setReleaseLift(1);//鎵ц瀹屾垚鍚庨噴鏀炬彁鍗囨満
}))
+ ));
+
+ // 绌挎杞﹀叆搴撻《鍗�
+ motionList.addAll(kernelService.shuttleAction(
+ null,
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ })),
+ MotionCtgType.SHUTTLE_PALLET_LIFT
));
// 绌挎杞﹁蛋琛岃嚦鐩爣搴撲綅
@@ -455,13 +409,6 @@
return motionList;
}
- //妫�娴嬫彁鍗囨満鏄惁鏈変换鍔＄粦瀹�
- boolean liftResult = Utils.checkLiftHasBinding(Integer.parseInt(transferLiftDevice.getDeviceNo()));
- if (liftResult) {
- //瀛樺湪浠诲姟锛岀姝㈣В鏋�
- return motionList;
- }
-
//鑾峰彇灏忚溅寰呮満搴撲綅 ==> 杩涙彁鍗囨満
ShuttleStandby shuttleStandbyTo = shuttleStandbyService.getOne(new LambdaQueryWrapper<ShuttleStandby>()
.eq(ShuttleStandby::getDeviceId, transferLiftDevice.getId())
@@ -489,298 +436,320 @@
//绌挎杞﹀嚭鎻愬崌鏈哄緟鏈轰綅搴撲綅鍙�
String standbyLocNoFrom = shuttleStandbyFrom.getDeviceStandbyLoc();
-// /**
-// * 鍑哄簱
-// * 涓�銆佸嚭搴撹捣濮嬪眰鏈夌┛姊溅
-// * 1.绌挎杞﹁蛋琛岃嚦鍑哄簱搴撲綅
-// * 2.鎻愬崌鏈哄埌鍑哄簱璧峰灞�
-// * 3.绌挎杞﹀嚭搴撹嚦鎻愬崌鏈�
-// * 4.绌挎杞︾寮�鎻愬崌鏈�
-// * 5.鎻愬崌鏈鸿浇璐хЩ鍔紙闈炲繀闇�锛�
-// * 6.杈撻�佺嚎杩愯緭鑷冲嚭搴撳彛
-// */
-// if (Utils.getLev(shuttleLocNo) == Utils.getLev(wrkMast.getSourceLocNo())) {
-//
-// //绌挎杞︿笉鍦ㄥ嚭搴撳簱浣�
-// if (!shuttleLocNo.equals(wrkMast.getSourceLocNo())) {
-// // 绌挎杞﹁蛋琛岃嚦鍑哄簱搴撲綅
-// motionList.addAll(kernelService.shuttleMove(
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLocNo(shuttleLocNo);
-// })),
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLocNo(wrkMast.getSourceLocNo());
-// })),
-// MotionCtgType.SHUTTLE_MOVE
-// ));
-// }
-//
-// // 绌挎杞﹀嚭搴撹嚦鎻愬崌鏈哄緟鏈轰綅
-// motionList.addAll(kernelService.shuttleTransport(
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLocNo(wrkMast.getSourceLocNo());
-// })),
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLocNo(standbyLocNoTo);
-// })),
-// MotionCtgType.SHUTTLE_MOVE_LIFT_PALLET
-// ));
-//
-// // 鎻愬崌鏈虹┖杞界Щ鍔�
-// motionList.addAll(kernelService.liftMove(
-// null
-// , MotionDto.build((dto -> {
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLev(Utils.getLev(wrkMast.getSourceLocNo()));
-// }))
-// ));
-//
-// // 绌挎杞﹀緟鏈轰綅鑷虫彁鍗囨満
-// motionList.addAll(kernelService.shuttleTransport(
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLocNo(standbyLocNoTo);
-// })),
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLocNo(liftLocNoTo);
-// })),
-// MotionCtgType.SHUTTLE_TRANSPORT_TO_LIFT
-// ));
-//
-// // 绌挎杞︾寮�鎻愬崌鏈� - 鍒版彁鍗囨満寰呮満浣�
-// motionList.addAll(kernelService.shuttleMove(
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLocNo(liftLocNoFrom);
-// })),
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLocNo(standbyLocNoFrom);
-// })),
-// MotionCtgType.SHUTTLE_MOVE_FROM_LIFT
-// ));
-//
-// // 鎻愬崌鏈鸿浇璐хЩ鍔�
-// // 鍑哄簱搴撲綅鏄惁涓庤緭閫佺嚎鍑哄簱绔欏睘浜庡悓涓�灞�
-// if (!slaveOutSta.getLiftLev().equals(Utils.getLev(wrkMast.getSourceLocNo()))) {
-// motionList.addAll(kernelService.liftMoveGoods(
-// MotionDto.build((dto -> {
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLev(Utils.getLev(wrkMast.getSourceLocNo()));
-// })),
-// MotionDto.build((dto -> {
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLev(slaveOutSta.getLiftLev());
-// }))
-// ));
-// }
-//
-// LiftNeighborType neighborType = LiftNeighborType.query(liftSlave.getId(), slaveOutSta.getLiftLev(), false, wrkMast.getStaNo());
-//
-// // 鎻愬崌鏈鸿繍杈撳埌杈撻�佺嚎
-// motionList.addAll(kernelService.liftTransportGoodsToConveyor(
-// MotionDto.build((dto -> {
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLev(slaveOutSta.getLiftLev());
-// })),
-// MotionDto.build((dto -> {
-// dto.setDevpNo(devpSlave.getId());
-// dto.setStaNo(neighborType.staNo);
-// }))
-// ));
-//
-// // 绌挎杞︽彁鍗囨満寰呮満浣� - 鍒板緟鏈轰綅
-// motionList.addAll(kernelService.shuttleMove(
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLocNo(standbyLocNoFrom);
-// })),
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLocNo(
-// ShuttleTempLocType.query(shuttleProtocol.getShuttleNo().intValue(), liftSlave.getId(), Utils.getLev(wrkMast.getSourceLocNo())).locNo
-// );
-// })),
-// MotionCtgType.SHUTTLE_MOVE
-// ));
-//
-// /**
-// * 浜屻�佸嚭搴撹捣濮嬪眰娌℃湁绌挎杞�
-// *
-// * 1.鎻愬崌鏈哄埌绌挎杞﹀眰
-// * 2.绌挎杞﹁蛋琛岃嚦鎻愬崌鏈�
-// * 3.鎻愬崌鏈鸿浇杞﹁嚦鍑哄簱璧峰灞�
-// * 4.绌挎杞﹁蛋琛岃嚦鍑哄簱搴撲綅
-// * 5.绌挎杞﹀嚭搴撹嚦鎻愬崌鏈�
-// * 6.绌挎杞︾寮�鎻愬崌鏈�
-// * 7.鎻愬崌鏈鸿浇璐хЩ鍔紙闈炲繀闇�锛�
-// * 8.杈撻�佺嚎杩愯緭鑷冲嚭搴撳彛
-// *
-// */
-// } else {
-//
-// // 绌挎杞﹁蛋琛岃嚦鎻愬崌鏈哄緟鏈轰綅
-// motionList.addAll(kernelService.shuttleMove(
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLocNo(shuttleLocNo);
-// })),
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLocNo(standbyLocNoTo);
-// })),
-// MotionCtgType.SHUTTLE_MOVE
-// ));
-//
-// // 鎻愬崌鏈哄埌绌挎杞﹀眰
-// motionList.addAll(kernelService.liftMove(
-// null
-// , MotionDto.build((dto -> {
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLev(Utils.getLev(shuttleLocNo));
-// }))
-// ));
-//
-// // 绌挎杞﹀緟鏈轰綅鑷虫彁鍗囨満
-// motionList.addAll(kernelService.shuttleMove(
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLocNo(standbyLocNoTo);
-// })),
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLocNo(liftLocNoTo);
-// })),
-// MotionCtgType.SHUTTLE_MOVE_TO_LIFT
-// ));
-//
-// // 鎻愬崌鏈鸿浇杞﹁嚦鍑哄簱璧峰灞�
-// motionList.addAll(kernelService.liftMoveShuttle(
-// MotionDto.build((dto -> {
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLev(Utils.getLev(shuttleLocNo));
-// })),
-// MotionDto.build((dto -> {
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLev(Utils.getLev(wrkMast.getSourceLocNo()));
-// }))
-// ));
-//
-// // 绌挎杞﹁蛋琛岃嚦鎻愬崌鏈哄緟鏈轰綅
-// motionList.addAll(kernelService.shuttleMove(
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLocNo(liftLocNoFrom);
-// })),
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLocNo(standbyLocNoFrom);
-// })),
-// MotionCtgType.SHUTTLE_MOVE_FROM_LIFT
-// ));
-//
-// // 绌挎杞︽彁鍗囨満寰呮満浣嶈嚦鍑哄簱搴撲綅
-// motionList.addAll(kernelService.shuttleMove(
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLocNo(standbyLocNoFrom);
-// })),
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLocNo(wrkMast.getSourceLocNo());
-// })),
-// MotionCtgType.SHUTTLE_MOVE
-// ));
-//
-// // 绌挎杞﹀嚭搴撹嚦鎻愬崌鏈哄緟鏈轰綅
-// motionList.addAll(kernelService.shuttleMove(
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLocNo(wrkMast.getSourceLocNo());
-// })),
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLocNo(standbyLocNoFrom);
-// })),
-// MotionCtgType.SHUTTLE_MOVE_LIFT_PALLET
-// ));
-//
-// // 绌挎杞︽彁鍗囨満寰呮満浣嶈嚦鎻愬崌鏈�
-// motionList.addAll(kernelService.shuttleTransport(
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLocNo(standbyLocNoFrom);
-// })),
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLocNo(liftLocNoFrom);
-// })),
-// MotionCtgType.SHUTTLE_TRANSPORT_TO_LIFT
-// ));
-//
-// // 绌挎杞︾寮�鎻愬崌鏈�
-// motionList.addAll(kernelService.shuttleMove(
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLocNo(liftLocNoFrom);
-// })),
-// MotionDto.build((dto -> {
-// dto.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());
-// dto.setLocNo(
-// ShuttleTempLocType.query(shuttleProtocol.getShuttleNo().intValue(), liftSlave.getId(), Utils.getLev(wrkMast.getSourceLocNo())).locNo
-// );
-// })),
-// MotionCtgType.SHUTTLE_MOVE_FROM_LIFT
-// ));
-//
-// // 鎻愬崌鏈鸿浇璐хЩ鍔�
-// // 鍑哄簱搴撲綅鏄惁涓庤緭閫佺嚎鍑哄簱绔欏睘浜庡悓涓�灞�
-// if (!slaveOutSta.getLiftLev().equals(Utils.getLev(wrkMast.getSourceLocNo()))) {
-// motionList.addAll(kernelService.liftMoveGoods(
-// MotionDto.build((dto -> {
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLev(Utils.getLev(wrkMast.getSourceLocNo()));
-// })),
-// MotionDto.build((dto -> {
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLev(slaveOutSta.getLiftLev());
-// }))
-// ));
-// }
-//
-// LiftNeighborType neighborType = LiftNeighborType.query(liftSlave.getId(), slaveOutSta.getLiftLev(), false, wrkMast.getStaNo());
-//
-// // 鎻愬崌鏈鸿繍杈撳埌杈撻�佺嚎
-// motionList.addAll(kernelService.liftTransportGoodsToConveyor(
-// MotionDto.build((dto -> {
-// dto.setLiftNo(liftSlave.getId());
-// dto.setLev(slaveOutSta.getLiftLev());
-// })),
-// MotionDto.build((dto -> {
-// dto.setDevpNo(devpSlave.getId());
-// dto.setStaNo(neighborType.staNo);
-// }))
-// ));
-//
-// }
-//
-// shuttleNo = String.valueOf(shuttleProtocol.getShuttleNo());
-// liftNo = String.valueOf(liftProtocol.getLiftNo());
+ //绌挎杞﹀嚭鎻愬崌鏈哄悗灏忚溅寰呮満浣�
+ String shuttleFromLiftStandbyLoc = shuttleStandbyFrom.getStandbyLoc();
+
+ //鑾峰彇鍑哄簱浠诲姟绫诲瀷
+ TaskCtg taskCtg = taskCtgService.getOne(new LambdaQueryWrapper<TaskCtg>()
+ .eq(TaskCtg::getFlag, String.valueOf(TaskCtgType.OUT))
+ .eq(TaskCtg::getStatus, 1));
+ if (taskCtg == null) {
+ return motionList;
+ }
+ //鑾峰彇杈撻�佺嚎璺緞
+ BasConveyorPath basConveyorPath = basConveyorPathService.getOne(new LambdaQueryWrapper<BasConveyorPath>()
+ .eq(BasConveyorPath::getDeviceStn, task.getOriginSite())
+ .eq(BasConveyorPath::getDeviceNo, liftProtocol.getLiftNo())
+ .eq(BasConveyorPath::getTypeNo, taskCtg.getId()));
+ if (basConveyorPath == null) {
+ return motionList;
+ }
+
+ /**
+ * 鍑哄簱
+ */
+ if (Utils.getLev(shuttleLocNo) == Utils.getLev(originLoc)) {
+
+ //绌挎杞︿笉鍦ㄥ嚭搴撳簱浣�
+ if (!shuttleLocNo.equals(task.getOriginLoc())) {
+ // 绌挎杞﹁蛋琛岃嚦鍑哄簱搴撲綅
+ motionList.addAll(kernelService.shuttleMove(
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLocNo(shuttleLocNo);
+ })),
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLocNo(originLoc);
+ })),
+ MotionCtgType.SHUTTLE_MOVE
+ ));
+ }
+
+ // 绌挎杞﹀嚭搴撻《鍗�
+ motionList.addAll(kernelService.shuttleAction(
+ null,
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ })),
+ MotionCtgType.SHUTTLE_PALLET_LIFT
+ ));
+
+ // 绌挎杞﹀嚭搴撹嚦鎻愬崌鏈哄緟鏈轰綅
+ motionList.addAll(kernelService.shuttleMove(
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLocNo(originLoc);
+ })),
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ dto.setLocNo(standbyLocNoTo);
+ })),
+ MotionCtgType.SHUTTLE_MOVE
+ ));
+
+ // 绌挎杞﹀嚭搴撴墭鐩樹笅闄�
+ motionList.addAll(kernelService.shuttleAction(
+ null,
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ })),
+ MotionCtgType.SHUTTLE_PALLET_DOWN
+ ));
+
+ // 鎻愬崌鏈鸿浇璐хЩ鍔�
+ motionList.addAll(kernelService.liftMoveGoods(
+ MotionDto.build((dto -> {
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ dto.setLev(Utils.getLev(task.getOriginLoc()));
+ dto.setStaNo(Integer.parseInt(task.getOriginSite()));//璧峰绔欑偣
+ }))
+ , MotionDto.build((dto -> {
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ dto.setLev(1);//鍏夋嘲1灞傛槸杈撻�佺嚎灞�
+ dto.setStaNo(31004);//鍑哄簱绔欑偣
+ dto.setSync(0);//寮傛鎵ц
+ dto.setReleaseLift(1);//鎵ц瀹屾垚鍚庨噴鏀炬彁鍗囨満
+ }))
+ ));
+
+ // 绌挎杞︽彁鍗囨満寰呮満浣� - 鍒板緟鏈轰綅
+ motionList.addAll(kernelService.shuttleMove(
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLocNo(standbyLocNoFrom);
+ })),
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLocNo(shuttleFromLiftStandbyLoc);
+ })),
+ MotionCtgType.SHUTTLE_MOVE
+ ));
+
+ // 杈撻�佺嚎杩愯緭鑷冲嚭搴撳彛
+ motionList.addAll(kernelService.conveyorOutbound(
+ MotionDto.build((dto -> {
+ dto.setDevpNo(basConveyorPath.getDeviceId().intValue());
+ dto.setStaNo(basConveyorPath.getDeviceStn());
+ })),
+ MotionDto.build((dto -> {
+ dto.setDevpNo(basConveyorPath.getDeviceId().intValue());
+ dto.setStaNo(basConveyorPath.getStnNo());
+ })),
+ MotionCtgType.CONVEYOR_OUTBOUND
+ ));
+
+ /**
+ * 浜屻�佸嚭搴撹捣濮嬪眰娌℃湁绌挎杞�
+ */
+ } else {
+
+ // 绌挎杞﹁蛋琛岃嚦鎻愬崌鏈哄簱浣嶅緟鏈轰綅
+ motionList.addAll(kernelService.shuttleMove(
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLocNo(shuttleLocNo);
+ })),
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ dto.setLocNo(standbyLocNoTo);
+ })),
+ MotionCtgType.SHUTTLE_MOVE
+ ));
+
+ // 鎻愬崌鏈虹┖杞界Щ鍔ㄥ埌绌挎杞﹀眰
+ motionList.addAll(kernelService.liftMove(
+ null
+ , MotionDto.build((dto -> {
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ dto.setLev(Utils.getLev(shuttleLocNo));
+ }))
+ ));
+
+ // 閿佸畾鎻愬崌鏈�
+ motionList.addAll(kernelService.liftLock(
+ null
+ , MotionDto.build((dto -> {
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ }))
+ ));
+
+ // 绌挎杞﹀緟鏈轰綅鑷虫彁鍗囨満
+ motionList.addAll(kernelService.shuttleMove(
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLocNo(standbyLocNoTo);
+ })),
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ dto.setLocNo(liftLocNoTo);
+ })),
+ MotionCtgType.SHUTTLE_MOVE_TO_LIFT
+ ));
+
+ // 瑙ｉ攣鎻愬崌鏈�
+ motionList.addAll(kernelService.liftUnlock(
+ null
+ , MotionDto.build((dto -> {
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ }))
+ ));
+
+ // 鎻愬崌鏈烘惉杞� 鑷� 鐩爣浣嶇疆灞�
+ motionList.addAll(kernelService.liftMoveShuttle(
+ MotionDto.build((dto -> {
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ dto.setLev(Utils.getLev(shuttleLocNo));
+ })),
+ MotionDto.build((dto -> {
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ dto.setLev(Utils.getLev(liftLocNoFrom));
+ }))
+ ));
+
+ // 閿佸畾鎻愬崌鏈�
+ motionList.addAll(kernelService.liftLock(
+ null
+ , MotionDto.build((dto -> {
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ }))
+ ));
+
+ // 鏇存柊灏忚溅鍧愭爣
+ motionList.addAll(kernelService.shuttleUpdateLocation(
+ null
+ , MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLocNo(liftLocNoFrom);
+ }))
+ ));
+
+ // 绌挎杞﹁蛋琛岃嚦鎻愬崌鏈哄緟鏈轰綅
+ motionList.addAll(kernelService.shuttleMove(
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ dto.setLocNo(liftLocNoFrom);
+ })),
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLocNo(standbyLocNoFrom);
+ })),
+ MotionCtgType.SHUTTLE_MOVE_FROM_LIFT
+ ));
+
+ // 瑙ｉ攣鎻愬崌鏈�
+ motionList.addAll(kernelService.liftUnlock(
+ null
+ , MotionDto.build((dto -> {
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ dto.setReleaseLift(1);//鎵ц瀹屾垚鍚庨噴鏀炬彁鍗囨満
+ }))
+ ));
+
+ // 绌挎杞︽彁鍗囨満寰呮満浣嶈嚦鍑哄簱搴撲綅
+ motionList.addAll(kernelService.shuttleMove(
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ dto.setLocNo(standbyLocNoFrom);
+ })),
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLocNo(originLoc);
+ })),
+ MotionCtgType.SHUTTLE_MOVE
+ ));
+
+ // 绌挎杞﹀嚭搴撻《鍗�
+ motionList.addAll(kernelService.shuttleAction(
+ null,
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ })),
+ MotionCtgType.SHUTTLE_PALLET_LIFT
+ ));
+
+ // 绌挎杞﹀嚭搴撹嚦鎻愬崌鏈哄緟鏈轰綅
+ motionList.addAll(kernelService.shuttleMove(
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLocNo(originLoc);
+ })),
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ dto.setLocNo(standbyLocNoFrom);
+ })),
+ MotionCtgType.SHUTTLE_MOVE
+ ));
+
+ // 绌挎杞﹀嚭搴撴墭鐩樹笅闄�
+ motionList.addAll(kernelService.shuttleAction(
+ null,
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ })),
+ MotionCtgType.SHUTTLE_PALLET_DOWN
+ ));
+
+ // 鎻愬崌鏈鸿浇璐хЩ鍔�
+ motionList.addAll(kernelService.liftMoveGoods(
+ MotionDto.build((dto -> {
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ dto.setLev(Utils.getLev(task.getOriginLoc()));
+ dto.setStaNo(Integer.parseInt(task.getOriginSite()));//璧峰绔欑偣
+ }))
+ , MotionDto.build((dto -> {
+ dto.setLiftNo(transferLiftDevice.getId().intValue());
+ dto.setLev(1);//鍏夋嘲1灞傛槸杈撻�佺嚎灞�
+ dto.setStaNo(31004);//鍑哄簱绔欑偣
+ dto.setSync(0);//寮傛鎵ц
+ dto.setReleaseLift(1);//鎵ц瀹屾垚鍚庨噴鏀炬彁鍗囨満
+ }))
+ ));
+
+ // 绌挎杞︽彁鍗囨満寰呮満浣� - 鍒板緟鏈轰綅
+ motionList.addAll(kernelService.shuttleMove(
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLocNo(standbyLocNoFrom);
+ })),
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ dto.setLocNo(shuttleFromLiftStandbyLoc);
+ })),
+ MotionCtgType.SHUTTLE_MOVE
+ ));
+
+ // 杈撻�佺嚎杩愯緭鑷冲嚭搴撳彛
+ motionList.addAll(kernelService.conveyorOutbound(
+ MotionDto.build((dto -> {
+ dto.setDevpNo(basConveyorPath.getDeviceId().intValue());
+ dto.setStaNo(basConveyorPath.getDeviceStn());
+ })),
+ MotionDto.build((dto -> {
+ dto.setDevpNo(basConveyorPath.getDeviceId().intValue());
+ dto.setStaNo(basConveyorPath.getStnNo());
+ })),
+ MotionCtgType.CONVEYOR_OUTBOUND
+ ));
+
+ }
+
}
return motionList;
@@ -834,13 +803,6 @@
//妫�娴嬬┛姊溅鏄惁鏈変换鍔＄粦瀹�
boolean shuttleResult = Utils.checkShuttleHasBinding(shuttleDevice, task.getTaskNo());
if (shuttleResult) {
- //瀛樺湪浠诲姟锛岀姝㈣В鏋�
- return motionList;
- }
-
- //妫�娴嬫彁鍗囨満鏄惁鏈変换鍔＄粦瀹�
- boolean liftResult = Utils.checkLiftHasBinding(Integer.parseInt(transferLiftDevice.getDeviceNo()));
- if (liftResult) {
//瀛樺湪浠诲姟锛岀姝㈣В鏋�
return motionList;
}
@@ -1006,16 +968,15 @@
MotionCtgType.SHUTTLE_MOVE
));
- task.setLiftNo(Integer.parseInt(transferLiftDevice.getDeviceNo()));
- taskService.updateById(task);
}
// 绌挎杞﹀紑濮嬪厖鐢�
- motionList.addAll(kernelService.shuttleCharge(
+ motionList.addAll(kernelService.shuttleAction(
null,
MotionDto.build((dto -> {
dto.setShuttleNo(shuttleDevice.getId().intValue());
- }))
+ })),
+ MotionCtgType.SHUTTLE_CHARGE_ON
));
return motionList;
@@ -1052,6 +1013,15 @@
// 鍒ゆ柇绌挎杞︽槸鍚﹀湪鐩爣灞�
if (Utils.getLev(shuttleLocNo) == Utils.getLev(locNo)) {
+
+ // 绌挎杞﹀叧闂厖鐢�
+ motionList.addAll(kernelService.shuttleAction(
+ null,
+ MotionDto.build((dto -> {
+ dto.setShuttleNo(shuttleDevice.getId().intValue());
+ })),
+ MotionCtgType.SHUTTLE_CHARGE_OFF
+ ));
// 绌挎杞﹁蛋琛岃嚦鐩爣搴撲綅
motionList.addAll(kernelService.shuttleMove(
@@ -1189,14 +1159,6 @@
MotionCtgType.SHUTTLE_MOVE_TO_LIFT
));
- // 鍚戞彁鍗囨満鍙戦�佸皬杞﹀凡鍒颁綅淇″彿
- motionList.addAll(kernelService.liftShuttleArrival(
- null
- , MotionDto.build((dto -> {
- dto.setLiftNo(liftDevice.getId().intValue());
- }))
- ));
-
// 瑙ｉ攣鎻愬崌鏈�
motionList.addAll(kernelService.liftUnlock(
null
@@ -1285,7 +1247,7 @@
String sourceLoc = task.getOriginLoc();//婧愬簱浣�
String targetLoc = task.getDestLoc();//浠诲姟鐩爣(鍊熺敤瀛楁)
- String targetSite = task.getDestSite();//浠诲姟绫诲瀷(鍊熺敤瀛楁)
+ String targetSite = task.getMemo();//浠诲姟绫诲瀷(鍊熺敤瀛楁)
Device device = deviceService.getOne(new LambdaQueryWrapper<Device>()
.eq(Device::getDeviceNo, task.getShuttleNo())
@@ -1429,7 +1391,8 @@
return motionList;
}
- if (task.getDestSite().equals("move")) {
+ String destSite = task.getMemo();//浠诲姟鐩爣(鍊熺敤瀛楁)
+ if (destSite.equals("move")) {
//鎻愬崌鏈哄崌闄嶆ゼ灞�
// 鎻愬崌鏈虹┖杞界Щ鍔ㄥ埌绌挎杞﹀眰
@@ -1441,23 +1404,45 @@
}))
));
- } else if (task.getDestSite().equals("movePallet")) {
+ } else if (destSite.equals("movePallet")) {
//绉诲姩鎵樼洏
+ BasConveyorSta basConveyorStaOrigin = basConveyorStaService.selectBySiteNo(task.getOriginSite());
+ BasConveyorSta basConveyorStaDest = basConveyorStaService.selectBySiteNo(task.getDestSite());
+ if(basConveyorStaOrigin == null || basConveyorStaDest == null) {
+ return motionList;
+ }
// 鎻愬崌鏈虹Щ鍔ㄦ墭鐩�
motionList.addAll(kernelService.liftMoveGoods(
MotionDto.build((dto -> {
dto.setLiftNo(device.getId().intValue());
- dto.setLev(Integer.parseInt(task.getOriginLoc()));
+ dto.setLev(Utils.getLev(basConveyorStaOrigin.getLocNo()));
dto.setStaNo(Integer.parseInt(task.getOriginSite()));
}))
, MotionDto.build((dto -> {
dto.setLiftNo(device.getId().intValue());
- dto.setLev(Integer.parseInt(task.getDestLoc()));
+ dto.setLev(Utils.getLev(basConveyorStaDest.getLocNo()));
+ dto.setDevpNo(basConveyorStaDest.getConveyorDeviceId().intValue());
dto.setStaNo(Integer.parseInt(task.getDestSite()));
}))
));
+ } else if (destSite.equals("lock")) {
+ // 閿佸畾鎻愬崌鏈�
+ motionList.addAll(kernelService.liftLock(
+ null
+ , MotionDto.build((dto -> {
+ dto.setLiftNo(device.getId().intValue());
+ }))
+ ));
+ } else if (destSite.equals("unlock")) {
+ // 瑙ｉ攣鎻愬崌鏈�
+ motionList.addAll(kernelService.liftUnlock(
+ null
+ , MotionDto.build((dto -> {
+ dto.setLiftNo(device.getId().intValue());
+ }))
+ ));
}
return motionList;
--
Gitblit v1.9.1