From 6c6a1178f2e5900d56a381e12f9c9f998cf9b270 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 20 六月 2023 11:25:22 +0800
Subject: [PATCH] fix
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 1169 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 762 insertions(+), 407 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index e271946..a3270f1 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -11,6 +11,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.*;
+import com.zy.common.model.enums.NavigationMapType;
import com.zy.common.model.enums.WrkChargeType;
import com.zy.common.service.CommonService;
import com.zy.common.service.erp.ErpService;
@@ -60,13 +61,13 @@
@Autowired
private StaDescService staDescService;
@Autowired
- private BasCrnpService basCrnpService;
- @Autowired
private BasDevpService basDevpService;
@Autowired
private BasErrLogService basErrLogService;
@Autowired
private BasSteErrLogService basSteErrLogService;
+ @Autowired
+ private BasShuttleService basShuttleService;
@Autowired
private BasShuttleErrLogService basShuttleErrLogService;
@Autowired
@@ -83,6 +84,8 @@
private CommonService commonService;
@Autowired
private WrkChargeMapper wrkChargeMapper;
+ @Autowired
+ private BasMapService basMapService;
@Autowired
private ErpService erpService;
@Autowired
@@ -150,11 +153,12 @@
}
continue;
}
+
// 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
if (staProtocol.isAutoing() && staProtocol.isLoading()
&& staProtocol.isInEnable()
&& !staProtocol.isEmptyMk() && (workNo == 0 || (workNo >= 9990 && workNo <= 9999))
- && staProtocol.isPakMk()) {
+ ) {
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
@@ -165,10 +169,10 @@
if(!Cools.isEmpty(barcode)) {
// News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)|| "00000000".equals(barcode)) {
- staProtocol.setWorkNo((short) 32002);
- staProtocol.setStaNo(inSta.getBackSta().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// staProtocol.setWorkNo((short) 32002);
+// staProtocol.setStaNo(inSta.getBackSta().shortValue());
+// devpThread.setPakMk(staProtocol.getSiteId(), false);
+// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
// led 寮傚父鏄剧ず
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
@@ -179,10 +183,10 @@
continue;
}
} else {
- staProtocol.setWorkNo((short) 32002);
- staProtocol.setStaNo(inSta.getBackSta().shortValue());
- devpThread.setPakMk(staProtocol.getSiteId(), false);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// staProtocol.setWorkNo((short) 32002);
+// staProtocol.setStaNo(inSta.getBackSta().shortValue());
+// devpThread.setPakMk(staProtocol.getSiteId(), false);
+// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
// led 寮傚父鏄剧ず
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, inSta.getLed());
@@ -233,6 +237,18 @@
if (!result) {
throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
}
+
+ // 鍒ゆ柇閲嶅宸ヤ綔妗�
+ WrkMast wrkMast = wrkMastMapper.selectPakInStep11(inSta.getStaNo());
+ if (wrkMast == null) { continue; }
+
+ // 鏇存柊宸ヤ綔涓绘。
+ wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細2.璁惧涓婅蛋
+ wrkMast.setModiTime(new Date());
+ if (wrkMastMapper.updateById(wrkMast) == 0) {
+ News.error("鏇存柊宸ヤ綔妗ｅけ璐ワ紒锛侊紒 [宸ヤ綔鍙凤細{}]", wrkMast.getWrkNo());
+ }
+
} else if (code == 500){
if (ledThread != null) {
String errorMsg = jsonObject.getString("msg");
@@ -544,6 +560,38 @@
}
/**
+ * 鍒濆鍖栧疄鏃跺湴鍥�
+ */
+ public synchronized void initRealtimeBasMap() {
+ for (int i = 1; i <= 4; i++) {//鎬诲叡鍥涘眰妤�
+ Object data = redisUtil.get("realtimeBasMap_" + i);
+ if (data == null) {//redis鍦板浘鏁版嵁涓虹┖锛屼粠鏁版嵁搴撲腑鑾峰彇
+ BasMap basMap = basMapService.selectLatestMap(i);
+ if (basMap == null) {
+ //鏁版嵁搴撲腑涔熶笉瀛樺湪鍦板浘鏁版嵁锛屼粠鍦板浘鏂囦欢涓幏鍙�
+ //杞藉叆鍦板浘
+ NavigateMapData mapData = new NavigateMapData(i);
+ List<List<MapNode>> lists = mapData.getJsonData(-1, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
+
+ //瀛樺叆鏁版嵁搴�
+ basMap = new BasMap();
+ basMap.setData(JSON.toJSONString(lists));
+ basMap.setCreateTime(new Date());
+ basMap.setUpdateTime(new Date());
+ basMap.setLev(i);
+
+ if (!basMapService.insert(basMap)) {
+ log.info("鍦板浘鏁版嵁瀛樺偍澶辫触");
+ }
+ }
+
+ //灏嗘暟鎹簱鍦板浘鏁版嵁瀛樺叆redis
+ redisUtil.set("realtimeBasMap_" + i, JSON.toJSONString(basMap));
+ }
+ }
+ }
+
+ /**
* 浠巖edis涓噸鍚换鍔�
*/
public synchronized void restartTaskFromRedis() {
@@ -561,6 +609,9 @@
continue;
}
LiftProtocol liftProtocol = liftThread.getLiftProtocol();
+ if (liftProtocol == null) {
+ continue;
+ }
if (!liftProtocol.isIdle()) {
continue;
}
@@ -568,9 +619,8 @@
//鎻愬崌鏈哄浜庣┖闂茬姸鎬侊紝杩涜浠诲姟鐨勬仮澶�
liftProtocol.setTaskNo(redisCommand.getWrkNo());//灏嗘彁鍗囨満绾跨▼鍒嗛厤浠诲姟鍙�
liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//宸ヤ綔鐘舵��
- liftProtocol.setLiftLock(true);//鎻愬崌鏈洪攣瀹�
- }else {//鍥涘悜绌挎杞︿换鍔�
+ }else if(key.toString().contains("shuttle_wrk_no_")){//鍥涘悜绌挎杞︿换鍔�
ShuttleRedisCommand redisCommand = JSON.parseObject(map.get(key).toString(), ShuttleRedisCommand.class);
if (redisCommand == null) {
continue;
@@ -582,6 +632,9 @@
continue;
}
ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+ if (shuttleProtocol == null) {
+ continue;
+ }
if (!shuttleProtocol.isIdle()) {
continue;
}
@@ -601,19 +654,10 @@
// 鏍规嵁杈撻�佺嚎plc閬嶅巻
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鍏ュ簱绔�
- for (DevpSlave.StaRack rackInStn : devp.getRackInStn()) {
+ for (DevpSlave.StaRack staRack : devp.getRackInStn()) {
// 鑾峰彇鍏ュ簱绔欎俊鎭�
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
-
- StaProtocol staProtocol = devpThread.getStation().get(rackInStn.getStaNo());
- StaProtocol staProtocol105 = devpThread.getStation().get(105);
- staProtocol105.setWorkNo((short) 752);
- staProtocol105.setStaNo((short) 100);
-
- StaProtocol staProtocol106 = devpThread.getStation().get(106);
- staProtocol106.setWorkNo((short) 753);
- staProtocol106.setStaNo((short) 100);
-
+ StaProtocol staProtocol = devpThread.getStation().get(staRack.getStaNo());
if (staProtocol == null) {
continue;
} else {
@@ -621,19 +665,52 @@
}
Short workNo = staProtocol.getWorkNo();
- // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢
- if (true || staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()) {
+ // 鍒ゆ柇鏄惁婊¤冻鍏ュ簱鏉′欢锛岃嚜鍔ㄣ�佹湁鐗┿�佸洓鍚戠┛姊溅鍙彇淇″彿
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isShuttleTakeEnable()) {
WrkMast wrkMast = wrkMastMapper.selectRackInStep48(workNo, staProtocol.getSiteId());
if (wrkMast != null) {
if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 8) {
ShuttleThread shuttleThread = null;
HashMap<String, Object> searchIdleShuttle = null;
+
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, 1);
+ LiftProtocol liftProtocol = liftThread.getLiftProtocol();
+
if (wrkMast.getWrkSts() == 4) {
//瀵绘壘鏈�杩戜笖绌洪棽鐨勫洓鍚戠┛姊溅
searchIdleShuttle = this.searchIdleShuttle(wrkMast);
shuttleThread = (ShuttleThread) searchIdleShuttle.get("result");
- }else {
- //鐘舵��8锛屽洓鍚戠┛姊溅宸插湪鎻愬崌鏈哄彛锛岀瓑寰呭懡浠よ繘琛屽叆搴撴惉杩愬姩浣�
+ }else if(wrkMast.getWrkSts() == 8){//鐘舵��8锛岄渶瑕佸悜灏忚溅涓嬪彂鍛戒护浠庢彁鍗囨満绉诲姩鍑哄幓锛岄渶瑕佸垽鏂彁鍗囨満鐘舵槸鍚︾┖闂层�佹彁鍗囨満鏄惁鍒拌揪鐩爣妤煎眰銆佺洰鏍囨ゼ灞傜珯鐐规槸鍚﹀瓨鍦ㄣ�佺洰鏍囨ゼ灞傜珯鐐规槸鍚︾粰鍑烘彁鍗囨満鍒颁綅淇″彿
+ //鐘舵��8锛岀瓑寰呭懡浠よ繘琛屽叆搴撴惉杩愬姩浣�
+
+ //鍒ゆ柇鎻愬崌鏈烘槸鍚︾┖闂�
+ if (!liftProtocol.isIdle()) {
+ try {
+ Thread.sleep(1000);//浼戠湢1s
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ continue;//鎻愬崌鏈哄繖
+ }
+
+ //鍒ゆ柇鎻愬崌鏈烘ゼ灞傛槸鍚﹀埌浣嶏紝鍒ゆ柇绔欑偣鏄惁缁欏嚭鎻愬崌鏈哄埌浣嶄俊鍙�
+ String locNo = wrkMast.getLocNo();
+ int lev = Utils.getLev(locNo);//鐩爣浜岀淮鐮佹墍鍦ㄦゼ灞�
+ int liftLev = liftProtocol.getLev().intValue();//鎻愬崌鏈烘墍鍦ㄦゼ灞�
+ if (liftLev != lev) {
+ continue;//鎻愬崌鏈轰笉鍦ㄧ洰鏍囨ゼ灞傝烦杩�
+ }
+
+ Integer staNo = Utils.levToOutInStaNo(lev >= 2 ? lev + 1 : lev);
+ //鑾峰彇鐩爣绔欎俊鎭�
+ StaProtocol staProtocol1 = devpThread.getStation().get(staNo);
+ if (staProtocol1 == null) {
+ continue;//绔欑偣淇℃伅涓嶅瓨鍦�
+ }
+ if (!staProtocol1.isLiftArrival()) {
+ continue;//绔欑偣鎻愬崌鏈哄埌浣嶄俊鍙穎alse
+ }
+
Integer shuttleNo = wrkMast.getShuttleNo();//鍥涘悜绌挎杞﹀彿
shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleNo);
}
@@ -663,29 +740,28 @@
assignCommand.setSourceLocNo(currentLocNo);//婧愬簱浣�(灏忚溅褰撳墠浣嶇疆)
String locNo = wrkMast.getLocNo();//褰撳墠宸ヤ綔妗ｅ簱浣嶅彿
- Integer lev = Integer.parseInt(locNo.substring(locNo.length() - 2, locNo.length()));//褰撳墠宸ヤ綔妗ｅ簱浣嶅眰楂�
- Integer currentLev = Integer.parseInt(currentLocNo.substring(currentLocNo.length() - 2, currentLocNo.length()));//灏忚溅褰撳墠灞傞珮
+ Integer currentLev = wrkMast.getWrkSts() == 4 ? Utils.getLev(currentLocNo) : liftProtocol.getLev();//灏忚溅褰撳墠灞傞珮
- //鑾峰彇鎻愬崌鏈�
- LiftSlave liftSlave = slaveProperties.getLift().get(0);
- //鎻愬崌鏈哄簱浣嶅彿
- String liftLocNo = liftSlave.getLiftLocNo(currentLev);
+ //鎻愬崌鏈哄彛绔欑偣搴撲綅鍙�
+ String liftSiteLocNo = Utils.levToOutInStaLocNo(currentLev);
if (wrkMast.getWrkSts() == 8 || Boolean.parseBoolean(searchIdleShuttle.get("sameLay").toString())) {
//鍚屼竴灞傜洿鎺ュ彇璐ф棤闇�缁忚繃鎻愬崌鏈�
//鐩存帴璁＄畻杞﹀埌鎻愬崌鏈哄彇璐у啀鍒板簱浣嶈矾寰勬寚浠�
- List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, liftLocNo, locNo);
+ List<ShuttleCommand> commands = this.shuttleAssignCommand(wrkMast.getWrkSts() == 4 ? currentLocNo : liftSiteLocNo, liftSiteLocNo, locNo, assignCommand, shuttleThread);
+ if (commands == null) {
+ continue;//鎵句笉鍒拌矾寰勭瓑寰呬笅涓�娆�
+ }
if (wrkMast.getWrkSts() == 8) {
- //姝ゆ椂杞﹀湪鎻愬崌鏈哄唴閮紝闇�瑕佸涓嬭揪涓�姝ユ寚浠よ杞︾Щ鍔ㄥ埌鎻愬崌鏈哄彛
- BasDevp basDevp = basDevpService.selectById(109);//鑾峰彇鎻愬崌鏈轰俊鎭�
- ShuttleCommand moveCommand = new ShuttleCommand();
- moveCommand.setCommandWord((short) 1);
- moveCommand.setStartCodeNum(Short.parseShort(basDevp.getQrCodeValue()));//鎻愬崌鏈哄唴閮ㄤ簩缁寸爜
- moveCommand.setDistCodeNum(commands.get(0).getStartCodeNum());//鎻愬崌鏈哄彛浜岀淮鐮�
- moveCommand.setStartToDistDistance(1300);
- moveCommand.setMiddleToDistDistance(0);
- moveCommand.setRunDirection(commands.get(0).getRunDirection());
- moveCommand.setCommandEnd((short) 1);
+ //姝ゆ椂杞﹀湪鎻愬崌鏈哄唴閮紝涓嬭揪涓�姝ユ寚浠よ杞︾Щ鍔ㄥ埌鎻愬崌鏈哄彛
+ Integer staNo = Utils.levToOutInStaNo(currentLev >= 2 ? currentLev + 1 : currentLev);//绔欑偣鍙�
+ BasDevp basDevp = basDevpService.selectById(staNo);
+
+ short startCode = liftProtocol.getBarcode();//鎻愬崌鏈哄唴閮ㄤ簩缁寸爜
+ Short distCode = Short.parseShort(basDevp.getQrCodeValue());//鎻愬崌鏈哄彛绔欑偣浜岀淮鐮�
+ Short runDirection = ShuttleRunDirection.BOTTOM.id;//杩愯鏂瑰悜
+ //鑾峰彇鍛戒护
+ ShuttleCommand moveCommand = shuttleThread.getMoveCommand(startCode, distCode, 1400, runDirection, startCode, 1400, 500);
commands.add(0, moveCommand);//灏嗚鎸囦护娣诲姞鍒伴槦澶�
}
assignCommand.setCommands(commands);
@@ -698,11 +774,23 @@
//涓嶅悓灞傦紝灏嗙洰鏍囧簱浣嶅垎閰嶆垚鎻愬崌鏈哄簱浣嶅彿
//灏忚溅绉诲姩鍒版彁鍗囨満鍙ｏ紝璁＄畻璺緞
- List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, liftLocNo, ShuttleTaskModeType.PAK_IN.id);
+ List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, liftSiteLocNo, NavigationMapType.NONE.id, assignCommand, shuttleThread);
+ if (commands == null) {
+ continue;//鏈壘鍒拌矾寰�
+ }
+
+ //鑾峰彇褰撳墠灏忚溅鎵�鍦ㄦゼ灞傜殑绔欑偣淇℃伅
+ BasDevp basDevp = basDevpService.queryByLocNo(liftSiteLocNo);
+ Short endStartCode = Short.parseShort(basDevp.getQrCodeValue());//绔欑偣浜岀淮鐮�
+
+ //澧炲姞绉诲姩杩涙彁鍗囨満鍛戒护
+ ShuttleCommand moveCommand = shuttleThread.getMoveCommand(endStartCode, liftProtocol.getBarcode(), 1400, ShuttleRunDirection.TOP.id, endStartCode, 1400, 500);
+ commands.add(moveCommand);
+
//鍒嗛厤鐩爣搴撲綅
- shuttleProtocol.setLocNo(liftLocNo);
+ shuttleProtocol.setLocNo(liftSiteLocNo);
//鐩爣搴撲綅
- assignCommand.setLocNo(liftLocNo);
+ assignCommand.setLocNo(liftSiteLocNo);
assignCommand.setCommands(commands);
wrkMast.setWrkSts(5L);//灏忚溅杩佺Щ鐘舵��
}
@@ -721,14 +809,27 @@
}
- //鑾峰彇璧风偣-缁堢偣鎸囦护銆俶apType锛�1=銆嬫棤璐у湴鍥撅紝2=銆嬫湁璐у湴鍥�
- public synchronized List<ShuttleCommand> shuttleAssignCommand(String startLocNo, String locNO,Integer mapType) {
+ //鑾峰彇璧风偣-缁堢偣鎸囦护
+ public synchronized List<ShuttleCommand> shuttleAssignCommand(String startLocNo, String locNo, Integer mapType, ShuttleAssignCommand assignCommand, ShuttleThread shuttleThread) {
+ //鑾峰彇灏忚溅绉诲姩閫熷害
+ BasShuttle basShuttle = basShuttleService.selectById(assignCommand.getShuttleNo());
+ Integer runSpeed = 1000;
+ if (basShuttle != null) {
+ Integer runSpeed1 = basShuttle.getRunSpeed();
+ if (runSpeed1 != null) {
+ runSpeed = runSpeed1;
+ }
+ }
+
//璁＄畻灏忚溅璧风偣鍒颁腑鐐规墍闇�鍛戒护
- List<NavigateNode> calc = NavigateUtils.calc(startLocNo, locNO, mapType);
+ List<NavigateNode> calc = NavigateUtils.calc(startLocNo, locNo, mapType);
List<ShuttleCommand> commands = new ArrayList<>();
if (calc == null) {
return null;
}
+
+ List<NavigateNode> allNode = new ArrayList<>();
+ allNode.addAll(calc);
//鑾峰彇鍒嗘璺緞
ArrayList<ArrayList<NavigateNode>> data = NavigateUtils.getSectionPath(calc);
@@ -736,134 +837,116 @@
for (ArrayList<NavigateNode> nodes : data) {
//寮�濮嬭矾寰�
NavigateNode startPath = nodes.get(0);
+ //涓棿璺緞
+ NavigateNode middlePath = nodes.get(nodes.size() - 2);
//鐩爣璺緞
NavigateNode endPath = nodes.get(nodes.size() - 1);
Integer allDistance = NavigateUtils.getCurrentPathAllDistance(nodes);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
-
- ShuttleCommand command = new ShuttleCommand();
- command.setCommandWord((short) 1);
-
+ Integer middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
//閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
Short startCodeNum = NavigatePositionConvert.xyToPosition(startPath.getX(), startPath.getY(), startPath.getZ());
- command.setStartCodeNum(startCodeNum);
-
- command.setMiddleCodeNum((short) 1);
-
+ //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
+ Short middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
//閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
Short distCodeNum = NavigatePositionConvert.xyToPosition(endPath.getX(), endPath.getY(), endPath.getZ());
- command.setDistCodeNum(distCodeNum);
-
- command.setStartToDistDistance(allDistance);
- command.setMiddleToDistDistance(0);
- command.setRunDirection(ShuttleRunDirection.get(startPath.getDirection()).id);
- command.setPalletLift((short) 1);
- command.setForceMoveDistance(0);
- command.setChargeSwitch((short) 2);
- command.setIOControl((short) 0);
- command.setRadarTmp((short) 0);
- command.setCommandEnd((short) 1);
+ //鑾峰彇绉诲姩鍛戒护
+ ShuttleCommand command = shuttleThread.getMoveCommand(startCodeNum, distCodeNum, allDistance, ShuttleRunDirection.get(startPath.getDirection()).id, middleCodeNum, middleToDistDistance, runSpeed);
commands.add(command);
}
+
+ assignCommand.setNodes(allNode);//褰撳墠浠诲姟鎵�鍗犵敤鐨勮妭鐐筶ist
+ //鎵�浣跨敤鐨勮矾寰勮繘琛岄攣瀹氱鐢�
+ NavigateMapData navigateMapData = new NavigateMapData(Utils.getLev(startLocNo));
+ navigateMapData.writeNavigateNodeToRedisMap(allNode, true);////鎵�浣跨敤鐨勮矾寰勮繘琛岄攣瀹氱鐢�
+
return commands;
}
//鑾峰彇璧风偣-涓偣-缁堢偣鎸囦护
- public synchronized List<ShuttleCommand> shuttleAssignCommand(String startLocNo, String middleLocNo, String locNO) {
- //璁＄畻灏忚溅璧风偣鍒颁腑鐐规墍闇�鍛戒护
- List<NavigateNode> calc = NavigateUtils.calc(startLocNo, middleLocNo, 1);//灏忚溅鏃犺揣锛岃蛋鍏ュ簱鍦板浘
- List<ShuttleCommand> commands = new ArrayList<>();
- if (calc == null) {
- return null;
+ public synchronized List<ShuttleCommand> shuttleAssignCommand(String startLocNo, String middleLocNo, String locNo, ShuttleAssignCommand assignCommand, ShuttleThread shuttleThread) {
+ //鑾峰彇灏忚溅绉诲姩閫熷害
+ BasShuttle basShuttle = basShuttleService.selectById(assignCommand.getShuttleNo());
+ Integer runSpeed = 1000;
+ if (basShuttle != null) {
+ Integer runSpeed1 = basShuttle.getRunSpeed();
+ if (runSpeed1 != null) {
+ runSpeed = runSpeed1;
+ }
}
- //鑾峰彇鍒嗘璺緞
- ArrayList<ArrayList<NavigateNode>> data = NavigateUtils.getSectionPath(calc);
- //灏嗘瘡涓�娈佃矾寰勫垎鎴恈ommand鎸囦护
- for (ArrayList<NavigateNode> nodes : data) {
- //寮�濮嬭矾寰�
- NavigateNode startPath = nodes.get(0);
- //鐩爣璺緞
- NavigateNode endPath = nodes.get(nodes.size() - 1);
- Integer allDistance = NavigateUtils.getCurrentPathAllDistance(nodes);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
+ List<NavigateNode> allNode = new ArrayList<>();
- ShuttleCommand command = new ShuttleCommand();
- command.setCommandWord((short) 1);
+ //璁＄畻灏忚溅璧风偣鍒颁腑鐐规墍闇�鍛戒护
+ List<NavigateNode> calc = NavigateUtils.calc(startLocNo, middleLocNo, NavigationMapType.NORMAL.id);//灏忚溅鏃犺揣锛岃蛋姝ｅ父搴撲綅閫氶亾
+ List<ShuttleCommand> commands = new ArrayList<>();
- //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
- Short startCodeNum = NavigatePositionConvert.xyToPosition(startPath.getX(), startPath.getY(), startPath.getZ());
- command.setStartCodeNum(startCodeNum);
+ if (calc != null) {
+ allNode.addAll(calc);
+ //鑾峰彇鍒嗘璺緞
+ ArrayList<ArrayList<NavigateNode>> data = NavigateUtils.getSectionPath(calc);
+ //灏嗘瘡涓�娈佃矾寰勫垎鎴恈ommand鎸囦护
+ for (ArrayList<NavigateNode> nodes : data) {
+ //寮�濮嬭矾寰�
+ NavigateNode startPath = nodes.get(0);
+ //涓棿璺緞
+ NavigateNode middlePath = nodes.get(nodes.size() - 2);
+ //鐩爣璺緞
+ NavigateNode endPath = nodes.get(nodes.size() - 1);
+ Integer allDistance = NavigateUtils.getCurrentPathAllDistance(nodes);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
+ Integer middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
- command.setMiddleCodeNum((short) 1);
-
- //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
- Short distCodeNum = NavigatePositionConvert.xyToPosition(endPath.getX(), endPath.getY(), endPath.getZ());
- command.setDistCodeNum(distCodeNum);
-
- command.setStartToDistDistance(allDistance);
- command.setMiddleToDistDistance(0);
- command.setRunDirection(ShuttleRunDirection.get(startPath.getDirection()).id);
- command.setPalletLift((short) 1);
- command.setForceMoveDistance(0);
- command.setChargeSwitch((short) 2);
- command.setIOControl((short) 0);
- command.setRadarTmp((short) 0);
- command.setCommandEnd((short) 1);
- commands.add(command);
+ //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
+ Short startCodeNum = NavigatePositionConvert.xyToPosition(startPath.getX(), startPath.getY(), startPath.getZ());
+ //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
+ Short middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
+ //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
+ Short distCodeNum = NavigatePositionConvert.xyToPosition(endPath.getX(), endPath.getY(), endPath.getZ());
+ //鑾峰彇绉诲姩鍛戒护
+ ShuttleCommand command = shuttleThread.getMoveCommand(startCodeNum, distCodeNum, allDistance, ShuttleRunDirection.get(startPath.getDirection()).id, middleCodeNum, middleToDistDistance, runSpeed);
+ commands.add(command);
+ }
}
//灏忚溅鎸囦护鍒拌揪鐩爣浣嶇疆鍚庯紝鍐嶅彂鍑轰竴鏉￠《鍗囨寚浠�
- ShuttleCommand command = new ShuttleCommand();
- command.setCommandWord((short) 2);
- command.setPalletLift((short) 1);
- command.setCommandEnd((short) 1);
- commands.add(command);
+ commands.add(shuttleThread.getPalletCommand((short) 1));
//璁＄畻灏忚溅涓偣鍒扮粓鐐规墍闇�鍛戒护
- List<NavigateNode> calc2 = NavigateUtils.calc(middleLocNo, locNO, 2);//灏忚溅鏈夎揣锛岃蛋鍑哄簱鍦板浘(鍑哄簱鍦板浘鏈変笓鐢ㄨ揣閬�)
+ List<NavigateNode> calc2 = NavigateUtils.calc(middleLocNo, locNo, NavigationMapType.DFX.id);//灏忚溅鏈夎揣锛岃蛋绂佺敤杩嘍FX搴撲綅鐨勫湴鍥鹃�氶亾
if (calc2 == null) {
return null;
}
+
+ allNode.addAll(calc2);
//鑾峰彇鍒嗘璺緞
ArrayList<ArrayList<NavigateNode>> data2 = NavigateUtils.getSectionPath(calc2);
for (ArrayList<NavigateNode> nodes : data2) {
//寮�濮嬭矾寰�
NavigateNode startPath = nodes.get(0);
+ //涓棿璺緞
+ NavigateNode middlePath = nodes.get(nodes.size() - 2);
//鐩爣璺緞
NavigateNode endPath = nodes.get(nodes.size() - 1);
Integer allDistance = NavigateUtils.getCurrentPathAllDistance(nodes);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
-
- command = new ShuttleCommand();
- command.setCommandWord((short) 1);
+ Integer middleToDistDistance = NavigateUtils.getMiddleToDistDistance(nodes);//璁＄畻涓棿鐐瑰埌鐩爣鐐硅璧拌窛绂�
//閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
Short startCodeNum = NavigatePositionConvert.xyToPosition(startPath.getX(), startPath.getY(), startPath.getZ());
- command.setStartCodeNum(startCodeNum);
-
- command.setMiddleCodeNum((short) 1);
-
+ //閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
+ Short middleCodeNum = NavigatePositionConvert.xyToPosition(middlePath.getX(), middlePath.getY(), middlePath.getZ());
//閫氳繃xy鍧愭爣灏忚溅浜岀淮鐮�
Short distCodeNum = NavigatePositionConvert.xyToPosition(endPath.getX(), endPath.getY(), endPath.getZ());
- command.setDistCodeNum(distCodeNum);
-
- command.setStartToDistDistance(allDistance);
- command.setMiddleToDistDistance(0);
- command.setRunDirection(ShuttleRunDirection.get(startPath.getDirection()).id);
- command.setPalletLift((short) 1);
- command.setForceMoveDistance(0);
- command.setChargeSwitch((short) 2);
- command.setIOControl((short) 0);
- command.setRadarTmp((short) 0);
- command.setCommandEnd((short) 1);
- commands.add(command);
+ ShuttleCommand moveCommand = shuttleThread.getMoveCommand(startCodeNum, distCodeNum, allDistance, ShuttleRunDirection.get(startPath.getDirection()).id, middleCodeNum, middleToDistDistance, runSpeed);
+ commands.add(moveCommand);
}
//灏忚溅鎸囦护鍒拌揪鐩爣浣嶇疆鍚庯紝鍐嶅彂鍑轰竴鏉℃墭鐩樹笅闄嶆寚浠�
- command = new ShuttleCommand();
- command.setCommandWord((short) 2);
- command.setPalletLift((short) 2);
- command.setCommandEnd((short) 1);
- commands.add(command);
+ commands.add(shuttleThread.getPalletCommand((short) 2));
+
+ assignCommand.setNodes(allNode);//褰撳墠浠诲姟鎵�鍗犵敤鐨勮妭鐐筶ist
+ //鎵�浣跨敤鐨勮矾寰勮繘琛岄攣瀹氱鐢�
+ NavigateMapData navigateMapData = new NavigateMapData(Utils.getLev(startLocNo));
+ navigateMapData.writeNavigateNodeToRedisMap(allNode, true);////鎵�浣跨敤鐨勮矾寰勮繘琛岄攣瀹氱鐢�
return commands;
}
@@ -892,11 +975,48 @@
|| wrkMast.getWrkSts() == 31) {
ShuttleThread shuttleThread = null;
HashMap<String, Object> searchIdleShuttle = null;
+
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, 1);
+ LiftProtocol liftProtocol = liftThread.getLiftProtocol();
+
if (wrkMast.getWrkSts() == 21) {
//瀵绘壘鏈�杩戜笖绌洪棽鐨勫洓鍚戠┛姊溅
searchIdleShuttle = this.searchIdleShuttle(wrkMast);
shuttleThread = (ShuttleThread) searchIdleShuttle.get("result");
- }else if(wrkMast.getWrkSts() == 31 || wrkMast.getWrkSts() == 25) {
+ }else if(wrkMast.getWrkSts() == 25) {//鐘舵��25锛岄渶瑕佸悜灏忚溅涓嬪彂鍛戒护浠庢彁鍗囨満绉诲姩鍑哄幓锛岄渶瑕佸垽鏂彁鍗囨満鐘舵槸鍚︾┖闂层�佹彁鍗囨満鏄惁鍒拌揪鐩爣妤煎眰銆佺洰鏍囨ゼ灞傜珯鐐规槸鍚﹀瓨鍦ㄣ�佺洰鏍囨ゼ灞傜珯鐐规槸鍚︾粰鍑烘彁鍗囨満鍒颁綅淇″彿
+
+ //鍒ゆ柇鎻愬崌鏈烘槸鍚︾┖闂�
+ if (!liftProtocol.isIdle()) {
+ try {
+ Thread.sleep(1000);//浼戠湢1s
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ continue;//鎻愬崌鏈哄繖
+ }
+
+ //鍒ゆ柇鎻愬崌鏈烘ゼ灞傛槸鍚﹀埌浣嶏紝鍒ゆ柇绔欑偣鏄惁缁欏嚭鎻愬崌鏈哄埌浣嶄俊鍙�
+ String locNo = wrkMast.getSourceLocNo();
+ int lev = Utils.getLev(locNo);//鐩爣浜岀淮鐮佹墍鍦ㄦゼ灞�
+ int liftLev = liftProtocol.getLev().intValue();//鎻愬崌鏈烘墍鍦ㄦゼ灞�
+ if (liftLev != lev) {
+ continue;//鎻愬崌鏈轰笉鍦ㄧ洰鏍囨ゼ灞傝烦杩�
+ }
+
+ Integer staNo = Utils.levToOutInStaNo(lev >= 2 ? lev + 1 : lev);
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ //鑾峰彇鐩爣绔欎俊鎭�
+ StaProtocol staProtocol1 = devpThread.getStation().get(staNo);
+ if (staProtocol1 == null) {
+ continue;//绔欑偣淇℃伅涓嶅瓨鍦�
+ }
+ if (!staProtocol1.isLiftArrival()) {
+ continue;//绔欑偣鎻愬崌鏈哄埌浣嶄俊鍙穎alse
+ }
+
+ //缁х画瀹屾垚涔嬪墠灏忚溅鏈畬鎴愮殑浠诲姟
+ shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo());
+ } else if (wrkMast.getWrkSts() == 31) {
//缁х画瀹屾垚涔嬪墠灏忚溅鏈畬鎴愮殑浠诲姟
shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo());
}
@@ -918,80 +1038,128 @@
continue;
}
- wrkMast.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());//缁欏伐浣滄。鍒嗛厤鍥涘悜绌挎杞﹀彿
- //婧愬簱浣�(灏忚溅褰撳墠浣嶇疆)
- String currentLocNo = shuttleProtocol.getCurrentLocNo();
-
- //灏忚溅褰撳墠灞傞珮
- Integer currentLev = Integer.parseInt(currentLocNo.substring(currentLocNo.length() - 2, currentLocNo.length()));
- //鑾峰彇鎻愬崌鏈�
- LiftSlave liftSlave = slaveProperties.getLift().get(0);
- //鎻愬崌鏈哄簱浣嶅彿
- String liftLocNo = liftSlave.getLiftLocNo(currentLev);
-
- //鍒嗛厤浠诲姟鍙�
- shuttleProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());
- //鍒嗛厤婧愬簱浣�
- shuttleProtocol.setSourceLocNo(currentLocNo);
-
- ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
- //鍥涘悜绌挎杞﹀彿
- assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());
- //浠诲姟鍙�
- assignCommand.setTaskNo(wrkMast.getWrkNo().shortValue());
- //鍏ュ嚭搴撴ā寮�
- assignCommand.setTaskMode(ShuttleTaskModeType.PAK_OUT.id.shortValue());
- assignCommand.setSourceLocNo(currentLocNo);
-
if (wrkMast.getWrkSts() == 21) {
+
+ wrkMast.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());//缁欏伐浣滄。鍒嗛厤鍥涘悜绌挎杞﹀彿
+ //婧愬簱浣�(灏忚溅褰撳墠浣嶇疆)
+ String currentLocNo = shuttleProtocol.getCurrentLocNo();
+
+ //灏忚溅褰撳墠灞傞珮
+ Integer currentLev = Utils.getLev(currentLocNo);
+ //褰撳墠妤煎眰鎻愬崌鏈鸿緭閫佺珯鐐瑰簱浣嶅彿
+ String liftSiteLocNo = Utils.levToOutInStaLocNo(currentLev);
+
+ ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
+ //鍥涘悜绌挎杞﹀彿
+ assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());
+ //浠诲姟鍙�
+ assignCommand.setTaskNo(wrkMast.getWrkNo().shortValue());
+ //鍏ュ嚭搴撴ā寮�
+ assignCommand.setTaskMode(ShuttleTaskModeType.PAK_OUT.id.shortValue());
+ assignCommand.setSourceLocNo(currentLocNo);
+
//鍒ゆ柇灏忚溅鍜屽簱浣嶆槸鍚﹀湪鍚屼竴灞�
if (Boolean.parseBoolean(searchIdleShuttle.get("sameLay").toString())) {
//鍚屼竴灞�(灏嗗皬杞︾Щ鍔ㄥ埌璐х墿浣嶇疆)
-
- List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, wrkMast.getSourceLocNo(), liftLocNo);
+ List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, wrkMast.getSourceLocNo(), liftSiteLocNo, assignCommand, shuttleThread);
+ if (commands == null) {
+ //鏈壘鍒拌矾寰勶紝绛夊緟涓嬩竴娆�
+ continue;
+ }
//鍒嗛厤鐩爣搴撲綅
shuttleProtocol.setLocNo(wrkMast.getSourceLocNo());
+ //鍒嗛厤浠诲姟鍙�
+ shuttleProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());
+ //鍒嗛厤婧愬簱浣�
+ shuttleProtocol.setSourceLocNo(currentLocNo);
//鐩爣搴撲綅
assignCommand.setLocNo(wrkMast.getSourceLocNo());
assignCommand.setCommands(commands);
wrkMast.setWrkSts(26L);//灏忚溅鎼繍涓�
+
+ if (wrkMastMapper.updateById(wrkMast) > 0) {
+ //涓嬪彂浠诲姟
+ MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
+ }
}else {
//涓嶅悓灞傦紝灏嗙洰鏍囧簱浣嶅垎閰嶆垚鎻愬崌鏈哄簱浣嶅彿(灏嗗皬杞︾Щ鍔ㄥ埌鎻愬崌鏈轰綅缃�)
//灏忚溅鍒版彁鍗囨満鍙ｆ寚浠�
- List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, liftLocNo, ShuttleTaskModeType.PAK_IN.id);
- shuttleProtocol.setLocNo(liftLocNo);
+ List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, liftSiteLocNo, ShuttleTaskModeType.PAK_IN.id, assignCommand, shuttleThread);
+ if (commands == null) {
+ if (!currentLocNo.equals(liftSiteLocNo)) {//褰撳墠浣嶇疆涔熶笉鍦ㄦ彁鍗囨満鍙�
+ continue;//鏈壘鍒拌矾寰�
+ }
+ commands = new ArrayList<>();
+ }
+ shuttleProtocol.setLocNo(liftSiteLocNo);
+ //鍒嗛厤浠诲姟鍙�
+ shuttleProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());
+ //鍒嗛厤婧愬簱浣�
+ shuttleProtocol.setSourceLocNo(currentLocNo);
+
+ //鑾峰彇褰撳墠灏忚溅鎵�鍦ㄦゼ灞傜殑绔欑偣淇℃伅
+ BasDevp basDevp = basDevpService.queryByLocNo(liftSiteLocNo);
+ Short endStartCode = Short.parseShort(basDevp.getQrCodeValue());//绔欑偣浜岀淮鐮�
+
+ //澧炲姞绉诲姩杩涙彁鍗囨満鍛戒护
+ ShuttleCommand moveCommand = shuttleThread.getMoveCommand(endStartCode, liftProtocol.getBarcode(), 1400, ShuttleRunDirection.TOP.id, endStartCode, 1400, 500);
+ commands.add(moveCommand);
+
//鐩爣搴撲綅
- assignCommand.setLocNo(liftLocNo);
+ assignCommand.setLocNo(liftSiteLocNo);
assignCommand.setCommands(commands);
wrkMast.setWrkSts(22L);//灏忚溅杩佺Щ鐘舵��
+
+ if (wrkMastMapper.updateById(wrkMast) > 0) {
+ //涓嬪彂浠诲姟
+ MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
+ }
}
} else if (wrkMast.getWrkSts() == 25) {
- List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, wrkMast.getSourceLocNo(), liftLocNo);
+
+ wrkMast.setShuttleNo(shuttleProtocol.getShuttleNo().intValue());//缁欏伐浣滄。鍒嗛厤鍥涘悜绌挎杞﹀彿
+
+ //褰撳墠妤煎眰鎻愬崌鏈鸿緭閫佺珯鐐瑰簱浣嶅彿
+ String liftSiteLocNo = Utils.levToOutInStaLocNo(liftProtocol.getLev().intValue());
+
+ ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
+ //鍥涘悜绌挎杞﹀彿
+ assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());
+ //浠诲姟鍙�
+ assignCommand.setTaskNo(wrkMast.getWrkNo().shortValue());
+ //鍏ュ嚭搴撴ā寮�
+ assignCommand.setTaskMode(ShuttleTaskModeType.PAK_OUT.id.shortValue());
+ assignCommand.setSourceLocNo(liftSiteLocNo);
+
+ List<ShuttleCommand> commands = this.shuttleAssignCommand(liftSiteLocNo, wrkMast.getSourceLocNo(), liftSiteLocNo, assignCommand, shuttleThread);
+ if (commands == null) {
+ continue;//鏈壘鍒拌矾寰�
+ }
//姝ゆ椂杞﹀湪鎻愬崌鏈哄唴閮紝闇�瑕佸涓嬭揪涓�姝ユ寚浠よ杞︾Щ鍔ㄥ埌鎻愬崌鏈哄彛
- BasDevp basDevp = basDevpService.selectById(109);//鑾峰彇鎻愬崌鏈轰俊鎭�
- ShuttleCommand moveCommand = new ShuttleCommand();
- moveCommand.setCommandWord((short) 1);//灏忚溅绉诲姩鎸囦护瀛�
- moveCommand.setStartCodeNum(Short.parseShort(basDevp.getQrCodeValue()));//鎻愬崌鏈轰簩缁寸爜
- moveCommand.setDistCodeNum(commands.get(0).getStartCodeNum());
- moveCommand.setStartToDistDistance(1300);
- moveCommand.setMiddleToDistDistance(0);
- moveCommand.setRunDirection(commands.get(0).getRunDirection());
- moveCommand.setCommandEnd((short) 1);
+ short startCode = liftProtocol.getBarcode();//鎻愬崌鏈哄唴閮ㄤ簩缁寸爜
+ Short distCode = commands.get(0).getStartCodeNum();//鐩爣浜岀淮鐮�
+ //鑾峰彇绉诲姩鍛戒护
+ ShuttleCommand moveCommand = shuttleThread.getMoveCommand(startCode, distCode, 1400, commands.get(0).getRunDirection(), startCode, 1400, 500);
commands.add(0, moveCommand);//灏嗚鎸囦护娣诲姞鍒伴槦澶�
//鍒嗛厤鐩爣搴撲綅
shuttleProtocol.setLocNo(wrkMast.getSourceLocNo());
+ //鍒嗛厤浠诲姟鍙�
+ shuttleProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());
+ //鍒嗛厤婧愬簱浣�
+ shuttleProtocol.setSourceLocNo(liftSiteLocNo);
//鐩爣搴撲綅
assignCommand.setLocNo(wrkMast.getSourceLocNo());
assignCommand.setCommands(commands);
wrkMast.setWrkSts(26L);//灏忚溅鎼繍涓�
+
+ if (wrkMastMapper.updateById(wrkMast) > 0) {
+ //涓嬪彂浠诲姟
+ MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
+ }
}
- if (wrkMastMapper.updateById(wrkMast) > 0) {
- //涓嬪彂浠诲姟
- MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
- }
}
}
}
@@ -1002,10 +1170,13 @@
*/
public HashMap<String,Object> searchIdleShuttle(WrkMast wrkMast) {
HashMap<String, Object> map = new HashMap<>();
- String locNo = wrkMast.getWrkSts() < 10 ? wrkMast.getLocNo() : wrkMast.getSourceLocNo();//搴撲綅鍙�
+ String locNo = wrkMast.getIoType() < 101 ? wrkMast.getLocNo() : wrkMast.getSourceLocNo();//搴撲綅鍙�
LocMast locMast = locMastService.queryByLoc(locNo);//鎵惧埌搴撲綅璁板綍
- String lay = locNo.substring(locNo.length() - 2, locNo.length());//褰撳墠宸ヤ綔妗ｅ簱浣嶅眰楂�
+ int lev = Utils.getLev(locNo);//褰撳墠宸ヤ綔妗ｅ簱浣嶅眰楂�
ShuttleThread recentShuttle = null;//褰撳墠璺濈鏈�杩戠殑鍥涘悜绌挎杞︾嚎绋�
+
+ ArrayList<ShuttleThread> sameLev = new ArrayList<>();//鐩稿悓妤煎眰鐨勭┛姊溅
+ ArrayList<ShuttleThread> diffLev = new ArrayList<>();//涓嶅悓妤煎眰鐨勭┛姊溅
for (ShuttleSlave shuttle : slaveProperties.getShuttle()) {
//鑾峰彇鍥涘悜绌挎杞︾嚎绋�
@@ -1019,62 +1190,91 @@
}
String shuttleLocNo = shuttleProtocol.getCurrentLocNo();//浜岀淮鐮佸搴斿簱浣嶅彿
- String shuttleLocNoLay = shuttleLocNo.substring(shuttleLocNo.length() - 2, shuttleLocNo.length());//搴撲綅鍙峰搴斿眰楂�
- if (lay.equals(shuttleLocNoLay)) {
- //褰撳墠鍥涘悜绌挎杞﹀拰宸ヤ綔妗ｄ换鍔″湪鍚屼竴灞傦紝鍒欒皟閰嶈杞﹁締
- map.put("sameLay", true);//鍚屼竴灞�
- map.put("result", shuttleThread);
- return map;
- }
-
- //鏇存柊褰撳墠鏈�杩戠殑鍥涘悜绌挎杞�
- if (recentShuttle == null) {
- recentShuttle = shuttleThread;
+ int shuttleLocNoLey = Utils.getLev(shuttleLocNo);//搴撲綅鍙峰搴斿眰楂�
+ if (lev == shuttleLocNoLey) {
+ //宸ヤ綔妗ｆゼ灞傜浉鍚岀殑绌挎杞�
+ sameLev.add(shuttleThread);
}else {
- ShuttleProtocol recentShuttleProtocol = recentShuttle.getShuttleProtocol();//鐩墠鏈�杩戠┛姊溅
- String recentShuttleLocNo = recentShuttleProtocol.getCurrentLocNo();//浜岀淮鐮佸搴斿簱浣嶅彿
- String recentShuttleLocNoLay = recentShuttleLocNo.substring(recentShuttleLocNo.length() - 2, recentShuttleLocNo.length());//搴撲綅鍙峰搴斿眰楂�
-
- int recentShuttleLocNoLayInt = Integer.parseInt(recentShuttleLocNoLay);
- int layInt = Integer.parseInt(lay);
- int shuttleLocNoLayInt = Integer.parseInt(shuttleLocNoLay);
- int i = Math.abs(layInt - recentShuttleLocNoLayInt);//宸ヤ綔妗ｆゼ灞傚噺鏈�杩戠┛姊溅妤煎眰锛屽彇缁濆鍊�
- int j = Math.abs(layInt - shuttleLocNoLayInt);//宸ヤ綔妗ｆゼ灞傚噺褰撳墠绌挎杞︽ゼ灞傦紝鍙栫粷瀵瑰��
- if (i < j) {
- //鏇存柊鏈�杩戠┛姊溅
- recentShuttle = shuttleThread;
- } else if (i == j) {
- //妤煎眰鐩稿悓鎯呭喌
- //鎵捐窛绂诲嚭搴撶偣鏈�杩戠殑杞�
-
- if (!(recentShuttleProtocol.isIdle() && shuttleProtocol.isIdle())) {
- //鍙鏈変竴杈嗚溅涓嶆槸绌洪棽鍒欎笉杩涜璋冨害
- map.put("sameLay", false);//涓嶅悓灞�
- map.put("result", null);
- return map;
- }
-
- //鑾峰彇鎻愬崌鏈�
- LiftSlave liftSlave = slaveProperties.getLift().get(0);
- //鎻愬崌鏈哄簱浣嶅彿
- String recentLiftLocNo = liftSlave.getLiftLocNo(recentShuttleLocNoLayInt);
- String shuttleLiftLocNo = liftSlave.getLiftLocNo(shuttleLocNoLayInt);
-
- //褰撳墠鏈�杩戝洓鍚戠┛姊溅鍒版彁鍗囨満璺緞
- List<NavigateNode> recentShuttlePath = NavigateUtils.calc(recentShuttleLocNo, recentLiftLocNo, ShuttleTaskModeType.PAK_IN.id);
- //褰撳墠妤煎眰鍥涘悜绌挎杞﹀埌鎻愬崌鏈鸿矾寰�
- List<NavigateNode> shuttlePath = NavigateUtils.calc(shuttleLocNo, shuttleLiftLocNo, ShuttleTaskModeType.PAK_IN.id);
- //鍒ゆ柇鍝竴涓矾寰勬渶鐭�
- if (shuttlePath.size() < recentShuttlePath.size()) {
- //濡傛灉褰撳墠妤煎眰鐨勮溅璺緞鏇村皬锛屽垯鏇存柊鏈�杩戠┛姊溅
- recentShuttle = shuttleThread;
- }
- }
+ //宸ヤ綔妗ｄ笉鍚屾ゼ灞傜殑绌挎杞�
+ diffLev.add(shuttleThread);
}
+
}
- map.put("sameLay", false);//涓嶅悓灞�
- map.put("result", recentShuttle);
+ if (sameLev.size() > 0) {
+ //鍚屼竴妤煎眰鏈夌┖闂茬┛姊溅锛屽垯鍙湪宸ヤ綔妗ｆゼ灞傚鎵�
+ //瀵绘壘绂讳换鍔℃渶杩戠殑绌挎杞�
+ for (ShuttleThread shuttleThread : sameLev) {
+ if (recentShuttle == null) {//鏈�杩戠┛姊溅涓虹┖锛屽垯榛樿璧嬩簣涓烘渶杩戠┛姊溅
+ recentShuttle = shuttleThread;
+ }
+
+ //鍒ゆ柇鍏朵粬绌洪棽绌挎杞︽槸鍚︾浠诲姟鏈�杩�
+ String distLocNo = null;//鐩爣鍦扮偣锛屽叆搴�=銆嬫彁鍗囨満鍙ｏ紝鍑哄簱=銆嬭揣鐗╁簱浣嶅彿
+ if (wrkMast.getIoType() < 101) {
+ //鍏ュ簱
+ distLocNo = Utils.levToOutInStaLocNo(lev);
+ }else {
+ //鍑哄簱
+ distLocNo = locNo;
+ }
+
+ //褰撳墠绌挎杞﹀簱浣嶅彿
+ String currentLocNo = shuttleThread.getShuttleProtocol().getCurrentLocNo();
+ //鐩墠鏈�杩戠┛姊溅搴撲綅鍙�
+ String recentLocNo = recentShuttle.getShuttleProtocol().getCurrentLocNo();
+
+ //褰撳墠鏈�杩戝洓鍚戠┛姊溅鍒扮洰鏍囧湴鐐硅窛绂�
+ List<NavigateNode> recentShuttlePath = NavigateUtils.calc(recentLocNo, distLocNo, NavigationMapType.NORMAL.id);//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝ｅ父閫氶亾鍦板浘
+ //褰撳墠绌挎杞︾嚎绋嬪埌鐩爣鍦扮偣璺濈
+ List<NavigateNode> currentShuttlePath = NavigateUtils.calc(currentLocNo, distLocNo, NavigationMapType.NORMAL.id);//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝ｅ父閫氶亾鍦板浘
+ if (recentShuttlePath == null || currentShuttlePath == null) {
+ continue;
+ }
+ Integer recentAllDistance = NavigateUtils.getOriginPathAllDistance(recentShuttlePath);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
+ Integer currentAllDistance = NavigateUtils.getOriginPathAllDistance(currentShuttlePath);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
+ if (currentAllDistance < recentAllDistance) {
+ //濡傛灉褰撳墠妤煎眰鐨勮溅璺緞鏇村皬锛屽垯鏇存柊鏈�杩戠┛姊溅
+ recentShuttle = shuttleThread;
+ }
+ }
+
+ map.put("sameLay", true);//鍚屽眰
+ map.put("result", recentShuttle);
+ }else {
+ //鍚屼竴妤煎眰锛屾病鏈夌┖闂茬┛姊溅锛屽彧鑳戒粠鍏朵粬妤煎眰璋冨害
+ //瀵绘壘绂讳换鍔℃渶杩戠殑绌挎杞�
+ for (ShuttleThread shuttleThread : diffLev) {
+ if (recentShuttle == null) {//鏈�杩戠┛姊溅涓虹┖锛屽垯榛樿璧嬩簣涓烘渶杩戠┛姊溅
+ recentShuttle = shuttleThread;
+ }
+
+ //褰撳墠绌挎杞﹀簱浣嶅彿
+ String currentLocNo = shuttleThread.getShuttleProtocol().getCurrentLocNo();
+ int currentLev = Utils.getLev(currentLocNo);
+ //鐩墠鏈�杩戠┛姊溅搴撲綅鍙�
+ String recentLocNo = recentShuttle.getShuttleProtocol().getCurrentLocNo();
+ int recentLev = Utils.getLev(recentLocNo);
+
+ //褰撳墠鏈�杩戝洓鍚戠┛姊溅鍒板綋鍓嶈溅瀛愭墍鍦ㄦゼ灞傜殑鎻愬崌鏈哄彛璺濈
+ List<NavigateNode> recentShuttlePath = NavigateUtils.calc(recentLocNo, Utils.levToOutInStaLocNo(recentLev), NavigationMapType.NORMAL.id);//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝ｅ父閫氶亾鍦板浘
+ //褰撳墠绌挎杞︾嚎绋嬪埌褰撳墠杞﹀瓙鎵�鍦ㄦゼ灞傜殑鎻愬崌鏈哄彛璺濈
+ List<NavigateNode> currentShuttlePath = NavigateUtils.calc(currentLocNo, Utils.levToOutInStaLocNo(currentLev), NavigationMapType.NORMAL.id);//鎼滅储绌洪棽绌挎杞︼紝浣跨敤姝ｅ父閫氶亾鍦板浘
+ if (recentShuttlePath == null || currentShuttlePath == null) {
+ continue;
+ }
+
+ Integer recentAllDistance = NavigateUtils.getOriginPathAllDistance(recentShuttlePath);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
+ Integer currentAllDistance = NavigateUtils.getOriginPathAllDistance(currentShuttlePath);//璁＄畻褰撳墠璺緞琛岃蛋鎬昏窛绂�
+ if (currentAllDistance < recentAllDistance) {
+ //濡傛灉褰撳墠妤煎眰鐨勮溅璺緞鏇村皬锛屽垯鏇存柊鏈�杩戠┛姊溅
+ recentShuttle = shuttleThread;
+ }
+ }
+
+ map.put("sameLay", false);//涓嶅悓灞�
+ map.put("result", recentShuttle);
+ }
return map;
}
@@ -1090,9 +1290,11 @@
continue;
}
- //鍥涘悜绌挎杞︾姸鎬佷负绛夊緟纭
+ //鍥涘悜绌挎杞︾姸鎬佷负绛夊緟纭銆佸皬杞﹀浜庣┖闂茬姸鎬�
if (shuttleProtocol.getProtocolStatus() == ShuttleProtocolStatusType.WAITING.id //浠诲姟瀹屾垚绛夊緟纭
- && shuttleProtocol.getTaskNo() != 0) {
+ && shuttleProtocol.getTaskNo() != 0
+ && shuttleProtocol.getBusyStatus() == 0
+ ) {
//灏嗕换鍔℃。鏍囪涓哄畬鎴�
WrkMast wrkMast = wrkMastMapper.selectByWorkNo(shuttleProtocol.getTaskNo().intValue());
if (wrkMast != null) {
@@ -1197,95 +1399,189 @@
}
//鎼滅储鏄惁鏈夊緟澶勭悊鐨勪换鍔�
- WrkMast wrkMast = wrkMastMapper.selectLiftStep62327();
+ WrkMast wrkMast = wrkMastMapper.selectLiftStep262327();
if (wrkMast == null) {
- continue;
- }
-
- //缁欐彁鍗囨満鍒嗛厤浠诲姟
- liftProtocol.setLiftLock(true);//閿佸畾鎻愬崌鏈�
- liftProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());//璁剧疆浠诲姟鍙�
- liftProtocol.setShuttleNo(wrkMast.getShuttleNo().shortValue());//璁剧疆鍥涘悜绌挎杞﹀彿
- liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
-
- //鎵惧埌鍥涘悜绌挎杞︾殑绾跨▼
- ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, liftProtocol.getShuttleNo().intValue());
- if (shuttleThread == null) {
- continue;
- }
- ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
- if (shuttleProtocol == null) {
continue;
}
//鍛戒护list
ArrayList<LiftCommand> commands = new ArrayList<>();
- //褰撳墠绌挎杞﹀簱浣嶅彿
- String currentLocNo = shuttleProtocol.getCurrentLocNo();
- //褰撳墠绌挎杞︽ゼ灞�
- int currentLocNoLey = Integer.parseInt(currentLocNo.substring(currentLocNo.length() - 2, currentLocNo.length()));
-
- //宸ヤ綔妗ｇ洰鏍囧簱浣嶅彿
- String wrkMastLocNo = wrkMast.getIoType() == 101 ? wrkMast.getSourceLocNo() : wrkMast.getLocNo();
- //宸ヤ綔妗ｇ洰鏍囧簱浣嶆ゼ灞�
- int wrkMastLocNoLey = Integer.parseInt(wrkMastLocNo.substring(wrkMastLocNo.length() - 2, wrkMastLocNo.length()));
-
- //鎻愬崌鏈哄綋鍓嶆ゼ灞�
- int liftLev = liftProtocol.getLev().intValue();
- if (liftLev != currentLocNoLey) {
- //涓嶅悓妤煎眰
- LiftCommand command1 = new LiftCommand();
- command1.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command1.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command1.setRun((short) 1);//鍗囬檷
- command1.setDistPosition((short) currentLocNoLey);//鐩爣妤煎眰(绌挎杞︽墍鍦ㄦゼ灞�)
- command1.setLiftLock(true);//閿佸畾鎻愬崌鏈�
-
- commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
+ DevpThread devpThread = null;
+ Integer devpId = null;
+ for (DevpSlave devp : slaveProperties.getDevp()){
+ // 鑾峰彇鍏ュ簱绔欎俊鎭�
+ devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ devpId = devp.getId();
}
- //杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲姩杩涙潵
- LiftCommand command2 = new LiftCommand();
- command2.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command2.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command2.setRun((short) 6);//杈撻�佺嚎杩愪綔
- command2.setLiftLock(true);//閿佸畾鎻愬崌鏈�
+ if (wrkMast.getWrkSts() == 2) {//2.璁惧涓婅蛋
+ //宸ヤ綔妗ｇ洰鏍囧簱浣嶅彿
+ String wrkMastLocNo = wrkMast.getLocNo();
+ //宸ヤ綔妗ｇ洰鏍囧簱浣嶆ゼ灞�
+ int wrkMastLocNoLey = Utils.getLev(wrkMastLocNo);
- commands.add(command2);//灏嗗懡浠ゆ坊鍔犺繘list
+ Integer levTmp = wrkMastLocNoLey;
+ if (wrkMastLocNoLey >= 2) {
+ levTmp += 1;
+ }
+ Integer distStaNo = Utils.levToOutInStaNo(levTmp);
- if (liftLev != currentLocNoLey) {
- //鎻愬崌鏈哄墠寰�鐩爣妤煎眰
- LiftCommand command3 = new LiftCommand();
- command3.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command3.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command3.setRun((short) 1);//鍗囬檷
- command3.setDistPosition((short) wrkMastLocNoLey);//宸ヤ綔妗ｇ洰鏍囨ゼ灞�
- command3.setLiftLock(true);//閿佸畾鎻愬崌鏈�
+ if (liftProtocol.getPositionArrivalFeedback().intValue() != LiftLevType.TWO.realLev.intValue()) {
+ //鎻愬崌鏈轰笉鍦ㄨ緭閫佺嚎妤煎眰锛岃幏鍙栧埌杈撻�佺嚎灞傜殑鎻愬崌鏈哄懡浠�
+ LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), LiftLevType.TWO.lev);
+ commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
+ }
+ //杈撻�佺嚎灏嗚揣鐗╄繍杩涙潵(鏃犺揣姝ｈ浆)
+ LiftCommand command2 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 3);
+ command2.setOperaStaNo((short) 102);//鎿嶄綔102绔�
+ command2.setRotationDire(1);//缁欒緭閫佺嚎涓嬪彂閾炬潯杞姩淇″彿锛屾杞�
+ command2.setDevpId(devpId);
+ command2.setStaNo(distStaNo.shortValue());//璁剧疆鐩爣绔�
+ commands.add(command2);//灏嗗懡浠ゆ坊鍔犺繘list
+
+ //鎻愬崌鏈哄墠寰�鐩爣妤煎眰(宸ヤ綔妗ｇ洰鏍囨ゼ灞�)
+ LiftCommand command3 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), levTmp);
commands.add(command3);//灏嗗懡浠ゆ坊鍔犺繘list
- }
- //鎻愬崌鏈哄埌杈炬寚瀹氭ゼ灞傦紝杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲嚭鍘�
- //杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲姩鍑哄幓
- LiftCommand command4 = new LiftCommand();
- command4.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command4.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command4.setRun((short) 3);//杈撻�佺嚎杩愪綔
- command4.setLiftLock(true);//閿佸畾鎻愬崌鏈�
+ //鎻愬崌鏈哄埌杈炬寚瀹氭ゼ灞傦紝杈撻�佺嚎灏嗚揣鐗╃Щ鍑哄幓(姝ｈ浆)
+ //杈撻�佺嚎灏嗚揣鐗╃Щ鍑哄幓
+ LiftCommand command4 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 1);
+ command4.setOperaStaNo(distStaNo.shortValue());//鎿嶄綔鐩爣妤煎眰绔欑偣
+ command4.setRotationDire(1);//缁欒緭閫佺嚎涓嬪彂閾炬潯杞姩淇″彿锛屾杞�
+ command4.setDevpId(devpId);
+ command4.setStaNo(distStaNo.shortValue());//璁剧疆鐩爣绔�
+ commands.add(command4);//灏嗗懡浠ゆ坊鍔犺繘list
- commands.add(command4);//灏嗗懡浠ゆ坊鍔犺繘list
+ //缁欐彁鍗囨満鍒嗛厤浠诲姟
+ liftProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());//璁剧疆浠诲姟鍙�
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
- switch (wrkMast.getWrkSts().intValue()) {
- case 6://6.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴�
- wrkMast.setWrkSts(7L);//7.鎻愬崌鏈鸿縼绉诲皬杞︿腑
- break;
- case 23://23.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴�
- wrkMast.setWrkSts(24L);//24.鎻愬崌鏈鸿縼绉诲皬杞︿腑
- break;
- case 27://27.灏忚溅鍑哄簱鎼繍瀹屾垚
- wrkMast.setWrkSts(28L);//28.鎻愬崌鏈烘惉杩愪腑
- break;
+ wrkMast.setWrkSts(3L);//3.鎻愬崌鏈烘惉杩愪腑
+ } else if (wrkMast.getWrkSts() == 6) {//6.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴� => 7.鎻愬崌鏈鸿縼绉诲皬杞︿腑
+ liftProtocol.setShuttleNo(wrkMast.getShuttleNo().shortValue());//璁剧疆鍥涘悜绌挎杞﹀彿
+
+ //鍒ゆ柇灏忚溅鏄惁鍦ㄦ彁鍗囨満鍐咃紝涓斿浜庣┖闂茬姸鎬�
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo());
+ if (shuttleThread == null) {
+ continue;
+ }
+ ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+ if (shuttleProtocol == null) {
+ continue;
+ }
+ if (!shuttleProtocol.isIdle()) {
+ continue;//灏忚溅鐘舵�佸繖
+ }
+ if (shuttleProtocol.getCurrentCode().intValue() != liftProtocol.getBarcode().intValue()) {
+ continue;//灏忚溅褰撳墠浜岀淮鐮佸拰鎻愬崌鏈哄唴閮ㄤ簩缁寸爜涓嶄竴鑷达紝涓嶅厑璁告墽琛�
+ }
+
+ //宸ヤ綔妗ｇ洰鏍囧簱浣嶅彿
+ String wrkMastLocNo = wrkMast.getLocNo();
+ //宸ヤ綔妗ｇ洰鏍囧簱浣嶆ゼ灞�
+ int wrkMastLocNoLey = Utils.getLev(wrkMastLocNo);
+ if (wrkMastLocNoLey >= 2) {
+ wrkMastLocNoLey++;
+ }
+
+ //鎻愬崌鏈哄墠寰�鐩爣妤煎眰(宸ヤ綔妗ｇ洰鏍囨ゼ灞�)
+ LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), wrkMastLocNoLey);
+ commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
+
+ //缁欐彁鍗囨満鍒嗛厤浠诲姟
+ liftProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());//璁剧疆浠诲姟鍙�
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
+
+ wrkMast.setWrkSts(7L);//6.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴� => 7.鎻愬崌鏈鸿縼绉诲皬杞︿腑
+ } else if(wrkMast.getWrkSts() == 23) {//23.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴� => 24.鎻愬崌鏈鸿縼绉诲皬杞︿腑
+ liftProtocol.setShuttleNo(wrkMast.getShuttleNo().shortValue());//璁剧疆鍥涘悜绌挎杞﹀彿
+
+ //鍒ゆ柇灏忚溅鏄惁鍦ㄦ彁鍗囨満鍐咃紝涓斿浜庣┖闂茬姸鎬�
+ ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo());
+ if (shuttleThread == null) {
+ continue;
+ }
+ ShuttleProtocol shuttleProtocol = shuttleThread.getShuttleProtocol();
+ if (shuttleProtocol == null) {
+ continue;
+ }
+
+ if (!shuttleProtocol.isIdle()) {
+ continue;//灏忚溅鐘舵�佸繖
+ }
+ if (shuttleProtocol.getCurrentCode().intValue() != liftProtocol.getBarcode().intValue()) {
+ continue;//灏忚溅褰撳墠浜岀淮鐮佸拰鎻愬崌鏈哄唴閮ㄤ簩缁寸爜涓嶄竴鑷达紝涓嶅厑璁告墽琛�
+ }
+
+ //宸ヤ綔妗ｇ洰鏍囧簱浣嶅彿
+ String wrkMastLocNo = wrkMast.getSourceLocNo();
+ //宸ヤ綔妗ｇ洰鏍囧簱浣嶆ゼ灞�
+ int wrkMastLocNoLey = Utils.getLev(wrkMastLocNo);
+ if (wrkMastLocNoLey >= 2) {
+ wrkMastLocNoLey++;
+ }
+
+ //鎻愬崌鏈哄墠寰�鐩爣妤煎眰(宸ヤ綔妗ｇ洰鏍囨ゼ灞�)
+ LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), wrkMastLocNoLey);
+ commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
+
+ //缁欐彁鍗囨満鍒嗛厤浠诲姟
+ liftProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());//璁剧疆浠诲姟鍙�
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
+
+ wrkMast.setWrkSts(24L);//23.杩佺Щ灏忚溅鑷虫彁鍗囨満鍙ｅ畬鎴� => 24.鎻愬崌鏈鸿縼绉诲皬杞︿腑
+ } else if (wrkMast.getWrkSts() == 27) {//27.灏忚溅鍑哄簱鎼繍瀹屾垚
+ //宸ヤ綔妗ｆ簮搴撲綅鍙�
+ String wrkMastLocNo = wrkMast.getSourceLocNo();
+ //宸ヤ綔妗ｆ簮搴撲綅妤煎眰
+ int wrkMastLocNoLey = Utils.getLev(wrkMastLocNo);
+
+ //鎻愬崌鏈哄綋鍓嶆ゼ灞�
+ int liftLev = liftProtocol.getLev().intValue();
+
+ //鍒ゆ柇鎻愬崌鏈烘槸鍚﹀埌浣�
+ StaProtocol staProtocol = devpThread.getStation().get(Utils.levToOutInStaNo(wrkMastLocNoLey >= 2 ? wrkMastLocNoLey + 1 : wrkMastLocNoLey));//璧峰绔欑偣
+ if (liftLev != wrkMastLocNoLey && !staProtocol.isLiftArrival()) {
+ //鎻愬崌鏈轰笉鍦ㄥ伐浣滄。婧愬簱浣嶆ゼ灞傦紝璋冨害鎻愬崌鏈�
+ LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), wrkMastLocNoLey);
+ commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
+ }
+
+ //杈撻�佺嚎灏嗚揣鐗╄繍杩涙潵(鏃犺揣鍙嶈浆)
+ LiftCommand command2 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 4);
+ command2.setOperaStaNo(staProtocol.getSiteId().shortValue());//杈撻�佺嚎鎿嶄綔绔欑偣鍙�
+ command2.setRotationDire(2);//缁欒緭閫佺嚎涓嬪彂閾炬潯杞姩淇″彿锛屽弽杞�
+ command2.setDevpId(devpId);//杈撻�佺嚎iD
+ command2.setStaNo((short) 104);//鍐欏叆鍑哄簱鐩爣绔�104
+ commands.add(command2);//灏嗗懡浠ゆ坊鍔犺繘list
+
+ //鎻愬崌鏈哄墠寰�鍑哄簱鍙ｏ紝杈撻�佺嚎妤煎眰
+ LiftCommand command3 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), LiftLevType.TWO.lev);
+ commands.add(command3);//灏嗗懡浠ゆ坊鍔犺繘list
+
+ //鎻愬崌鏈哄埌杈炬寚瀹氭ゼ灞傦紝杈撻�佺嚎灏嗚揣鐗╃Щ鍑哄幓(鍙嶈浆)
+ //杈撻�佺嚎灏嗚揣鐗╃Щ鍑哄幓
+ LiftCommand command4 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 2);
+ command4.setOperaStaNo((short) 102);//鎿嶄綔102绔�
+ command4.setRotationDire(2);//缁欒緭閫佺嚎涓嬪彂閾炬潯杞姩淇″彿锛屽弽杞�
+ command4.setDevpId(devpId);
+ commands.add(command4);//灏嗗懡浠ゆ坊鍔犺繘list
+
+ //鎻愬崌鏈洪摼鏉℃墽琛屽畬姣曞悗锛岀粰102绔欏啓鍏ヨ祫鏂�
+ LiftCommand command5 = liftThread.getResetCommand();
+ command5.setDevpId(devpId);//杈撻�佺嚎iD
+ command5.setOperaStaNo((short) 102);//鎿嶄綔102绔�
+ command5.setStaNo((short) 104);//鍐欏叆鍑哄簱鐩爣绔�104
+ command5.setRotationDire(0);//閾炬潯杞姩鍋滄
+ commands.add(command5);
+
+ //缁欐彁鍗囨満鍒嗛厤浠诲姟
+ liftProtocol.setTaskNo(wrkMast.getWrkNo().shortValue());//璁剧疆浠诲姟鍙�
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
+
+ wrkMast.setWrkSts(28L);//28.鎻愬崌鏈烘惉杩愪腑
}
//鎵�闇�鍛戒护缁勫悎瀹屾瘯锛屾洿鏂版暟鎹簱锛屾彁浜ゅ埌绾跨▼鍘诲伐浣�
@@ -1312,12 +1608,35 @@
continue;
}
- //鎻愬崌鏈轰负绛夊緟纭
- if (liftProtocol.getProtocolStatus() == LiftProtocolStatusType.WAITING.id && liftProtocol.getTaskNo() != 0) {
+ //鎻愬崌鏈轰负绛夊緟纭涓旂┖闂�
+ if (liftProtocol.getProtocolStatus() == LiftProtocolStatusType.WAITING.id
+ && liftProtocol.getTaskNo() != 0
+ && !liftProtocol.getRunning()
+ ) {
+
+ DevpThread devpThread = null;
+ Integer devpId = null;
+ for (DevpSlave devp : slaveProperties.getDevp()){
+ // 鑾峰彇鍏ュ簱绔欎俊鎭�
+ devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
+ devpId = devp.getId();
+ }
+
//灏嗕换鍔℃。鏍囪涓哄畬鎴�
- WrkMast wrkMast = wrkMastMapper.selectByWorkNo72428(liftProtocol.getTaskNo().intValue());
+ WrkMast wrkMast = wrkMastMapper.selectByWorkNo372428(liftProtocol.getTaskNo().intValue());
if (wrkMast != null) {
switch (wrkMast.getWrkSts().intValue()) {
+ case 3://3.鎻愬崌鏈烘惉杩愪腑 ==> 4.鎻愬崌鏈烘惉杩愬畬鎴�
+ //缁欑洰鏍囩珯璁剧疆宸ヤ綔鍙�
+ StaProtocol staProtocol = devpThread.getStation().get(wrkMast.getStaNo());//鐩爣绔�
+ staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
+ staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
+ boolean result = MessageQueue.offer(SlaveType.Devp, devpId, new Task(2, staProtocol));
+ if (!result) {
+ throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
+ }
+ wrkMast.setWrkSts(4L);
+ break;
case 7://7.鎻愬崌鏈鸿縼绉诲皬杞︿腑 ==> 8.鎻愬崌鏈鸿縼绉诲皬杞﹀畬鎴�
wrkMast.setWrkSts(8L);
break;
@@ -1326,6 +1645,7 @@
break;
case 28://28.鎻愬崌鏈烘惉杩愪腑 ==> 29.鎻愬崌鏈烘惉杩愬畬鎴�
wrkMast.setWrkSts(29L);
+ wrkMast.setWrkSts(34L);//34.鍑哄簱瀹屾垚锛屾殏鏃跺厛鐩存帴瀹屾垚鍑哄簱宸ヤ綔妗ｏ紝鍚庣画闇�瑕佹牴鎹緭閫佺嚎缁欏嚭鐨勭姸鎬佹潵纭畾34.鍑哄簱瀹屾垚鐘舵��
break;
default:
}
@@ -1339,8 +1659,6 @@
liftProtocol.setPakMk(true);
//浠诲姟鎸囦护娓呴浂
liftProtocol.setAssignCommand(null);
- //鎻愬崌鏈鸿В閿�
- liftProtocol.setLiftLock(false);
News.info("鎻愬崌鏈哄凡纭涓斾换鍔″畬鎴愮姸鎬�,澶嶄綅銆傛彁鍗囨満鍙�={}", liftProtocol.getLiftNo());
} else {
News.error("鎻愬崌鏈哄凡纭涓斾换鍔″畬鎴愮姸鎬�,澶嶄綅澶辫触锛屼絾鏈壘鍒板伐浣滄。銆傛彁鍗囨満鍙�={}锛屽伐浣滃彿={}", liftProtocol.getLiftNo(), liftProtocol.getTaskNo());
@@ -1366,13 +1684,25 @@
liftProtocol.setPakMk(true);
//浠诲姟鎸囦护娓呴浂
liftProtocol.setAssignCommand(null);
- //鎻愬崌鏈鸿В閿�
- liftProtocol.setLiftLock(false);
News.info("鎻愬崌鏈哄凡纭涓斾换鍔″畬鎴愮姸鎬�,澶嶄綅銆傛彁鍗囨満鍙�={}", liftProtocol.getLiftNo());
} else {
News.error("鎻愬崌鏈哄凡纭涓斾换鍔″畬鎴愮姸鎬�,澶嶄綅澶辫触锛屼絾鏈壘鍒板伐浣滄。銆傛彁鍗囨満鍙�={}锛屽伐浣滃彿={}", liftProtocol.getLiftNo(), liftProtocol.getTaskNo());
}
}
+
+ //涓嶆槸鍏ュ嚭搴撹皟搴︿换鍔°�佸伐浣滄。浠诲姟锛岃繘琛屾彁鍗囨満鐨勫浣�
+ if (liftProtocol.getAssignCommand() != null) {
+ //璁剧疆鎻愬崌鏈轰负绌洪棽鐘舵��
+ liftProtocol.setProtocolStatus(LiftProtocolStatusType.IDLE);
+ //浠诲姟鍙锋竻闆�
+ liftProtocol.setTaskNo((short) 0);
+ //鏍囪澶嶄綅
+ liftProtocol.setPakMk(true);
+ //浠诲姟鎸囦护娓呴浂
+ liftProtocol.setAssignCommand(null);
+ News.info("鎻愬崌鏈哄凡纭涓斾换鍔″畬鎴愮姸鎬�,澶嶄綅銆傛彁鍗囨満鍙�={}", liftProtocol.getLiftNo());
+ }
+
}
}
}
@@ -2067,19 +2397,10 @@
}
ShuttleChargeType shuttleCharge = null;
- String locNo;
for (ShuttleChargeType chargeType : ShuttleChargeType.values()) {
- switch (chargeType.id) {
- case 1:
- if (devpThread.charge0 == false) {
- ShuttleChargeType first = ShuttleChargeType.FIRST;
- locNo = first.locNo;
- if (wrkChargeService.selectWorkingOfCharge(first.id) == null) {
- shuttleCharge = first;
- }
- }
- break;
- default:
+ if (wrkChargeService.selectWorkingOfCharge(chargeType.id) == null) {
+ shuttleCharge = chargeType;
+ break;
}
}
@@ -2119,7 +2440,6 @@
return;
}
-
ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkCharge.getShuttleNo());
if (shuttleThread == null) {
return;
@@ -2132,36 +2452,43 @@
//褰撳墠绌挎杞﹀簱浣嶅彿
String currentLocNo = shuttleProtocol.getCurrentLocNo();
//灏忚溅褰撳墠灞傞珮
- Integer currentLev = Integer.parseInt(currentLocNo.substring(currentLocNo.length() - 2, currentLocNo.length()));
+ Integer currentLev = currentLocNo == null ? 0 : Utils.getLev(currentLocNo);
//鑾峰彇鎻愬崌鏈�
- LiftSlave liftSlave = slaveProperties.getLift().get(0);
- //鎻愬崌鏈哄簱浣嶅彿
- String liftLocNo = liftSlave.getLiftLocNo(currentLev);
+ LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, 1);
+ if (liftThread == null) {
+ return;
+ }
+ LiftProtocol liftProtocol = liftThread.getLiftProtocol();
+ if (liftProtocol == null) {
+ return;
+ }
//鍏呯數搴撲綅鍙�
String chargeLocNo = wrkCharge.getLocNo();
//鍏呯數搴撲綅灞傞珮
- Integer chargeLocNoLev = Integer.parseInt(chargeLocNo.substring(chargeLocNo.length() - 2, chargeLocNo.length()));
+ Integer chargeLocNoLev = Utils.getLev(chargeLocNo);
- if (wrkCharge.getWrkSts() == 51 || wrkCharge.getWrkSts() == 55) {
+ if (wrkCharge.getWrkSts() == 51) {
if (currentLev == chargeLocNoLev) {
//鍚屼竴灞傛棤闇�缁忚繃鎻愬崌鏈�
//鐩存帴璁＄畻杞﹀埌鍏呯數搴撲綅
+
+ ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
+
//鑾峰彇灏忚溅鍒板厖鐢靛簱浣嶈矾寰勬寚浠�
- List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, chargeLocNo, ShuttleTaskModeType.PAK_IN.id);
+ List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, chargeLocNo, NavigationMapType.NONE.id, assignCommand, shuttleThread);
+ if (commands == null) {
+ return;//鏈壘鍒拌矾寰�
+ }
//杩涜鍏呯數涓�
shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.CHARGING);
- ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
+
assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());
assignCommand.setTaskMode((short) 9);//鍏呯數
assignCommand.setTaskNo(wrkCharge.getWrkNo().shortValue());
assignCommand.setCharge(true);//鍏呯數浠诲姟
//鍒涘缓鍏呯數鎸囦护
- ShuttleCommand command = new ShuttleCommand();
- command.setCommandWord((short) 5);//鍏呯數
- command.setShuttleNo(shuttleProtocol.getShuttleNo());
- command.setChargeSwitch((short) 1);//寮�濮嬪厖鐢�
- command.setCommandEnd((short) 1);
+ ShuttleCommand command = shuttleThread.getChargeSwitchCommand((short) 1);//寮�濮嬪厖鐢�
commands.add(command);
//鎸囦护闆嗗垎閰�
@@ -2173,20 +2500,38 @@
MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
}
}else {
- //涓嶅悓灞傦紝灏嗙洰鏍囧簱浣嶅垎閰嶆垚鎻愬崌鏈哄簱浣嶅彿
-
- //灏忚溅绉诲姩鍒版彁鍗囨満鍙ｏ紝璁＄畻璺緞
- List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, liftLocNo, ShuttleTaskModeType.PAK_IN.id);
- //鍒嗛厤鐩爣搴撲綅
- shuttleProtocol.setLocNo(liftLocNo);
+ //涓嶅悓灞傦紝璋冨害灏忚溅鍒板厖鐢垫々鐩爣灞�
ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
+
+ //鑾峰彇灏忚溅褰撳墠妤煎眰鐨勭珯鐐瑰彿
+ String liftSiteLocNo = Utils.levToOutInStaLocNo(currentLev);
+
+ //灏忚溅绉诲姩鍒版彁鍗囨満鍙ｇ珯鐐癸紝璁＄畻璺緞
+ List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, liftSiteLocNo, NavigationMapType.NONE.id, assignCommand, shuttleThread);
+ if (commands == null) {
+ return;//鏈壘鍒拌矾寰�
+ }
+
+ //鑾峰彇褰撳墠灏忚溅鎵�鍦ㄦゼ灞傜殑绔欑偣淇℃伅
+ BasDevp basDevp = basDevpService.queryByLocNo(liftSiteLocNo);
+ if (basDevp == null) {
+ return;//鎵句笉鍒扮珯鐐逛俊鎭�
+ }
+ Short basDevpQrCode = Short.parseShort(basDevp.getQrCodeValue());//绔欑偣浜岀淮鐮�
+
+ //澧炲姞绉诲姩杩涙彁鍗囨満鍛戒护
+ ShuttleCommand moveCommand = shuttleThread.getMoveCommand(basDevpQrCode, liftProtocol.getBarcode(), 1400, ShuttleRunDirection.TOP.id, basDevpQrCode, 1400, 500);
+ commands.add(moveCommand);
+
+ //鍒嗛厤鐩爣搴撲綅
+ shuttleProtocol.setLocNo(chargeLocNo);
assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());
assignCommand.setTaskMode((short) 9);//鍏呯數
assignCommand.setTaskNo(wrkCharge.getWrkNo().shortValue());
assignCommand.setCharge(true);//鍏呯數浠诲姟
//鐩爣搴撲綅
- assignCommand.setLocNo(liftLocNo);
+ assignCommand.setLocNo(chargeLocNo);
//婧愬簱浣�
assignCommand.setSourceLocNo(currentLocNo);
assignCommand.setCommands(commands);
@@ -2198,23 +2543,20 @@
}
}else if(wrkCharge.getWrkSts() == 53){
- //灏忚溅宸茬粡杈惧埌鎻愬崌鏈哄彛
- LiftThread liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, liftSlave.getId());
- if (liftThread == null) {
- return;
- }
- LiftProtocol liftProtocol = liftThread.getLiftProtocol();
- if (liftProtocol == null) {
- return;
- }
+ //灏忚溅宸茬粡杈惧埌鎻愬崌鏈哄唴
//鍒ゆ柇鎻愬崌鏈烘槸鍚﹀浜庣┖闂茬姸鎬�
if (!liftProtocol.isIdle()) {
return;
}
+ //鍒ゆ柇灏忚溅鏄惁鍦ㄦ彁鍗囨満鍐�
+ if (shuttleProtocol.getCurrentCode().intValue() != liftProtocol.getBarcode().intValue()) {
+ //灏忚溅涓嶅湪鎻愬崌鏈哄唴
+ return;
+ }
+
//缁欐彁鍗囨満鍒嗛厤浠诲姟
- liftProtocol.setLiftLock(true);//閿佸畾鎻愬崌鏈�
liftProtocol.setTaskNo(wrkCharge.getWrkNo().shortValue());//璁剧疆浠诲姟鍙�
liftProtocol.setShuttleNo(wrkCharge.getShuttleNo().shortValue());//璁剧疆鍥涘悜绌挎杞﹀彿
liftProtocol.setProtocolStatus(LiftProtocolStatusType.WORKING);//璁剧疆鎻愬崌鏈虹姸鎬佷负宸ヤ綔涓�
@@ -2222,47 +2564,10 @@
//鍛戒护list
ArrayList<LiftCommand> commands = new ArrayList<>();
- //鎻愬崌鏈哄綋鍓嶆ゼ灞�
- int liftLev = liftProtocol.getLev().intValue();
- if (liftLev != currentLev) {
- //绌挎杞﹀拰鎻愬崌鏈哄浜庝笉鍚屾ゼ灞�
- LiftCommand command1 = new LiftCommand();
- command1.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command1.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command1.setRun((short) 1);//鍗囬檷
- command1.setDistPosition(currentLev.shortValue());//鐩爣妤煎眰(绌挎杞︽墍鍦ㄦゼ灞�)
- command1.setLiftLock(true);//閿佸畾鎻愬崌鏈�
- commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
- }
-
- //杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲姩杩涙潵
- LiftCommand command2 = new LiftCommand();
- command2.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command2.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command2.setRun((short) 6);//杈撻�佺嚎杩愪綔
- command2.setLiftLock(true);//閿佸畾鎻愬崌鏈�
-
- commands.add(command2);//灏嗗懡浠ゆ坊鍔犺繘list
-
//鎻愬崌鏈哄墠寰�鐩爣妤煎眰
- LiftCommand command3 = new LiftCommand();
- command3.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command3.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command3.setRun((short) 1);//鍗囬檷
- command3.setDistPosition(chargeLocNoLev.shortValue());//鍏呯數搴撲綅鐩爣妤煎眰
- command3.setLiftLock(true);//閿佸畾鎻愬崌鏈�
-
- commands.add(command3);//灏嗗懡浠ゆ坊鍔犺繘list
-
- //鎻愬崌鏈哄埌杈炬寚瀹氭ゼ灞傦紝杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲嚭鍘�
- //杈撻�佺嚎灏嗗洓鍚戠┛姊溅绉诲姩鍑哄幓
- LiftCommand command4 = new LiftCommand();
- command4.setLiftNo(liftProtocol.getLiftNo());//鎻愬崌鏈哄彿
- command4.setTaskNo(liftProtocol.getTaskNo());//浠诲姟鍙�
- command4.setRun((short) 3);//杈撻�佺嚎杩愪綔
- command4.setLiftLock(true);//閿佸畾鎻愬崌鏈�
-
- commands.add(command4);//灏嗗懡浠ゆ坊鍔犺繘list
+ //鑾峰彇鍏呯數搴撲綅鐩爣妤煎眰鍛戒护
+ LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), chargeLocNoLev >= 2 ? chargeLocNoLev + 1 : chargeLocNoLev);
+ commands.add(command1);//灏嗗懡浠ゆ坊鍔犺繘list
wrkCharge.setWrkSts(54L);//鎻愬崌鏈烘惉杩愪腑
//鎵�闇�鍛戒护缁勫悎瀹屾瘯锛屾洿鏂版暟鎹簱锛屾彁浜ゅ埌绾跨▼鍘诲伐浣�
@@ -2275,10 +2580,64 @@
MessageQueue.offer(SlaveType.Lift, liftProtocol.getLiftNo().intValue(), new Task(3, assignCommand));
}
- } else if (wrkCharge.getWrkSts() == 56) {
+ }else if(wrkCharge.getWrkSts() == 55){//55.鎻愬崌鏈鸿縼绉诲皬杞﹀畬鎴�
+ //鐩存帴璁＄畻杞﹀埌鍏呯數搴撲綅
+
+ ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
+
+ Short liftLev = liftProtocol.getLev();
+ if (liftLev == null) {
+ return;
+ }
+ //鍒ゆ柇鎻愬崌鏈烘ゼ灞傛槸鍚﹀埌杈剧洰鏍囨ゼ灞�
+ if (liftLev.intValue() != chargeLocNoLev) {
+ return;//娌℃湁鍒拌揪鐩爣妤煎眰
+ }
+
+ //姝ゆ椂杞﹀湪鎻愬崌鏈哄唴閮紝涓嬭揪涓�姝ユ寚浠よ杞︾Щ鍔ㄥ埌鎻愬崌鏈哄彛
+ Integer staNo = Utils.levToOutInStaNo(liftLev >= 2 ? liftLev + 1 : liftLev);//绔欑偣鍙�
+ BasDevp basDevp = basDevpService.selectById(staNo);
+ if (basDevp == null) {
+ return;//绔欑偣涓嶅瓨鍦�
+ }
+
+ //鑾峰彇灏忚溅鍒板厖鐢靛簱浣嶈矾寰勬寚浠�
+ List<ShuttleCommand> commands = this.shuttleAssignCommand(currentLocNo, chargeLocNo, NavigationMapType.NONE.id, assignCommand, shuttleThread);
+ if (commands == null) {
+ return;//鏈壘鍒拌矾寰�
+ }
+
+ short startCode = liftProtocol.getBarcode();//鎻愬崌鏈哄唴閮ㄤ簩缁寸爜
+ Short distCode = Short.parseShort(basDevp.getQrCodeValue());//鎻愬崌鏈哄彛绔欑偣浜岀淮鐮�
+ Short runDirection = ShuttleRunDirection.BOTTOM.id;//杩愯鏂瑰悜
+ //鑾峰彇鍛戒护
+ ShuttleCommand moveCommand = shuttleThread.getMoveCommand(startCode, distCode, 1400, runDirection, startCode, 1400, 500);
+ commands.add(0, moveCommand);//灏嗚鎸囦护娣诲姞鍒伴槦澶�
+
+ //杩涜鍏呯數涓�
+ shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.CHARGING);
+
+ assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());
+ assignCommand.setTaskMode((short) 9);//鍏呯數
+ assignCommand.setTaskNo(wrkCharge.getWrkNo().shortValue());
+ assignCommand.setCharge(true);//鍏呯數浠诲姟
+
+ //鍒涘缓鍏呯數鎸囦护
+ ShuttleCommand command = shuttleThread.getChargeSwitchCommand((short) 1);//寮�濮嬪厖鐢�
+ commands.add(command);
+
+ //鎸囦护闆嗗垎閰�
+ assignCommand.setCommands(commands);
+
+ wrkCharge.setWrkSts(56L);//鍏呯數涓姸鎬�
+ if (wrkChargeMapper.updateById(wrkCharge) > 0) {
+ //涓嬪彂浠诲姟
+ MessageQueue.offer(SlaveType.Shuttle, assignCommand.getShuttleNo().intValue(), new Task(3, assignCommand));
+ }
+ }else if (wrkCharge.getWrkSts() == 56) {
//鍏呯數涓�
//鍒ゆ柇灏忚溅鏄惁鍏呮弧鐢甸噺锛屾弧鐢�1000鎴栫數鍘�54V浠ヤ笂
- if (shuttleProtocol.getBatteryPower() >= 1000 || shuttleProtocol.getCurrentVoltage() >= 540) {
+ if (shuttleProtocol.getBatteryPower() >= 1000 || shuttleProtocol.getCurrentVoltage() >= 54000) {
//鍏呮弧锛屾柇寮�鍏呯數
List<ShuttleCommand> commands = new ArrayList<>();
ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
@@ -2288,11 +2647,7 @@
assignCommand.setCharge(true);
//鍒涘缓鍏呯數鎸囦护
- ShuttleCommand command = new ShuttleCommand();
- command.setCommandWord((short) 5);//鍏呯數
- command.setShuttleNo(shuttleProtocol.getShuttleNo());
- command.setChargeSwitch((short) 2);//鏂紑鍏呯數
- command.setCommandEnd((short) 1);
+ ShuttleCommand command = shuttleThread.getChargeSwitchCommand((short) 2);//鏂紑鍏呯數
commands.add(command);
//鎸囦护闆嗗垎閰�
--
Gitblit v1.9.1