ZhiHuiQiCe/LongDeLiLiKu.git

			@@ -109,7 +109,6 @@
			if(task != null)
			{
			ConveyorLineTaskCommandWrite taskCommand = _mapper.Map<ConveyorLineTaskCommandWrite>(task);

			bool sendFlag = SendCommand(taskCommand, conveyorLine, stationManger.StationCode);
			if (sendFlag)
			{
			@@ -138,7 +137,7 @@
			public void ConveyorLineInFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, Dt_StationManger stationManger)
			{
			var task = _taskService.QueryExecutingTaskByBarcode(command.TaskNum, stationManger.StationCode);
			if (task != null && task.TaskState != (int)TaskStatusEnum.Line_Finish)
			if (task != null && task.TaskState != (int)TaskStatusEnum.SC_Execute)
			{
			WebResponseContent content = _taskService.UpdateTaskStatusToNext(task, stationManger);

			@@ -155,6 +154,7 @@
			conveyorLine.SetValue(ConveyorLineDBName.TaskNum, taskCommand.TaskNum, childDeviceCode);
			conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, taskCommand.TargetAddress, childDeviceCode);
			conveyorLine.SetValue(ConveyorLineDBName.Weight, taskCommand.Weight, childDeviceCode);
			conveyorLine.SetValue(ConveyorLineDBName.Barcode, taskCommand.Barcode, childDeviceCode);
			conveyorLine.SetValue(ConveyorLineDBName.ResponState, 86, childDeviceCode);

			for (int i = 0; i < 6; i++)
			@@ -162,7 +162,7 @@
			ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(childDeviceCode);
			if (command != null)
			{
			if (command.TaskNum == taskCommand.TaskNum && command.TargetAddress == taskCommand.TargetAddress && command.Weight == taskCommand.Weight)
			if (command.TaskNum == taskCommand.TaskNum && command.TargetAddress == taskCommand.TargetAddress && command.Weight == taskCommand.Weight && command.Barcode == taskCommand.Barcode)
			{
			WriteInfo(conveyorLine.DeviceName, $"æ¶é´ï¼ã{DateTime.Now}ãåå¥ä»»å¡æååå¥æ¬¡æ°{i}åå¥ä»»å¡ã{JsonConvert.SerializeObject(taskCommand)}ã");
			return true;
			@@ -172,6 +172,11 @@
			conveyorLine.SetValue(ConveyorLineDBName.TaskNum, taskCommand.TaskNum, childDeviceCode);
			Thread.Sleep(100);
			}
			if (command.Barcode != taskCommand.Barcode)
			{
			conveyorLine.SetValue(ConveyorLineDBName.Barcode, taskCommand.Barcode, childDeviceCode);
			Thread.Sleep(100);
			}
			if (command.TaskNum != taskCommand.TaskNum)
			{
			conveyorLine.SetValue(ConveyorLineDBName.TaskNum, taskCommand.TaskNum, childDeviceCode);