From 3c09e83246ac9866f6a38b1739436f0833565e1f Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期三, 16 十月 2024 11:10:01 +0800
Subject: [PATCH] 报警信息修改

---
 Admin.NET/WCS.Application/PLC/PLCCommon.cs |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Admin.NET/WCS.Application/PLC/PLCCommon.cs b/Admin.NET/WCS.Application/PLC/PLCCommon.cs
index 6c37916..e020f08 100644
--- a/Admin.NET/WCS.Application/PLC/PLCCommon.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCCommon.cs
@@ -329,7 +329,7 @@
     {
         string strIp = "";
         var conveyList1 = new List<string>() { "147", "145", "139", "137", "129", "127", "121", "119", "111", "109", "103", "101", "093", "091", "085", "083", "075", "073", "067", "065","033" };
-        var conveyList2 = new List<string>() { "252", "254", "260", "262", "270", "272", "278", "280", "288", "290", "294", "301", "307", "309", "315", "317", "325", "327", "331", "337" };
+        var conveyList2 = new List<string>() { "205", "234", "252", "254", "260", "262", "270", "272", "278", "280", "288", "290", "294", "301", "307", "309", "315", "317", "325", "327", "331", "337" };
         var conveyList3 = new List<string>() { "401", "402", "405", "406", "409", "410", "413", "414", "417", "418", "421", "422", "425", "426", "429", "430", "433", "434", "437", "438" };
         if (conveyList1.Contains(startStation))
         {
@@ -432,7 +432,10 @@
         taskInfo.EndPai = paiVal.ToString();
         taskInfo.EndCeng = cengNum.ToString();
         taskInfo.EndLie = lieNum.ToString() ;
-
+        if (taskInfo.EndPai == "0" || taskInfo.EndCeng == "0" || taskInfo.EndLie == "0")
+        {
+            throw new Exception("鎺掑垪灞傝浆鎹㈠け璐�");
+        }
         return taskInfo;
     }
     
@@ -878,7 +881,10 @@
                 }
             }
         }
-
+        if (paiVal == 0)
+        {
+            throw new Exception("鎺掕浆鎹㈠け璐�");
+        }
         return paiVal;
 
     }

--
Gitblit v1.8.0