From 4fc31b41c205507607c91ab3afe10fbc06a9aa09 Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期五, 05 十二月 2025 13:52:15 +0800
Subject: [PATCH] 1.添加启动提升机、停止提升机、复位提升机功能 2.优化初始化提升机功能
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/CommonElevatorJob.cs | 95 -----------------------------------------------
1 files changed, 0 insertions(+), 95 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/CommonElevatorJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/CommonElevatorJob.cs"
index 8d483f8..9f1c2cf 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/CommonElevatorJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ElevatorJob/CommonElevatorJob.cs"
@@ -44,101 +44,6 @@
CommonElevator elevator = (CommonElevator)context.JobDetail.JobDataMap.Get("JobParams");
if(elevator != null)
{
- var elevatorNum = 0;
- //鑾峰彇鎻愬崌鏈虹姸鎬佺殑鏄剧ず =0鏃犵姸鎬侊紱=1杩愯涓紱=2寰呮満锛�=3鎶ヨ
- if (elevator.GetValue<ElevatorDBName, short>(ElevatorDBName.ElevatorStatus) == 2)
- {
- //鑾峰彇鎻愬崌鏈烘墜鍔�/鑷姩鍒囨崲寮�鍏崇姸鎬�
- if(elevator.GetValue<ElevatorDBName, short>(ElevatorDBName.ManualAutoSwitch) == 1)
- {
- //鑾峰彇鎻愬崌鏈烘槸鍚﹁兘鍏佽鍒濆鍖�
- if(elevator.GetValue<ElevatorDBName, short>(ElevatorDBName.AllowInitialization) == 1)
- {
- if(elevatorNum == 0)
- {
- if (elevator.GetValue<ElevatorDBName, short>(ElevatorDBName.InitializationFlag) == 0)
- {
- elevator.SetValue<ElevatorDBName, short>(ElevatorDBName.InitializationTrigger, 1);
- Thread.Sleep(1000);
- elevator.SetValue<ElevatorDBName, short>(ElevatorDBName.InitializationTrigger, 0);
- }
- elevatorNum++;
- }
- Thread.Sleep(1000);
- if (elevator.GetValue<ElevatorDBName, short>(ElevatorDBName.InitializationFlag) == 1)
- {
- elevatorNum++;
- }
- if(elevatorNum == 2)
- {
- Thread.Sleep(5000);
- var TaskDouble = _taskRepository.QueryData(x => x.TaskState > (int)TaskAcrossFloorStatusEnum.CarryNew && x.TaskState < (int)TaskAcrossFloorStatusEnum.EndAddressExecuting && x.DoubleTray == 1);
- var task = _taskRepository.QueryFirst(x => x.TaskState > (int)TaskAcrossFloorStatusEnum.CarryNew && x.TaskState < (int)TaskAcrossFloorStatusEnum.EndAddressExecuting);
- if(TaskDouble.Count() > 0)
- {
- if (TaskDouble.First().Floor == "2F")
- {
- elevator.SetValue(ElevatorDBName.TaskNum, Convert.ToInt16(TaskDouble.First().TaskNum));
- elevator.SetValue(ElevatorDBName.FlagBit, Convert.ToInt16(2));
- elevator.SetValue(ElevatorDBName.StartFloor, Convert.ToInt16(1));
- elevator.SetValue(ElevatorDBName.EdnFloor, Convert.ToInt16(2));
- Thread.Sleep(1000);
- elevator.SetValue(ElevatorDBName.StartCommand, Convert.ToInt16(1));
-
- _taskService.SendAgvTask("AAA", TaskDouble.First().TaskNum);
- _taskService.UpdateTaskStatusToNext(TaskDouble.First().TaskNum);
- }
- else
- {
- elevator.SetValue(ElevatorDBName.TaskNum, Convert.ToInt16(TaskDouble.First().TaskNum));
- elevator.SetValue(ElevatorDBName.FlagBit, Convert.ToInt16(2));
- elevator.SetValue(ElevatorDBName.StartFloor, Convert.ToInt16(2));
- elevator.SetValue(ElevatorDBName.EdnFloor, Convert.ToInt16(1));
- Thread.Sleep(1000);
- elevator.SetValue(ElevatorDBName.StartCommand, Convert.ToInt16(1));
-
- _taskService.SendAgvTask("DDD", TaskDouble.First().TaskNum);
- _taskService.UpdateTaskStatusToNext(TaskDouble.First().TaskNum);
- }
- }
- if (task != null)
- {
- if (task.Floor == "2F")
- {
- elevator.SetValue(ElevatorDBName.TaskNum, Convert.ToInt16(task.TaskNum));
- elevator.SetValue(ElevatorDBName.FlagBit, Convert.ToInt16(2));
- elevator.SetValue(ElevatorDBName.StartFloor, Convert.ToInt16(1));
- elevator.SetValue(ElevatorDBName.EdnFloor, Convert.ToInt16(2));
- Thread.Sleep(1000);
- elevator.SetValue(ElevatorDBName.StartCommand, Convert.ToInt16(1));
-
- _taskService.SendAgvTask("AAA", task.TaskNum);
- _taskService.UpdateTaskStatusToNext(task.TaskNum);
- }
- else
- {
- elevator.SetValue(ElevatorDBName.TaskNum, Convert.ToInt16(task.TaskNum));
- elevator.SetValue(ElevatorDBName.FlagBit, Convert.ToInt16(2));
- elevator.SetValue(ElevatorDBName.StartFloor, Convert.ToInt16(2));
- elevator.SetValue(ElevatorDBName.EdnFloor, Convert.ToInt16(1));
- Thread.Sleep(1000);
- elevator.SetValue(ElevatorDBName.StartCommand, Convert.ToInt16(1));
-
- _taskService.SendAgvTask("DDD", task.TaskNum);
- _taskService.UpdateTaskStatusToNext(task.TaskNum);
- }
- }
- if (elevator.GetValue<ElevatorDBName, short>(ElevatorDBName.InitializationFlag) == 0)
- {
- elevator.SetValue<ElevatorDBName, short>(ElevatorDBName.StartElevator, 1);
- Thread.Sleep(2000);
- elevator.SetValue<ElevatorDBName, short>(ElevatorDBName.StartElevator, 0);
- elevatorNum = 0;
- }
- }
- }
- }
- }
//鑾峰彇鎻愬崌鏈哄綋鍓嶆ā寮�0-鎵嬪姩\鏁呴殰銆佺淮鎶ゆā寮忥紝1-鑷姩妯″紡
if (elevator.GetValue<ElevatorDBName, short>(ElevatorDBName.Model) == 1)
{
--
Gitblit v1.9.3