MingHeZhiNeng/DuiDuoJiLiKu.git

			@@ -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)
			{