HuaYiZhongHeng/BaiBuLiKu.git

			@@ -101,7 +101,7 @@
			// 输出警告信息
			ConsoleHelper.WriteWarningLine($"【{conveyorLine.DeviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{station.stationChildCode}】空托盘请求扫码入库");
			// 处理入库请求
			NGRequestTaskInbound(conveyorLine, command, station.stationChildCode, 0, station.stationLocation);
			NGRequestTaskInbound(conveyorLine, command, station, 0);
			}
			else
			{
			@@ -162,26 +162,12 @@
			#region 调用事件总线通知前端

			// 获取缓存中的用户信息
			if (userTokenIds == null && userIds == null)
			var tokenInfos = _cacheService.Get<List<UserInfo>>("Cache_UserToken");
			if (tokenInfos != null && tokenInfos.Any())
			{
			var tokenInfos = _cacheService.Get<List<UserInfo>>("Cache_UserToken");
			if (tokenInfos != null && tokenInfos.Any())
			{
			userTokenIds = tokenInfos.Select(x => x.Token_ID).ToList();
			userIds = tokenInfos.Select(x => x.UserId).ToList();
			userTokenIds = tokenInfos.Select(x => x.Token_ID).ToList();
			userIds = tokenInfos.Select(x => x.UserId).ToList();

			// 构造通知数据
			object obj = new
			{
			command,
			commandWrite
			};
			// 发送通知
			_noticeService.LineData(userIds.FirstOrDefault(), userTokenIds, new { conveyorLine.DeviceName, childDeviceCode, data = obj });
			}
			}
			else
			{
			// 构造通知数据
			object obj = new
			{
			@@ -383,7 +369,7 @@
			{
			if (command.Barcode == task.PalletCode && childDeviceCode == task.NextAddress)
			{
			//conveyorLine.SetValue(ConveyorLineDBName.ConveyorLineTargetAddress, "1000", childDeviceCode);
			conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, "1000", childDeviceCode);

			ConsoleHelper.WriteWarningLine($"【{conveyorLine._deviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】输送线入库完成,下一目标地址【等待分配货位,并写入1000】");

			@@ -586,7 +572,7 @@
			// 打印成功信息，表示托盘已到达指定输送线并完成出库，下一目标地址已确定
			ConsoleHelper.WriteSuccessLine($"【{conveyorLine.DeviceName}】任务号：【{command.TaskNum}】,托盘条码：【{command.Barcode}】已到达【{childDeviceCode}】输送线出库完成,下一目标地址【{NGAddress}】");
			// 设置输送线的目标地址为NG地址
			conveyorLine.SetValue(ConveyorLineDBName.ConveyorLineTargetAddress, NGAddress, childDeviceCode);
			conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, NGAddress, childDeviceCode);
			// 完成输送线发送
			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			// 更新任务状态到下一个状态
			@@ -726,7 +712,7 @@

			#region 设备NG口入库

			public void NGRequestTaskInbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode, int ProtocalDetailValue, string TargetAddress)
			public void NGRequestTaskInbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, Dt_StationManager stationManager, int ProtocalDetailValue)
			{
			var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
			var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.MOMIP_BASE)?.ConfigValue;
			@@ -735,7 +721,6 @@
			{
			throw new InvalidOperationException("MOM IP 未配置");
			}
			Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationPLC == conveyorLine.DeviceCode && x.stationChildCode == childDeviceCode);
			TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
			{
			Software = "WMS",
			@@ -750,43 +735,38 @@
			var MOMIpAddress = wmsBase + ipAddress;

			var result = HttpHelper.PostAsync(MOMIpAddress, trayCells.ToJsonString()).Result;
			WriteInfo("入站校验", $"【{childDeviceCode}】入站校验请求参数【{trayCells.ToJsonString()}】");
			WriteInfo("入站校验", $"【{stationManager.stationChildCode}】入站校验请求参数【{trayCells.ToJsonString()}】");
			WriteInfo("入站校验", "");
			WriteInfo("入站校验", $"【{childDeviceCode}】入站校验返回参数【{result}】");
			WriteInfo("入站校验", $"【{stationManager.stationChildCode}】入站校验返回参数【{result}】");
			ResultTrayCellsStatus result1 = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(result);

			if (result1.Success)
			{
			var serialNosError = result1.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
			ConsoleHelper.WriteWarningLine("1");
			var serialNosError = result1.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
			if (serialNosError.Count > 0)
			{
			conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, 100, stationManager.stationChildCode);
			ConveyorLineSendFinish(conveyorLine, stationManager.stationChildCode, ProtocalDetailValue, true);
			return;
			}

			if (result1.SerialNos.Count <= 0)
			{
			// 空托盘入库逻辑
			Dt_Task dt_Task = new Dt_Task()
			{
			TargetAddress = TargetAddress,
			PalletCode = command.Barcode,
			NextAddress = TargetAddress,
			TaskNum = 0
			};

			var next = dt_Task.NextAddress;
			var taskCommand = MapTaskCommand(dt_Task, command);
			dt_Task.NextAddress = next;
			ConsoleHelper.WriteWarningLine("2");
			ConsoleHelper.WriteWarningLine(stationManager.stationLocation);
			conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, stationManager.stationLocation, stationManager.stationChildCode);

			conveyorLine.SendCommand(taskCommand, childDeviceCode);

			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			ConveyorLineSendFinish(conveyorLine, stationManager.stationChildCode, ProtocalDetailValue, true);
			}
			else
			{
			conveyorLine.SetValue(ConveyorLineDBName.ConveyorLineTargetAddress, 1000, childDeviceCode);
			ConsoleHelper.WriteWarningLine("1000");
			conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTaskNum, 5, stationManager.stationChildCode);
			conveyorLine.SetValue(ConveyorLineDBName.WriteConveyorLineTargetAddress, 1000, stationManager.stationChildCode);

			ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
			ConveyorLineSendFinish(conveyorLine, stationManager.stationChildCode, ProtocalDetailValue, true);
			}
			}
			else