From a376be8c3b097565b849c7ee89dd2c9c4ae78410 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 19 七月 2023 09:31:43 +0800
Subject: [PATCH] command write
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 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 95b3269..fd685be 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1817,12 +1817,6 @@
//鍒ゆ柇鎻愬崌鏈烘槸鍚﹀埌浣�
StaProtocol staProtocol = devpThread.getStation().get(Utils.levToOutInStaNo(wrkMastLocNoLey >= 2 ? wrkMastLocNoLey + 1 : wrkMastLocNoLey));//璧峰绔欑偣
- //鍒ゆ柇杈撻�佺珯鐐规槸鍚︽湁鐗╋紝鍙湁鏃犵墿鎯呭喌鎵嶈兘缁х画璋冨害鎻愬崌鏈�
- if (staProtocol.isLoading()) {
- //鏈夌墿绂佹璋冨害
- continue;
- }
-
if (liftLev != wrkMastLocNoLey && !staProtocol.isLiftArrival()) {
//鎻愬崌鏈轰笉鍦ㄥ伐浣滄。婧愬簱浣嶆ゼ灞傦紝璋冨害鎻愬崌鏈�
LiftCommand command1 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), wrkMastLocNoLey);
@@ -1833,12 +1827,13 @@
LiftCommand command2 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 4);
command2.setOperaStaNo(staProtocol.getSiteId().shortValue());//杈撻�佺嚎鎿嶄綔绔欑偣鍙�
command2.setRotationDire(2);//缁欒緭閫佺嚎涓嬪彂閾炬潯杞姩淇″彿锛屽弽杞�
- command2.setDevpId(devpId);//杈撻�佺嚎iD
+ command2.setDevpId(devpId);//杈撻�佺嚎ID
command2.setStaNo((short) 104);//鍐欏叆鍑哄簱鐩爣绔�104
commands.add(command2);//灏嗗懡浠ゆ坊鍔犺繘list
//鎻愬崌鏈哄墠寰�鍑哄簱鍙ｏ紝杈撻�佺嚎妤煎眰
LiftCommand command3 = liftThread.getLiftUpDownCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), LiftLevType.TWO.lev);
+ command3.setDevpId(devpId);//杈撻�佺嚎ID
commands.add(command3);//灏嗗懡浠ゆ坊鍔犺繘list
//鎻愬崌鏈哄埌杈炬寚瀹氭ゼ灞傦紝杈撻�佺嚎灏嗚揣鐗╃Щ鍑哄幓(鍙嶈浆)
@@ -1846,12 +1841,12 @@
LiftCommand command4 = liftThread.getLiftTurnCommand(liftProtocol.getLiftNo(), liftProtocol.getTaskNo(), 2);
command4.setOperaStaNo((short) 102);//鎿嶄綔102绔�
command4.setRotationDire(2);//缁欒緭閫佺嚎涓嬪彂閾炬潯杞姩淇″彿锛屽弽杞�
- command4.setDevpId(devpId);
+ command4.setDevpId(devpId);//杈撻�佺嚎ID
commands.add(command4);//灏嗗懡浠ゆ坊鍔犺繘list
//鎻愬崌鏈洪摼鏉℃墽琛屽畬姣曞悗锛岀粰102绔欏啓鍏ヨ祫鏂�
LiftCommand command5 = liftThread.getResetCommand();
- command5.setDevpId(devpId);//杈撻�佺嚎iD
+ command5.setDevpId(devpId);//杈撻�佺嚎ID
command5.setOperaStaNo((short) 102);//鎿嶄綔102绔�
command5.setStaNo((short) 104);//鍐欏叆鍑哄簱鐩爣绔�104
command5.setRotationDire(0);//閾炬潯杞姩鍋滄
--
Gitblit v1.9.1