From 7876ac5d67b12e206a68db17c4034df52fa2f060 Mon Sep 17 00:00:00 2001
From: z8018 <1282578289@qq.com>
Date: 星期五, 06 六月 2025 09:23:38 +0800
Subject: [PATCH] 1

---
 project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs |  146 +++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 129 insertions(+), 17 deletions(-)

diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs
index a6a16eb..c5ba941 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/ParametersService.cs
@@ -56,25 +56,84 @@
                 int ret = (int)para.RetractionSpeed;//鍙砅LC鑷姩浼稿嚭缂╁洖閫熷害
                 int liftPosition= (int)para.LeftPosition;//宸︿几鍑轰綅缃�
                 int rigtpostition= (int)para.RightPosition;//鍙充几鍑轰綅缃�
+                try
+                {
+                    var leftorigin = devices.Value.left.Communicator.Read<bool>("M115");//宸lc鍒板師鐐逛綅缃俊鍙�
+                    var rightorigin = devices.Value.right.Communicator.Read<bool>("M115");//鍙硃lc鍒拌揪鍘熺偣浣嶇疆淇″彿
+                    if (leftorigin == true || rightorigin == true)
+                    {
+                        return new WebResponseContent { Status = false, Message = "宸插埌鍘熷鐐�" };
+                    }
+                }
+                catch (Exception)
+                {
 
+
+                }
+                try
+                {
+                    var lefttarget = devices.Value.left.Communicator.Read<bool>("M116");//宸lc鍒拌揪鐩爣浣嶇疆
+                    var righttarget = devices.Value.right.Communicator.Read<bool>("M116");//鍙硃lc鍒拌揪鐩爣浣嶇疆
+                    if (lefttarget == true || righttarget == true)
+                    {
+                        return new WebResponseContent { Status = false, Message = "宸插埌鏈�澶у��" };
+                    }
+
+                }
+                catch (Exception)
+                {
+
+
+                }
                 if (ExtendedState == "浼稿嚭")
                 {
-                    devices.Value.left.Communicator.Write<int>("D1001", ext);//宸LC鑷姩浼稿嚭缂╁洖閫熷害
-                    devices.Value.left.Communicator.Write<bool>("M102", true);//浼稿嚭鎸夐挳
-                    devices.Value.left.Communicator.Write<int>("D1002", liftPosition);//宸︿几鍑轰綅缃�
-                    devices.Value.right.Communicator.Write<int>("D1001", ret);//鍙砅LC鑷姩浼稿嚭缂╁洖閫熷害
-                    devices.Value.right.Communicator.Write<bool>("M102", true);//浼稿嚭鎸夐挳
-                    devices.Value.right.Communicator.Write<int>("D1002", rigtpostition);//鍙充几鍑轰綅缃�
+                    try
+                    {
+                        devices.Value.left.Communicator.Write<int>("D1001", ext);//宸LC鑷姩浼稿嚭缂╁洖閫熷害
+                        devices.Value.left.Communicator.Write<bool>("M102", true);//浼稿嚭鎸夐挳
+                        devices.Value.left.Communicator.Write<int>("D1002", liftPosition);//宸︿几鍑轰綅缃�
+                    }
+                    catch (Exception)
+                    {
+
+                    }
+                    try
+                    {
+                        devices.Value.right.Communicator.Write<int>("D1001", ret);//鍙砅LC鑷姩浼稿嚭缂╁洖閫熷害
+                        devices.Value.right.Communicator.Write<bool>("M102", true);//浼稿嚭鎸夐挳
+                        devices.Value.right.Communicator.Write<int>("D1002", rigtpostition);//鍙充几鍑轰綅缃�
+                    }
+                    catch (Exception)
+                    {
+
+                    }
+                    
                     Console.WriteLine($"鑷姩浼哥缉鏉嗕几鍑� {ext},鍙充几鍑轰綅缃畕liftPosition}锛屽彸浼稿嚭浣嶇疆{rigtpostition}");
                 }
                 else if (ExtendedState == "缂╁洖")
                 {
-                    devices.Value.left.Communicator.Write<int>("D1001", ext);//宸LC鑷姩浼稿嚭缂╁洖閫熷害
-                    devices.Value.left.Communicator.Write<bool>("M103", true);//缂╁洖鎸夐挳
-                    devices.Value.right.Communicator.Write<int>("D1001", ret);//鍙砅LC鑷姩浼稿嚭缂╁洖閫熷害
-                    devices.Value.right.Communicator.Write<bool>("M103", true);//缂╁洖鎸夐挳
+                    try
+                    {
+                        devices.Value.left.Communicator.Write<int>("D1001", ext);//宸LC鑷姩浼稿嚭缂╁洖閫熷害
+                        devices.Value.left.Communicator.Write<bool>("M103", true);//缂╁洖鎸夐挳
+                    }
+                    catch (Exception)
+                    {
+
+                    }
+                    try
+                    {
+                        devices.Value.right.Communicator.Write<int>("D1001", ret);//鍙砅LC鑷姩浼稿嚭缂╁洖閫熷害
+                        devices.Value.right.Communicator.Write<bool>("M103", true);//缂╁洖鎸夐挳
+                    }
+                    catch (Exception)
+                    {
+
+                    }
+                    
                     Console.WriteLine($"鑷姩浼哥缉鏉嗙缉鍥� {ret}");
                 }
