1.初版差异提交

2026-08-19 17:02:08 +08:00
parent 6f8dae2d02
commit 92c0d2e8d5
24 changed files with 507 additions and 27 deletions
@@ -31,6 +31,14 @@ namespace AGVSystem
        public static ClsDBConn_sql db_station = new ClsDBConn_sql();
        public static ClsDBConn_sql db_Agv_Info = new ClsDBConn_sql();
        public static BusinessManage businessCtrl;
+        /// <summary>
+        /// 第三方交管自动归还秒数
+        /// </summary>
+        public static int TraffAutoTimet = 0;
+        /// <summary>
+        /// 第三方交管路口占用列表
+        /// </summary>
+        public static List<TrafficModel> autoLeavedDic = new List<TrafficModel>();
        public static Dictionary<int, int> leavedDic = new Dictionary<int, int>();
        /// <summary>
        /// Array_Station_Info [17,12]
@@ -111,6 +119,22 @@ namespace AGVSystem
            mainfrm.Map2 = panel2;
            mainfrm.Map3 = panel1;
            businessCtrl = new BusinessManage();
+            //初始化第三方交管路口占用列表
+            if (businessCtrl != null && businessCtrl.apiModel != null)
+            {
+                TraffAutoTimet = businessCtrl.apiModel.AutoTime;
+                if (!string.IsNullOrEmpty(businessCtrl.apiModel.waitRfidList))
+                {
+                    autoLeavedDic = new List<TrafficModel>();
+                    foreach (string areaCode in businessCtrl.apiModel.waitRfidList.Split(','))
+                    {
+                        autoLeavedDic.Add(new TrafficModel
+                        {
+                            areaCode = areaCode
+                        });
+                    }
+                }
+            }
            this.ControlBox = false;
            this.Width = mainfrm.newmainfrm.ClientSize.Width - 5;
            this.Height = mainfrm.newmainfrm.ClientSize.Height - 29 - 74 - 22 - 5;
@@ -304,6 +328,10 @@ namespace AGVSystem
            Thread dbThread = new Thread(UPDateDBList.UpDateDb);
            dbThread.IsBackground = true;
            dbThread.Start();
+            //第三方交管自动归还监听线程
+            Thread trafficThread = new Thread(TrafficCtrl.Listen);
+            trafficThread.IsBackground = true;
+            trafficThread.Start();
            //初始化小车控制线程
            Cls.Param.th_GetData = new Thread[Cls.Param.AGV_Qty];