MeiXinLaiRui/ShenSuoGanKongZhi.git

			@@ -56,13 +56,43 @@
			int ret = (int)para.RetractionSpeed;//右PLC自动伸出缩回速度
			int liftPosition= (int)para.LeftPosition;//左伸出位置
			int rigtpostition= (int)para.RightPosition;//右伸出位置
			try
			{
			var leftorigin = devices.Value.left.Communicator.Read<bool>("M115");//左plc到原点位置信号
			var rightorigin = devices.Value.right.Communicator.Read<bool>("M115");//右plc到达原点位置信号
			if (leftorigin == true \|\| rightorigin == true)
			{
			return new WebResponseContent { Status = false, Message = "已到原始点" };
			}
			}
			catch (Exception)
			{


			}
			try
			{
			var lefttarget = devices.Value.left.Communicator.Read<bool>("M116");//左plc到达目标位置
			var righttarget = devices.Value.right.Communicator.Read<bool>("M116");//右plc到达目标位置
			if (lefttarget == true \|\| righttarget == true)
			{
			return new WebResponseContent { Status = false, Message = "已到最大值" };
			}

			}
			catch (Exception)
			{


			}
			if (ExtendedState == "伸出")
			{
			try
			{
			devices.Value.left.Communicator.Write<int>("D1001", ext);//左PLC自动伸出缩回速度
			devices.Value.left.Communicator.Write<bool>("M102", true);//伸出按钮
			Thread.Sleep(100); // 等待100ms（模拟按钮按下）
			devices.Value.left.Communicator.Write<bool>("M102", false); // 释放按钮
			devices.Value.left.Communicator.Write<int>("D1002", liftPosition);//左伸出位置
			}
			catch (Exception)
			@@ -73,6 +103,8 @@
			{
			devices.Value.right.Communicator.Write<int>("D1001", ret);//右PLC自动伸出缩回速度
			devices.Value.right.Communicator.Write<bool>("M102", true);//伸出按钮
			Thread.Sleep(100); // 等待100ms（模拟按钮按下）
			devices.Value.right.Communicator.Write<bool>("M102", false); // 释放按钮
			devices.Value.right.Communicator.Write<int>("D1002", rigtpostition);//右伸出位置
			}
			catch (Exception)
			@@ -80,7 +112,7 @@

			}

			Console.WriteLine($"自动伸缩杆伸出 {ext},右伸出位置{liftPosition}，右伸出位置{rigtpostition}");
			Console.WriteLine($"自动伸缩杆伸出 {ext},左伸出位置{liftPosition}，右伸出位置{rigtpostition}");
			}
			else if (ExtendedState == "缩回")
			{
			@@ -88,6 +120,8 @@
			{
			devices.Value.left.Communicator.Write<int>("D1001", ext);//左PLC自动伸出缩回速度
			devices.Value.left.Communicator.Write<bool>("M103", true);//缩回按钮
			Thread.Sleep(100); // 等待100ms（模拟按钮按下）
			devices.Value.left.Communicator.Write<bool>("M103", false); // 释放按钮
			}
			catch (Exception)
			{
			@@ -97,6 +131,8 @@
			{
			devices.Value.right.Communicator.Write<int>("D1001", ret);//右PLC自动伸出缩回速度
			devices.Value.right.Communicator.Write<bool>("M103", true);//缩回按钮
			Thread.Sleep(100); // 等待100ms（模拟按钮按下）
			devices.Value.right.Communicator.Write<bool>("M103", false); // 释放按钮
			}
			catch (Exception)
			{
			@@ -114,7 +150,7 @@
			return new WebResponseContent { Status = true, Message = "成功",
			Data = new
			{
			ExtendSpeed = ext,//
			ExtendSpeed = ext,
			RetractionSpeed = ret,

			}
			@@ -155,29 +191,72 @@
			var para = BaseDal.QueryData().Where(x => x.Deptid == deid).OrderByDescending(x => x.CreateDate).FirstOrDefault();
			int ext = (int)para.ManualExtend;//左PLC手动伸出缩回速度
			int ret = (int)para.ManualRetraction;//右PLC手动伸出缩回速度
			int liftPosition = (int)para.LeftPosition;//左伸出位置
			int rigtpostition = (int)para.RightPosition;//右伸出位置
			try
			{
			var leftorigin = devices.Value.left.Communicator.Read<bool>("M115");//左plc到原点位置信号
			var rightorigin = devices.Value.right.Communicator.Read<bool>("M115");//右plc到达原点位置信号
			if (leftorigin == true \|\| rightorigin == true)
			{
			return new WebResponseContent { Status = false, Message = "已到原始点" };
			}
			}
			catch (Exception)
			{


			}
			try
			{
			var lefttarget = devices.Value.left.Communicator.Read<bool>("M116");//左plc到达目标位置
			var righttarget = devices.Value.right.Communicator.Read<bool>("M116");//右plc到达目标位置
			if (lefttarget == true \|\| righttarget == true)
			{
			return new WebResponseContent { Status = false, Message = "已到最大值" };
			}

			}
			catch (Exception)
			{


			}


			if (position == "左" && ExtendedState == "伸出")
			{
			devices.Value.left.Communicator.Write<int>("D1000", ext);//左PLC手动伸出缩回速度
			devices.Value.left.Communicator.Write<bool>("M100", true);//伸出按钮
			Console.WriteLine($"{position}伸缩杆手动伸出缩回{ext}");
			Thread.Sleep(100); // 等待100ms（模拟按钮按下）
			devices.Value.left.Communicator.Write<bool>("M100", false); // 释放按钮
			devices.Value.left.Communicator.Write<int>("D1002", liftPosition);//左伸出位置

			Console.WriteLine($"{position}伸缩杆手动伸出{ext}");
			}
			else if (position == "左" && ExtendedState == "缩回")
			{
			devices.Value.left.Communicator.Write<int>("D1000", ext);//左PLC手动伸出缩回速度
			devices.Value.left.Communicator.Write<bool>("M101", true);

			Console.WriteLine($"{position}伸缩杆手动伸出缩回{ext}");
			Thread.Sleep(100); // 等待100ms（模拟按钮按下）
			devices.Value.left.Communicator.Write<bool>("M101", false); // 释放按钮
			Console.WriteLine($"{position}伸缩杆手动缩回{ext}");
			}
			else if (position == "右" && ExtendedState == "伸出")
			{
			devices.Value.right.Communicator.Write<int>("D1000", ret);//右PLC手动伸出缩回速度
			devices.Value.right.Communicator.Write<bool>("M100", true);
			Thread.Sleep(100); // 等待100ms（模拟按钮按下）
			devices.Value.right.Communicator.Write<bool>("M100", false); // 释放按钮
			devices.Value.right.Communicator.Write<int>("D1002", liftPosition);//左伸出位置
			Console.WriteLine($"{position}伸缩杆手动伸出{ret}");
			}
			else if (position == "右" && ExtendedState == "缩回")
			{
			devices.Value.right.Communicator.Write<int>("D1000", ret);//右PLC手动伸出缩回速度
			devices.Value.right.Communicator.Write<bool>("M101", true);
			Thread.Sleep(100); // 等待100ms（模拟按钮按下）
			devices.Value.right.Communicator.Write<bool>("M101", false); // 释放按钮
			Console.WriteLine($"{position}伸缩杆手动缩回{ret}");
			}
			return new WebResponseContent { Status = true,
			@@ -187,7 +266,7 @@
			ManualExtend = ext,
			ManualRetraction = ret
			}
			};//这里要加返回速度
			};
			}
			catch (Exception ex)
			{
			@@ -282,7 +361,7 @@
			catch (Exception)
			{

			throw;

			}
			try
			{
			@@ -291,7 +370,7 @@
			catch (Exception)
			{

			throw;

			}