+
                 else
                 {
                     return new WebResponseContent { Status = false, Message = "鏈煡鐨勬搷浣滃懡浠�" };
@@ -124,18 +183,49 @@
                 var para = BaseDal.QueryData().Where(x => x.Deptid == deid).OrderByDescending(x => x.CreateDate).FirstOrDefault();
                 int ext = (int)para.ManualExtend;//宸LC鎵嬪姩浼稿嚭缂╁洖閫熷害
                 int ret = (int)para.ManualRetraction;//鍙砅LC鎵嬪姩浼稿嚭缂╁洖閫熷害
+                try
+                {
+                    var leftorigin = devices.Value.left.Communicator.Read<bool>("M115");//宸lc鍒板師鐐逛綅缃俊鍙�
+                    var rightorigin = devices.Value.right.Communicator.Read<bool>("M115");//鍙硃lc鍒拌揪鍘熺偣浣嶇疆淇″彿
+                    if (leftorigin == true || rightorigin == true)
+                    {
+                        return new WebResponseContent { Status = false, Message = "宸插埌鍘熷鐐�" };
+                    }
+                }
+                catch (Exception)
+                {
+
+                    
+                }
+                try
+                {
+                    var lefttarget = devices.Value.left.Communicator.Read<bool>("M116");//宸lc鍒拌揪鐩爣浣嶇疆
+                    var righttarget = devices.Value.right.Communicator.Read<bool>("M116");//鍙硃lc鍒拌揪鐩爣浣嶇疆
+                    if (lefttarget == true || righttarget == true)
+                    {
+                        return new WebResponseContent { Status = false, Message = "宸插埌鏈�澶у��" };
+                    }
+
+                }
+                catch (Exception)
+                {
+
+                    
+                }
+              
+
                 if (position == "宸�" && ExtendedState == "浼稿嚭")
                 {
                     devices.Value.left.Communicator.Write<int>("D1000", ext);//宸LC鎵嬪姩浼稿嚭缂╁洖閫熷害
                     devices.Value.left.Communicator.Write<bool>("M100", true);//浼稿嚭鎸夐挳
-                    Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄤ几鍑虹缉鍥瀧ext}");
+                    Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄤ几鍑簕ext}");
                 }
                 else if (position == "宸�" && ExtendedState == "缂╁洖")
                 {
                     devices.Value.left.Communicator.Write<int>("D1000", ext);//宸LC鎵嬪姩浼稿嚭缂╁洖閫熷害
                     devices.Value.left.Communicator.Write<bool>("M101", true);
                  
-                    Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄤ几鍑虹缉鍥瀧ext}");
+                    Console.WriteLine($"{position}浼哥缉鏉嗘墜鍔ㄧ缉鍥瀧ext}");
                 }
                 else if (position == "鍙�" && ExtendedState == "浼稿嚭")
                 {
@@ -156,7 +246,7 @@
                         ManualExtend = ext,
                         ManualRetraction = ret
                     }
-                };//杩欓噷瑕佸姞杩斿洖閫熷害
+                };
             }
             catch (Exception ex)
             {
@@ -244,8 +334,26 @@
                     return new WebResponseContent { Status = false, Message = "閰嶇疆椤� DepartmentID 鏃犳硶杞崲涓烘暣鏁�" };
                 };
                 var devices = GetDevicesByDeptId(deid);
-                devices.Value.left.Communicator.Write<bool>("M104", true);
-                devices.Value.right.Communicator.Write<bool>("M104", true);
+                try
+                {
+                    devices.Value.left.Communicator.Write<bool>("M104", true);
+                }
+                catch (Exception)
+                {
+
+                  
+                }
+                try
+                {
+                    devices.Value.right.Communicator.Write<bool>("M104", true);
+                }
+                catch (Exception)
+                {
+
+                   
+                }
+               
+                
                 return new WebResponseContent { Status =true,Message="鏆傚仠鎴愬姛",Data = devices};
             }
             catch (Exception ex)
@@ -340,9 +448,13 @@
             return (left, right);
         }
 
-      
 
-     
+
+
+
+
+
+
     }
 
 }

--
Gitblit v1.9.3