From b5e175f49716a37876a5180b635f7d618306bb79 Mon Sep 17 00:00:00 2001 From: icewint Date: Mon, 7 Oct 2024 09:59:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=E4=B8=80=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CirculationTask/CommonCirculation/HeartBeat.cs | 2 +- .../Business/CirculationTask/Convey/PickStandButton.cs | 2 +- WcsMain/Business/CirculationTask/Convey/ReadScanCode.cs | 2 +- .../Business/CirculationTask/Convey/UploadBoxArrive.cs | 2 +- WcsMain/Business/CirculationTask/ElTag/LightElTag.cs | 2 +- WcsMain/Business/CirculationTask/Stacker/CheckAccount.cs | 2 +- .../CirculationTask/Stacker/ExeTaskDoubleFork.cs | 2 +- .../Business/CirculationTask/Stacker/ExecuteWmsTask.cs | 9 +++++++++ WcsMain/Business/CirculationTask/Stacker/RecordErr.cs | 2 +- .../CirculationTask/Stacker/UploadStackerStatus.cs | 2 +- .../CirculationTask/StackerConvey/CheckAccount.cs | 2 +- .../Business/CirculationTask/TaskData/ResolveWmsTask.cs | 2 +- .../CommonCirculation => Led}/LedShow.cs | 2 +- 13 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 WcsMain/Business/CirculationTask/Stacker/ExecuteWmsTask.cs rename WcsMain/Business/{CirculationTask/CommonCirculation => Led}/LedShow.cs (93%) diff --git a/WcsMain/Business/CirculationTask/CommonCirculation/HeartBeat.cs b/WcsMain/Business/CirculationTask/CommonCirculation/HeartBeat.cs index 64092c6..1c27bfb 100644 --- a/WcsMain/Business/CirculationTask/CommonCirculation/HeartBeat.cs +++ b/WcsMain/Business/CirculationTask/CommonCirculation/HeartBeat.cs @@ -3,7 +3,7 @@ using WcsMain.EquipOperation.Convey; namespace WcsMain.Business.CirculationTask.CommonCirculation; -[Circulation] +//[Circulation] public class HeartBeat(ConveyOperation conveyOperation) { diff --git a/WcsMain/Business/CirculationTask/Convey/PickStandButton.cs b/WcsMain/Business/CirculationTask/Convey/PickStandButton.cs index 27d8809..5d5a418 100644 --- a/WcsMain/Business/CirculationTask/Convey/PickStandButton.cs +++ b/WcsMain/Business/CirculationTask/Convey/PickStandButton.cs @@ -13,7 +13,7 @@ namespace WcsMain.Business.CirculationTask.Convey; /// /// 拣选站台按钮 /// -[Circulation] +//[Circulation] public class PickStandButton(AppConveyStandDao conveyStandDao, ConveyOperation conveyOperation, WmsWebApiPost wmsWebApiPost) { diff --git a/WcsMain/Business/CirculationTask/Convey/ReadScanCode.cs b/WcsMain/Business/CirculationTask/Convey/ReadScanCode.cs index 4fb4b26..8603844 100644 --- a/WcsMain/Business/CirculationTask/Convey/ReadScanCode.cs +++ b/WcsMain/Business/CirculationTask/Convey/ReadScanCode.cs @@ -12,7 +12,7 @@ namespace WcsMain.Business.CirculationTask.Convey; /// /// 箱式线读取扫码信息 /// -[Circulation] +//[Circulation] public class ReadScanCode(AppRouterMethodDao routerMethodDao, ConveyOperation conveyOperation, HistoryConveyDataHander historyConveyDataHander, AppScanRecordDao scanRecordDao, DataBaseData dataBaseData) { private static List? routers; diff --git a/WcsMain/Business/CirculationTask/Convey/UploadBoxArrive.cs b/WcsMain/Business/CirculationTask/Convey/UploadBoxArrive.cs index 300786e..144116a 100644 --- a/WcsMain/Business/CirculationTask/Convey/UploadBoxArrive.cs +++ b/WcsMain/Business/CirculationTask/Convey/UploadBoxArrive.cs @@ -13,7 +13,7 @@ using WcsMain.Plugins; namespace WcsMain.Business.CirculationTask.Convey; -[Circulation] +//[Circulation] public class UploadBoxArrive(AppConveyStandDao conveyStandDao, ConveyOperation conveyOperation, WmsWebApiPost wmsWebApiPost, AppConveyTaskDao conveyTaskDao, AppElTagTaskDao elTagTaskDao) { private static List? _pickStands; // 拣选站台 diff --git a/WcsMain/Business/CirculationTask/ElTag/LightElTag.cs b/WcsMain/Business/CirculationTask/ElTag/LightElTag.cs index 341318b..29d9181 100644 --- a/WcsMain/Business/CirculationTask/ElTag/LightElTag.cs +++ b/WcsMain/Business/CirculationTask/ElTag/LightElTag.cs @@ -12,7 +12,7 @@ using WcsMain.EquipOperation.ElTag; namespace WcsMain.Business.CirculationTask.ElTag; -[Circulation] +//[Circulation] public class LightElTag(AppElTagTaskDao tagTaskDao, AtopOperation atopOperation, AppElTagLocationDao elTagBaseDao) { diff --git a/WcsMain/Business/CirculationTask/Stacker/CheckAccount.cs b/WcsMain/Business/CirculationTask/Stacker/CheckAccount.cs index 542339a..a54e518 100644 --- a/WcsMain/Business/CirculationTask/Stacker/CheckAccount.cs +++ b/WcsMain/Business/CirculationTask/Stacker/CheckAccount.cs @@ -13,7 +13,7 @@ namespace WcsMain.Business.CirculationTask.Stacker; /// /// 过账，PLC任务回告 /// -[Circulation()] +//[Circulation()] public class CheckAccount(StackerOperation stackerOperation, AppWcsTaskDao wcsTaskDao, WCSTaskExecuteEvent wcsTaskEvent) { /// diff --git a/WcsMain/Business/CirculationTask/Stacker/ExeTaskDoubleFork.cs b/WcsMain/Business/CirculationTask/Stacker/ExeTaskDoubleFork.cs index f9ef14c..2ed18ca 100644 --- a/WcsMain/Business/CirculationTask/Stacker/ExeTaskDoubleFork.cs +++ b/WcsMain/Business/CirculationTask/Stacker/ExeTaskDoubleFork.cs @@ -16,7 +16,7 @@ namespace WcsMain.Business.CirculationTask.Stacker; /// /// 双货叉单深位执行堆垛机任务 ---- 卡特模式 /// -[Circulation("双货叉单深位执行堆垛机任务")] +//[Circulation("双货叉单深位执行堆垛机任务")] public class ExeTaskDoubleFork( StackerOperation stackerOperation, AppWcsTaskDao wcsTaskDao, WCSTaskExecuteEvent wcsTaskEvent, ConveyOperation conveyOperation, DataBaseData dataBaseData) diff --git a/WcsMain/Business/CirculationTask/Stacker/ExecuteWmsTask.cs b/WcsMain/Business/CirculationTask/Stacker/ExecuteWmsTask.cs new file mode 100644 index 0000000..2f8a7e3 --- /dev/null +++ b/WcsMain/Business/CirculationTask/Stacker/ExecuteWmsTask.cs @@ -0,0 +1,9 @@ +namespace WcsMain.Business.CirculationTask.Stacker; + +/// +/// 执行立体仓库任务 +/// +public class ExecuteWmsTask +{ + +} diff --git a/WcsMain/Business/CirculationTask/Stacker/RecordErr.cs b/WcsMain/Business/CirculationTask/Stacker/RecordErr.cs index 1538d6c..23aa223 100644 --- a/WcsMain/Business/CirculationTask/Stacker/RecordErr.cs +++ b/WcsMain/Business/CirculationTask/Stacker/RecordErr.cs @@ -13,7 +13,7 @@ namespace WcsMain.Business.CirculationTask.Stacker; /// /// 本类主要用于采集堆垛机报警信息 /// -[Circulation] +//[Circulation] public class RecordErr(StackerOperation stackerOperation, AppErrRecorDao errRecorDao, DataBaseData dataBaseData) { diff --git a/WcsMain/Business/CirculationTask/Stacker/UploadStackerStatus.cs b/WcsMain/Business/CirculationTask/Stacker/UploadStackerStatus.cs index 41a7f04..895df0f 100644 --- a/WcsMain/Business/CirculationTask/Stacker/UploadStackerStatus.cs +++ b/WcsMain/Business/CirculationTask/Stacker/UploadStackerStatus.cs @@ -10,7 +10,7 @@ namespace WcsMain.Business.CirculationTask.Stacker; /// /// 上传堆垛机可用状态给wms /// -[Circulation] +//[Circulation] public class UploadStackerStatus(StackerOperation stackerOperation, WmsWebApiPost wmsWebApiPost) { List StackerNotOpen = []; diff --git a/WcsMain/Business/CirculationTask/StackerConvey/CheckAccount.cs b/WcsMain/Business/CirculationTask/StackerConvey/CheckAccount.cs index 7f270b3..df9b310 100644 --- a/WcsMain/Business/CirculationTask/StackerConvey/CheckAccount.cs +++ b/WcsMain/Business/CirculationTask/StackerConvey/CheckAccount.cs @@ -11,7 +11,7 @@ namespace WcsMain.Business.CirculationTask.StackerConvey; /// /// 过账，PLC任务回告 ---- 库前输送线 /// -[Circulation] +//[Circulation] public class CheckAccount(AppWcsTaskDao wcsTaskDao, StackerConveyOperation stackerConveyOperation, WCSTaskExecuteEvent wcsTaskEvent) { diff --git a/WcsMain/Business/CirculationTask/TaskData/ResolveWmsTask.cs b/WcsMain/Business/CirculationTask/TaskData/ResolveWmsTask.cs index 76c5c57..d6cbfed 100644 --- a/WcsMain/Business/CirculationTask/TaskData/ResolveWmsTask.cs +++ b/WcsMain/Business/CirculationTask/TaskData/ResolveWmsTask.cs @@ -16,7 +16,7 @@ namespace WcsMain.Business.CirculationTask.TaskData; /// /// WMS任务解析类 /// -[Circulation()] +//[Circulation()] public class ResolveWmsTask(AppWmsTaskDao wmsTaskDao, SendWmsTaskStatus sendWmsTaskStatus, DataBaseData dataBaseData, TaskDao taskDao) { /// diff --git a/WcsMain/Business/CirculationTask/CommonCirculation/LedShow.cs b/WcsMain/Business/Led/LedShow.cs similarity index 93% rename from WcsMain/Business/CirculationTask/CommonCirculation/LedShow.cs rename to WcsMain/Business/Led/LedShow.cs index eea80eb..bf2cb4b 100644 --- a/WcsMain/Business/CirculationTask/CommonCirculation/LedShow.cs +++ b/WcsMain/Business/Led/LedShow.cs @@ -1,6 +1,6 @@ using WcsMain.Common; -namespace WcsMain.Business.CirculationTask.CommonCirculation; +namespace WcsMain.Business.Led; public class LedShow {