Преглед изворни кода

2022/11/21 增加流程显示

wk пре 2 година
родитељ
комит
d9235087c8

+ 1 - 1
终端/ct_terminal/ct_terminal/MainForm.Designer.cs

@@ -271,7 +271,7 @@
             this.AllowDrop = true;
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.AutoScroll = true;
-            this.ClientSize = new System.Drawing.Size(1097, 1100);
+            this.ClientSize = new System.Drawing.Size(745, 1044);
             this.Controls.Add(this.MainPanel);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Name = "MainForm";

+ 12 - 12
终端/ct_terminal/ct_terminal/MainForm.cs

@@ -83,15 +83,15 @@ namespace ct_terminal
             m_car_number_condition = true;
             m_car_number_thread = new Thread(get_car_number_thread);
 
-            //初始化发送指令
-            m_producer.producer_init(m_rabbitmq_ip, m_rabbitmq_port, m_rabbitmq_user, m_rabbitmq_password);
-            //初始化消费指令
-            string t_park_queue_key = "park_response_" + m_ternimalID.ToString() + "_queue";
-            m_park_consumer.consumer_init(m_rabbitmq_ip, m_rabbitmq_port, m_rabbitmq_user, m_rabbitmq_password, t_park_queue_key, park_response_thread);
-            //初始化消费指令
-            string t_ex_name = "command_ex";
-            string t_pick_queue_key = "pick_response_port";
-            m_pick_consumer.consumer_undurable_init(m_rabbitmq_ip, m_rabbitmq_port, m_rabbitmq_user, m_rabbitmq_password, t_ex_name, t_pick_queue_key, pick_response_thread);
+            //    //初始化发送指令
+            //    m_producer.producer_init(m_rabbitmq_ip, m_rabbitmq_port, m_rabbitmq_user, m_rabbitmq_password);
+            //    //初始化消费指令
+            //    string t_park_queue_key = "park_response_" + m_ternimalID.ToString() + "_queue";
+            //    m_park_consumer.consumer_init(m_rabbitmq_ip, m_rabbitmq_port, m_rabbitmq_user, m_rabbitmq_password, t_park_queue_key, park_response_thread);
+            //    //初始化消费指令
+            //    string t_ex_name = "command_ex";
+            //    string t_pick_queue_key = "pick_response_port";
+            //    m_pick_consumer.consumer_undurable_init(m_rabbitmq_ip, m_rabbitmq_port, m_rabbitmq_user, m_rabbitmq_password, t_ex_name, t_pick_queue_key, pick_response_thread);
         }
         private void MainForm_Load(object sender, EventArgs e)
         {
@@ -111,9 +111,9 @@ namespace ct_terminal
             m_car_number_thread.Start();
             //启动打印机
             PrintManual.Instance.Start();
-            //启动接受反馈
-            m_park_consumer.run();
-            m_pick_consumer.run();
+            ////启动接受反馈
+            //m_park_consumer.run();
+            //m_pick_consumer.run();
 
             //启动子程序
             Process[] myprocess = Process.GetProcessesByName("UnNomalized_node");

+ 31 - 31
终端/ct_terminal/ct_terminal/tool/num_machine/NumMachine.cs

@@ -539,37 +539,37 @@ namespace NumMachine
         /// <param name="message">已完成车辆的号牌相关信息存于message的aNode中,用于标记需清空的号牌</param>
         public void SetMessage(NumberMachineMessage message)
         {
-            //NumberMachineNode n = ((NumberMachineMessage)message).aNode;
-            //lock (LicBuffer)
-            //{
-            //    //输入号牌格式无误
-            //    if (n != null && n.ip != null && n.ip == "")
-            //    {
-            //        //与类成员变量中aNode号牌相同,将其ip复位表示已使用,重新入队等待清除
-            //        if (nmMsg != null && nmMsg.aNode != null && nmMsg.aNode.LicenseNum == n.LicenseNum)
-            //        {
-            //            nmMsg.aNode.ip = "";
-            //            LicBuffer.Enqueue((NumberMachineNode)nmMsg.aNode.Clone());
-            //            nmMsg.aNode = null;
-            //        }
-            //        //搜索号牌队列,将相应号牌置空,准备清除
-            //        else
-            //        {
-            //            for (int i = 0; i < LicBuffer.Count; i++)
-            //            {
-            //                NumberMachineNode temp = LicBuffer.Dequeue();
-            //                //已匹配上,ip置空
-            //                if (temp.LicenseNum == n.LicenseNum)
-            //                {
-            //                    temp.ip = "";
-            //                    LicBuffer.Enqueue(temp);
-            //                    break;
-            //                }
-            //                LicBuffer.Enqueue(temp);
-            //            }
-            //        }
-            //    }
-            //}
+            NumberMachineNode n = ((NumberMachineMessage)message).aNode;
+            lock (LicBuffer)
+            {
+                //输入号牌格式无误
+                if (n != null && n.ip != null && n.ip == "")
+                {
+                    //与类成员变量中aNode号牌相同,将其ip复位表示已使用,重新入队等待清除
+                    if (nmMsg != null && nmMsg.aNode != null && nmMsg.aNode.LicenseNum == n.LicenseNum)
+                    {
+                        nmMsg.aNode.ip = "";
+                        LicBuffer.Enqueue((NumberMachineNode)nmMsg.aNode.Clone());
+                        nmMsg.aNode = null;
+                    }
+                    //搜索号牌队列,将相应号牌置空,准备清除
+                    else
+                    {
+                        for (int i = 0; i < LicBuffer.Count; i++)
+                        {
+                            NumberMachineNode temp = LicBuffer.Dequeue();
+                            //已匹配上,ip置空
+                            if (temp.LicenseNum == n.LicenseNum)
+                            {
+                                temp.ip = "";
+                                LicBuffer.Enqueue(temp);
+                                break;
+                            }
+                            LicBuffer.Enqueue(temp);
+                        }
+                    }
+                }
+            }
         }
 
         /// <summary>