ChangShaSanYi/ChuanSuoCheKu.git

			@@ -54,11 +54,13 @@
			ShuttleCar shuttleCar = (ShuttleCar)context.JobDetail.JobDataMap.Get("JobParams");
			if (shuttleCar != null)
			{
			shuttleCar.Communicator.IsReadAfterWrite = false;
			ShuttleCarTaskCommandR command = ReadCustomer<ShuttleCarTaskCommandR>(shuttleCar, shuttleCar.DeviceCode);//è¯»åç©¿æ¢è½¦ä¿¡æ¯
			if (command != null && command.JoinStatus == 1)
			{
			#region ç©¿æ¢è½¦ä»»å¡å®æ
			if (command.TaskTypeComplete > (short)ShuttleCarTaskComplete.Standby)
			var complete = shuttleCar.GetValue<ShuttleCarDBName, bool>(ShuttleCarDBName.TaskComplete);
			if (complete && command.TaskTypeComplete > (short)ShuttleCarTaskComplete.Standby && command.Status == command.TaskTypeComplete)
			{
			var Status = _taskService.ShuttleCarTaskCompleted(command.number, command.TaskTypeComplete).Status;
			shuttleCar.SetValue(ShuttleCarDBName.ConfirmComplete, Status, shuttleCar.DeviceCode);
			@@ -66,86 +68,22 @@
			#endregion

			#region åå»ºç§»è½¦åçµä»»å¡
			if (command.Err_Status == (short)ShuttleCarErr.LowBattery \|\| command.ElectricQuantity == (short)ShuttleCarErr.LowBattery)
			if (command.Err_Status == (short)ShuttleCarErr.LowBattery \|\| command.ElectricQuantity <= (short)ShuttleCarErr.LowBattery)
			{
			//çæå åæºç§»è½¦ä»»å¡&ç©¿æ¢è½¦åçµä»»å¡
			var ShuttleCar = QueryCode(shuttleCar.DeviceCode);//åçµç»ç¹å¾ç¡®è®¤ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼ï¼
			_taskService.AddRelocationCarTask(ShuttleCar.ShuttleCarPosition, "", ShuttleCar.ShuttleCarCode, ShuttleCarTaskType.Charging.ToString());
			var ShuttleCar = QueryCode(shuttleCar.DeviceCode);
			_taskService.AddRelocationCarTask(ShuttleCar.ShuttleCarPosition, "002-002-001", ShuttleCar.ShuttleCarCode, ShuttleCarTaskType.Charging.ToString());
			}
			#endregion

			#region è·åå åæºç§»è½¦å®æä»»å¡
			Dt_Task dt_Task = GetTask((int)TaskCarStatusEnum.SC_CarFinish, (int)TaskOtherTypeEnum.RelocationCar);
			if (dt_Task != null)
			{
			var ShuttleCar = QueryCode(dt_Task.ShuttleCarCode);
			ShuttleCar.ShuttleCarPosition = dt_Task.TargetAddress;
			_shuttleCarService.UpdateData(ShuttleCar);
			if (string.IsNullOrEmpty(dt_Task.Remark))//å®æç§»åºä»»å¡
			_taskService.AddTask_Hty(dt_Task, TaskOperateTypeEnum.AutoComplete.ToJson());
			else//ä¸ååçµä»»å¡
			SendTask(dt_Task);
			}
			GetSC_CarFinish();
			#endregion

			#region è·åç§»è½¦ä»»å¡
			dt_Task = GetTask((int)TaskCarStatusEnum.CarNew, (int)TaskOtherTypeEnum.RelocationCar);//è·åæ°å»ºç§»è½¦ä»»å¡
			if (dt_Task != null)
			{
			#region å¤ææ¯å¦åå¨ç©ºé²ç©¿æ¢è½¦,å¦é½å¨åçµ(éæ©çµéé«çå¹¶è¶è¿50%çµéçç©¿æ¢è½¦éåºåçµ)

			#endregion

			if (string.IsNullOrEmpty(dt_Task.SourceAddress))
			{
			if (command.Status == (short)ShuttleCarStatus.Standby && command.TaskTypeComplete == (short)ShuttleCarTaskComplete.Standby && command.Err_Status == (short)ShuttleCarErr.Normal)
			{
			dt_Task.SourceAddress = QueryCode(shuttleCar._deviceCode).ShuttleCarPosition;
			dt_Task.CurrentAddress = dt_Task.SourceAddress;
			dt_Task.ShuttleCarCode = shuttleCar._deviceCode;
			_taskService.UpdateData(dt_Task);
			}
			}
			else if (string.IsNullOrEmpty(dt_Task.TargetAddress))
			{
			#region åWMSç³è¯·
			WebResponseContent content = new WebResponseContent();
			var ResultData = HttpHelper.PostAsync(WMSInterfaceAddress.GetPosition + $"?position={dt_Task.SourceAddress}", "", headers: new Dictionary<string, string>());
			if (ResultData.Result != null)
			{
			content = JsonConvert.DeserializeObject<WebResponseContent>(ResultData.Result);
			if (content != null && content.Status)
			{
			dt_Task.TargetAddress = content.Message;
			dt_Task.NextAddress = dt_Task.TargetAddress;
			_taskService.UpdateData(dt_Task);
			}
			}
			#endregion
			}
			//ç©¿æ¢è½¦ç§»åºä»»å¡ä¸å
			if (!string.IsNullOrEmpty(dt_Task.SourceAddress) && !string.IsNullOrEmpty(dt_Task.TargetAddress) && !string.IsNullOrEmpty(dt_Task.ShuttleCarCode))
			{
			SendTask(dt_Task);
			}
			}
			#region è·åç§»è½¦/åºå¥åºä»»å¡
			Get_CarTask(shuttleCar, command);
			#endregion

			#region ç©¿æ¢è½¦åºå¥åºä»»å¡
			else
			{
			var task = _taskService.QueryShuttleCarTask(shuttleCar.DeviceCode);
			if (task != null)
			{
			if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound && !task.IsPickPlace)
			{
			var ShuttleCar = _shuttleCarService.QueryShuttleCar(task.SourceAddress);//åºåºä»»å¡å¤ææ¯å¦åå¨ç©¿æ¢è½¦
			if (ShuttleCar != null) SendTask(task);
			else _taskService.AddRelocationCarTask("", task.SourceAddress);
			}
			}
			}
			#endregion
			}
			}
			}
			@@ -159,52 +97,5 @@
			}
			return Task.CompletedTask;
			}
			private void SendTask(Dt_Task task)
			{
			ShuttleCar shuttleCar = Storage.Devices.FirstOrDefault(x => x.DeviceCode == task.ShuttleCarCode) as ShuttleCar;
			if (shuttleCar != null)
			{
			ShuttleCarTaskCommandR command = ReadCustomer<ShuttleCarTaskCommandR>(shuttleCar, shuttleCar.DeviceCode);//è¯»åç©¿æ¢è½¦ä¿¡æ¯
			if (command != null && command.Status == (short)ShuttleCarStatus.Standby && command.TaskTypeComplete == (short)ShuttleCarTaskComplete.Standby && command.Err_Status == (short)ShuttleCarErr.Normal)
			{
			//ä»»å¡è½¬æ¢
			ShuttleCarTaskCommandW shuttleCarTaskCommand = new ShuttleCarTaskCommandW();
			shuttleCarTaskCommand.Direction = command.Position;
			shuttleCarTaskCommand.TaskNum = task.TaskNum;
			if (task.TaskType == (int)TaskOtherTypeEnum.RelocationCar)//ç§»è½¦
			{
			if (task.TaskState == (int)TaskCarStatusEnum.CarNew)
			{
			if (task.Remark == ShuttleCarTaskType.ExitCharge.ToString()) shuttleCarTaskCommand.TaskType = (short)GetCarTaskType(task.Remark);
			else shuttleCarTaskCommand.TaskType = (short)GetCarTaskType(task.TaskType, shuttleCarTaskCommand.Direction);
			}
			else if (task.TaskState == (int)TaskCarStatusEnum.SC_CarFinish)
			{
			if (task.Remark == ShuttleCarTaskType.Charging.ToString()) shuttleCarTaskCommand.TaskType = (short)GetCarTaskType(task.Remark);
			else shuttleCarTaskCommand.TaskType = (short)GetCarTaskType(task.TaskType, shuttleCarTaskCommand.Direction);
			}
			}
			else
			shuttleCarTaskCommand.TaskType = (short)GetCarTaskType(task.TaskType, shuttleCarTaskCommand.Direction);
			//shuttleCarTaskCommand.TaskType = string.IsNullOrEmpty(task.Remark) ? (short)GetCarTaskType(task.TaskType, shuttleCarTaskCommand.Direction) : (short)GetCarTaskType(task.Remark);
			//ä»»å¡ä¸å
			if (shuttleCarTaskCommand.TaskType != null)//0
			{
			if (shuttleCar.SendCommand(shuttleCarTaskCommand, shuttleCar.DeviceCode))
			{
			if (!string.IsNullOrEmpty(task.Remark)) task.Remark = task.Remark + "å·²ä¸å";
			task.TaskState = GetTaskState(task.TaskType);
			_taskService.UpdateData(task);
			}
			}
			}
			}
			}

			///ä¸åéåºåçµä»»å¡å¹¶çæç§»åºä»»å¡
			//if (command.ElectricQuantity > 50)
			//{

			//}
			}
			}