增加支付信息筛选、显示与对db和终端数据修改功能

PLCLinker/centralController/App.config

@@ -8,10 +8,10 @@
     <add key="defaultLic" value="鄂ZZZZZZ"/>
     <!--数据库信息-->
     <!--<add key="remoteDBConnStr" value="Data Source=59.175.148.85;port=3306;uid=root;pooling=true;max pool size=1024;pwd=x5;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>-->
-    <add key="remoteDBConnStr" value="Data Source=192.168.0.152;port=3306;uid=root;pooling=true;max pool size=1024;pwd=x5;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>
-    <!--<add key="remoteDBConnStr" value="Data Source=127.0.0.1;port=20000;uid=root;pooling=true;max pool size=1024;pwd=yct;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>-->
+    <!--<add key="remoteDBConnStr" value="Data Source=192.168.0.152;port=3306;uid=root;pooling=true;max pool size=1024;pwd=x5;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>-->
+    <add key="remoteDBConnStr" value="Data Source=127.0.0.1;port=20000;uid=root;pooling=true;max pool size=1024;pwd=yct;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>
     <!--<add key="remoteDBConnStr" value="Data Source=192.168.10.106;port=3306;uid=remote;pooling=true;max pool size=1024;pwd=x5;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>-->
-    <add key="localDBConnStr" value="Data Source=127.0.0.1;port=3306;uid=root;pooling=true;max pool size=1024;pwd=;database=zxpark_local;CharSet=utf8;Allow Zero Datetime=true;"/>
+    <add key="localDBConnStr" value="Data Source=127.0.0.1;port=20000;uid=root;pooling=true;max pool size=1024;pwd=yct;database=zxpark_local;CharSet=utf8;Allow Zero Datetime=true;"/>
     <add key="DBtimeout" value="3"/>
     <!--号牌机信息-->
     <add key="192.168.0.51" value="2"/>
@@ -19,7 +19,8 @@
     <add key="filterRatio" value="0.6"/>
     <!--PLC基本配置-->
     <!--<add key="PLC_ip_address" value="192.168.0.10" />-->
-    <add key="plcIpAddress" value="192.168.0.1" />
+    <!--<add key="plcIpAddress" value="192.168.0.1" />-->
+    <add key="plcIpAddress" value="192.168.2.178" />
     <add key="plcRack" value="0" />
     <add key="plcSlot" value="1" />
     <!--PLCdb块，分别对应终端、中控、车位-->

PLCLinker/centralController/FormCentralController.Designer.cs

@@ -30,11 +30,32 @@
         {
             this.components = new System.ComponentModel.Container();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(centralController));
             this.dotNetBarManager1 = new DevComponents.DotNetBar.DotNetBarManager(this.components);
             this.dockSite4 = new DevComponents.DotNetBar.DockSite();
             this.dockSite_mainView = new DevComponents.DotNetBar.DockSite();
             this.bar_mainWin = new DevComponents.DotNetBar.Bar();
+            this.paymentPanel = new DevComponents.DotNetBar.PanelDockContainer();
+            this.dgvx_payment = new DevComponents.DotNetBar.Controls.DataGridViewX();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.tlp_paymentFilter = new System.Windows.Forms.TableLayoutPanel();
+            this.dtp_paymentEndDate = new System.Windows.Forms.DateTimePicker();
+            this.lbx_paymentStartDate = new DevComponents.DotNetBar.LabelX();
+            this.lbx_paymentEndDate = new DevComponents.DotNetBar.LabelX();
+            this.btnx_paymentSearch = new DevComponents.DotNetBar.ButtonX();
+            this.lbx_paymentLicense = new DevComponents.DotNetBar.LabelX();
+            this.tb_paymentLicense = new System.Windows.Forms.TextBox();
+            this.dtp_paymentStartDate = new System.Windows.Forms.DateTimePicker();
+            this.ParkingSpaceMonitorPanel = new DevComponents.DotNetBar.PanelDockContainer();
             this.testPanel = new DevComponents.DotNetBar.PanelDockContainer();
             this.button3 = new System.Windows.Forms.Button();
             this.groupPanel2 = new DevComponents.DotNetBar.Controls.GroupPanel();
@@ -51,10 +72,6 @@
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.labelX1 = new DevComponents.DotNetBar.LabelX();
-            this.NumMachineMonitorPanel = new DevComponents.DotNetBar.PanelDockContainer();
-            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
-            this.paymentPanel = new DevComponents.DotNetBar.PanelDockContainer();
-            this.ParkingSpaceMonitorPanel = new DevComponents.DotNetBar.PanelDockContainer();
             this.pdc_devStatus = new DevComponents.DotNetBar.PanelDockContainer();
             this.panel1 = new System.Windows.Forms.Panel();
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
@@ -62,6 +79,8 @@
             this.lbx_PLCStatus = new DevComponents.DotNetBar.LabelX();
             this.lbx_PLC = new DevComponents.DotNetBar.LabelX();
             this.lbx_web = new DevComponents.DotNetBar.LabelX();
+            this.NumMachineMonitorPanel = new DevComponents.DotNetBar.PanelDockContainer();
+            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
             this.dci_NumMachine = new DevComponents.DotNetBar.DockContainerItem();
             this.dci_payment = new DevComponents.DotNetBar.DockContainerItem();
             this.dci_ParkingSpace = new DevComponents.DotNetBar.DockContainerItem();
@@ -143,6 +162,9 @@
             this.dockSite_mainView.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bar_mainWin)).BeginInit();
             this.bar_mainWin.SuspendLayout();
+            this.paymentPanel.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvx_payment)).BeginInit();
+            this.tlp_paymentFilter.SuspendLayout();
             this.testPanel.SuspendLayout();
             this.groupPanel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
@@ -152,10 +174,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
             this.tableLayoutPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
-            this.NumMachineMonitorPanel.SuspendLayout();
             this.pdc_devStatus.SuspendLayout();
             this.panel1.SuspendLayout();
             this.tableLayoutPanel2.SuspendLayout();
+            this.NumMachineMonitorPanel.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.bar_bottom)).BeginInit();
             this.bar_bottom.SuspendLayout();
             this.RecordsMonitorPanel.SuspendLayout();
@@ -203,9 +225,9 @@
             this.dockSite4.AccessibleRole = System.Windows.Forms.AccessibleRole.Window;
             this.dockSite4.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.dockSite4.DocumentDockContainer = new DevComponents.DotNetBar.DocumentDockContainer();
-            this.dockSite4.Location = new System.Drawing.Point(0, 668);
+            this.dockSite4.Location = new System.Drawing.Point(0, 749);
             this.dockSite4.Name = "dockSite4";
-            this.dockSite4.Size = new System.Drawing.Size(1194, 0);
+            this.dockSite4.Size = new System.Drawing.Size(1344, 0);
             this.dockSite4.TabIndex = 3;
             this.dockSite4.TabStop = false;
             // 
@@ -218,12 +240,12 @@
             this.dockSite_mainView.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dockSite_mainView.DocumentDockContainer = new DevComponents.DotNetBar.DocumentDockContainer(new DevComponents.DotNetBar.DocumentBaseContainer[] {
             ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentDockContainer(new DevComponents.DotNetBar.DocumentBaseContainer[] {
-                        ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_mainWin, 503, 415))),
-                        ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_side, 360, 415)))}, DevComponents.DotNetBar.eOrientation.Horizontal))),
-            ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_bottom, 849, 242)))}, DevComponents.DotNetBar.eOrientation.Vertical);
+                        ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_mainWin, 624, 391))),
+                        ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_side, 256, 391)))}, DevComponents.DotNetBar.eOrientation.Horizontal))),
+            ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_bottom, 886, 153)))}, DevComponents.DotNetBar.eOrientation.Vertical);
             this.dockSite_mainView.Location = new System.Drawing.Point(0, 121);
             this.dockSite_mainView.Name = "dockSite_mainView";
-            this.dockSite_mainView.Size = new System.Drawing.Size(849, 547);
+            this.dockSite_mainView.Size = new System.Drawing.Size(1033, 628);
             this.dockSite_mainView.TabIndex = 8;
             this.dockSite_mainView.TabStop = false;
             // 
@@ -241,10 +263,10 @@
             this.bar_mainWin.CanDockRight = false;
             this.bar_mainWin.CanDockTop = false;
             this.bar_mainWin.CanHide = true;
-            this.bar_mainWin.Controls.Add(this.testPanel);
+            this.bar_mainWin.Controls.Add(this.ParkingSpaceMonitorPanel);
             this.bar_mainWin.Controls.Add(this.NumMachineMonitorPanel);
             this.bar_mainWin.Controls.Add(this.paymentPanel);
-            this.bar_mainWin.Controls.Add(this.ParkingSpaceMonitorPanel);
+            this.bar_mainWin.Controls.Add(this.testPanel);
             this.bar_mainWin.Controls.Add(this.pdc_devStatus);
             this.bar_mainWin.DockTabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Top;
             this.bar_mainWin.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -258,15 +280,264 @@
             this.bar_mainWin.LayoutType = DevComponents.DotNetBar.eLayoutType.DockContainer;
             this.bar_mainWin.Location = new System.Drawing.Point(0, 0);
             this.bar_mainWin.Name = "bar_mainWin";
-            this.bar_mainWin.SelectedDockTab = 3;
+            this.bar_mainWin.SelectedDockTab = 2;
             this.bar_mainWin.SingleLineColor = System.Drawing.SystemColors.ControlDarkDark;
-            this.bar_mainWin.Size = new System.Drawing.Size(493, 287);
+            this.bar_mainWin.Size = new System.Drawing.Size(730, 418);
             this.bar_mainWin.Stretch = true;
             this.bar_mainWin.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
             this.bar_mainWin.TabIndex = 0;
             this.bar_mainWin.TabNavigation = true;
             this.bar_mainWin.TabStop = false;
             // 
+            // paymentPanel
+            // 
+            this.paymentPanel.Controls.Add(this.dgvx_payment);
+            this.paymentPanel.Controls.Add(this.tlp_paymentFilter);
+            this.paymentPanel.DisabledBackColor = System.Drawing.Color.Empty;
+            this.paymentPanel.Location = new System.Drawing.Point(3, 28);
+            this.paymentPanel.Name = "paymentPanel";
+            this.paymentPanel.Size = new System.Drawing.Size(724, 387);
+            this.paymentPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.paymentPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            this.paymentPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+            this.paymentPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.paymentPanel.Style.GradientAngle = 90;
+            this.paymentPanel.TabIndex = 24;
+            // 
+            // dgvx_payment
+            // 
+            this.dgvx_payment.BackgroundColor = System.Drawing.SystemColors.ActiveCaption;
+            this.dgvx_payment.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dgvx_payment.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.dataGridViewTextBoxColumn1,
+            this.dataGridViewTextBoxColumn2,
+            this.dataGridViewTextBoxColumn3,
+            this.dataGridViewTextBoxColumn4,
+            this.dataGridViewTextBoxColumn5,
+            this.dataGridViewTextBoxColumn6,
+            this.dataGridViewTextBoxColumn7,
+            this.dataGridViewTextBoxColumn8,
+            this.dataGridViewTextBoxColumn9});
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvx_payment.DefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvx_payment.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvx_payment.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
+            this.dgvx_payment.Location = new System.Drawing.Point(0, 66);
+            this.dgvx_payment.MinimumSize = new System.Drawing.Size(389, 0);
+            this.dgvx_payment.Name = "dgvx_payment";
+            this.dgvx_payment.RowTemplate.Height = 23;
+            this.dgvx_payment.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvx_payment.Size = new System.Drawing.Size(724, 321);
+            this.dgvx_payment.TabIndex = 4;
+            this.dgvx_payment.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvx_payment_CellEndEdit);
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.HeaderText = "停车记录ID";
+            this.dataGridViewTextBoxColumn1.MaxInputLength = 11;
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            this.dataGridViewTextBoxColumn1.Visible = false;
+            this.dataGridViewTextBoxColumn1.Width = 90;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.HeaderText = "用户ID";
+            this.dataGridViewTextBoxColumn2.MaxInputLength = 8;
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            this.dataGridViewTextBoxColumn2.Width = 70;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.HeaderText = "号牌";
+            this.dataGridViewTextBoxColumn3.MaxInputLength = 9;
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn3.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn4
+            // 
+            this.dataGridViewTextBoxColumn4.HeaderText = "车位编号";
+            this.dataGridViewTextBoxColumn4.MaxInputLength = 4;
+            this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
+            this.dataGridViewTextBoxColumn4.ReadOnly = true;
+            this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn4.Visible = false;
+            this.dataGridViewTextBoxColumn4.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.HeaderText = "实际停入时间";
+            this.dataGridViewTextBoxColumn5.MaxInputLength = 50;
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.ReadOnly = true;
+            this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn5.Width = 140;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.HeaderText = "实际取出时间";
+            this.dataGridViewTextBoxColumn6.MaxInputLength = 50;
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.ReadOnly = true;
+            this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn6.Width = 140;
+            // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.HeaderText = "凭证号";
+            this.dataGridViewTextBoxColumn7.MaxInputLength = 8;
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.ReadOnly = true;
+            this.dataGridViewTextBoxColumn7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn7.Width = 90;
+            // 
+            // dataGridViewTextBoxColumn8
+            // 
+            this.dataGridViewTextBoxColumn8.HeaderText = "停车费用";
+            this.dataGridViewTextBoxColumn8.MaxInputLength = 11;
+            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+            this.dataGridViewTextBoxColumn8.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn9
+            // 
+            this.dataGridViewTextBoxColumn9.HeaderText = "收费状态";
+            this.dataGridViewTextBoxColumn9.MaxInputLength = 11;
+            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+            this.dataGridViewTextBoxColumn9.Width = 80;
+            // 
+            // tlp_paymentFilter
+            // 
+            this.tlp_paymentFilter.ColumnCount = 7;
+            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
+            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F));
+            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
+            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F));
+            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
+            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33332F));
+            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
+            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.tlp_paymentFilter.Controls.Add(this.dtp_paymentEndDate, 3, 0);
+            this.tlp_paymentFilter.Controls.Add(this.lbx_paymentStartDate, 0, 0);
+            this.tlp_paymentFilter.Controls.Add(this.lbx_paymentEndDate, 2, 0);
+            this.tlp_paymentFilter.Controls.Add(this.btnx_paymentSearch, 6, 0);
+            this.tlp_paymentFilter.Controls.Add(this.lbx_paymentLicense, 4, 0);
+            this.tlp_paymentFilter.Controls.Add(this.tb_paymentLicense, 5, 0);
+            this.tlp_paymentFilter.Controls.Add(this.dtp_paymentStartDate, 1, 0);
+            this.tlp_paymentFilter.Dock = System.Windows.Forms.DockStyle.Top;
+            this.tlp_paymentFilter.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tlp_paymentFilter.Location = new System.Drawing.Point(0, 0);
+            this.tlp_paymentFilter.Name = "tlp_paymentFilter";
+            this.tlp_paymentFilter.RowCount = 1;
+            this.tlp_paymentFilter.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tlp_paymentFilter.Size = new System.Drawing.Size(724, 66);
+            this.tlp_paymentFilter.TabIndex = 3;
+            // 
+            // dtp_paymentEndDate
+            // 
+            this.dtp_paymentEndDate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.dtp_paymentEndDate.CalendarFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtp_paymentEndDate.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtp_paymentEndDate.Location = new System.Drawing.Point(301, 20);
+            this.dtp_paymentEndDate.Name = "dtp_paymentEndDate";
+            this.dtp_paymentEndDate.Size = new System.Drawing.Size(122, 26);
+            this.dtp_paymentEndDate.TabIndex = 12;
+            // 
+            // lbx_paymentStartDate
+            // 
+            // 
+            // 
+            // 
+            this.lbx_paymentStartDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lbx_paymentStartDate.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbx_paymentStartDate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lbx_paymentStartDate.Location = new System.Drawing.Point(3, 3);
+            this.lbx_paymentStartDate.Name = "lbx_paymentStartDate";
+            this.lbx_paymentStartDate.Size = new System.Drawing.Size(79, 60);
+            this.lbx_paymentStartDate.TabIndex = 3;
+            this.lbx_paymentStartDate.Text = "起始日期:";
+            // 
+            // lbx_paymentEndDate
+            // 
+            // 
+            // 
+            // 
+            this.lbx_paymentEndDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lbx_paymentEndDate.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbx_paymentEndDate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lbx_paymentEndDate.Location = new System.Drawing.Point(216, 3);
+            this.lbx_paymentEndDate.Name = "lbx_paymentEndDate";
+            this.lbx_paymentEndDate.Size = new System.Drawing.Size(79, 60);
+            this.lbx_paymentEndDate.TabIndex = 4;
+            this.lbx_paymentEndDate.Text = "截止日期:";
+            // 
+            // btnx_paymentSearch
+            // 
+            this.btnx_paymentSearch.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnx_paymentSearch.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.btnx_paymentSearch.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnx_paymentSearch.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnx_paymentSearch.Location = new System.Drawing.Point(641, 15);
+            this.btnx_paymentSearch.Name = "btnx_paymentSearch";
+            this.btnx_paymentSearch.Size = new System.Drawing.Size(74, 35);
+            this.btnx_paymentSearch.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnx_paymentSearch.TabIndex = 7;
+            this.btnx_paymentSearch.Text = "查询";
+            this.btnx_paymentSearch.Click += new System.EventHandler(this.btnx_paymentSearch_Click);
+            // 
+            // lbx_paymentLicense
+            // 
+            // 
+            // 
+            // 
+            this.lbx_paymentLicense.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lbx_paymentLicense.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbx_paymentLicense.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lbx_paymentLicense.Location = new System.Drawing.Point(429, 3);
+            this.lbx_paymentLicense.Name = "lbx_paymentLicense";
+            this.lbx_paymentLicense.Size = new System.Drawing.Size(79, 60);
+            this.lbx_paymentLicense.TabIndex = 9;
+            this.lbx_paymentLicense.Text = "车辆号牌:";
+            // 
+            // tb_paymentLicense
+            // 
+            this.tb_paymentLicense.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.tb_paymentLicense.Location = new System.Drawing.Point(514, 20);
+            this.tb_paymentLicense.Name = "tb_paymentLicense";
+            this.tb_paymentLicense.Size = new System.Drawing.Size(121, 26);
+            this.tb_paymentLicense.TabIndex = 10;
+            // 
+            // dtp_paymentStartDate
+            // 
+            this.dtp_paymentStartDate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.dtp_paymentStartDate.CalendarFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtp_paymentStartDate.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtp_paymentStartDate.Location = new System.Drawing.Point(88, 20);
+            this.dtp_paymentStartDate.Name = "dtp_paymentStartDate";
+            this.dtp_paymentStartDate.Size = new System.Drawing.Size(122, 26);
+            this.dtp_paymentStartDate.TabIndex = 11;
+            // 
+            // ParkingSpaceMonitorPanel
+            // 
+            this.ParkingSpaceMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
+            this.ParkingSpaceMonitorPanel.Location = new System.Drawing.Point(3, 28);
+            this.ParkingSpaceMonitorPanel.Name = "ParkingSpaceMonitorPanel";
+            this.ParkingSpaceMonitorPanel.Size = new System.Drawing.Size(724, 387);
+            this.ParkingSpaceMonitorPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.ParkingSpaceMonitorPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            this.ParkingSpaceMonitorPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+            this.ParkingSpaceMonitorPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.ParkingSpaceMonitorPanel.Style.GradientAngle = 90;
+            this.ParkingSpaceMonitorPanel.TabIndex = 9;
+            // 
             // testPanel
             // 
             this.testPanel.Controls.Add(this.button3);
@@ -281,7 +552,7 @@
             this.testPanel.DisabledBackColor = System.Drawing.Color.Empty;
             this.testPanel.Location = new System.Drawing.Point(3, 28);
             this.testPanel.Name = "testPanel";
-            this.testPanel.Size = new System.Drawing.Size(487, 256);
+            this.testPanel.Size = new System.Drawing.Size(724, 387);
             this.testPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.testPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
             this.testPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
@@ -514,56 +785,6 @@
             this.labelX1.Text = "label1\r\nlable2";
             this.labelX1.TextAlignment = System.Drawing.StringAlignment.Center;
             // 
-            // NumMachineMonitorPanel
-            // 
-            this.NumMachineMonitorPanel.Controls.Add(this.flowLayoutPanel1);
-            this.NumMachineMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
-            this.NumMachineMonitorPanel.Location = new System.Drawing.Point(3, 28);
-            this.NumMachineMonitorPanel.Name = "NumMachineMonitorPanel";
-            this.NumMachineMonitorPanel.Size = new System.Drawing.Size(487, 256);
-            this.NumMachineMonitorPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.NumMachineMonitorPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-            this.NumMachineMonitorPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
-            this.NumMachineMonitorPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
-            this.NumMachineMonitorPanel.Style.GradientAngle = 90;
-            this.NumMachineMonitorPanel.TabIndex = 0;
-            // 
-            // flowLayoutPanel1
-            // 
-            this.flowLayoutPanel1.BackColor = System.Drawing.SystemColors.GradientActiveCaption;
-            this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
-            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
-            this.flowLayoutPanel1.Size = new System.Drawing.Size(487, 256);
-            this.flowLayoutPanel1.TabIndex = 1;
-            this.flowLayoutPanel1.Resize += new System.EventHandler(this.flowLayoutPanel1_Resize);
-            // 
-            // paymentPanel
-            // 
-            this.paymentPanel.DisabledBackColor = System.Drawing.Color.Empty;
-            this.paymentPanel.Location = new System.Drawing.Point(3, 28);
-            this.paymentPanel.Name = "paymentPanel";
-            this.paymentPanel.Size = new System.Drawing.Size(487, 256);
-            this.paymentPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.paymentPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-            this.paymentPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
-            this.paymentPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
-            this.paymentPanel.Style.GradientAngle = 90;
-            this.paymentPanel.TabIndex = 24;
-            // 
-            // ParkingSpaceMonitorPanel
-            // 
-            this.ParkingSpaceMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
-            this.ParkingSpaceMonitorPanel.Location = new System.Drawing.Point(3, 28);
-            this.ParkingSpaceMonitorPanel.Name = "ParkingSpaceMonitorPanel";
-            this.ParkingSpaceMonitorPanel.Size = new System.Drawing.Size(487, 256);
-            this.ParkingSpaceMonitorPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.ParkingSpaceMonitorPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
-            this.ParkingSpaceMonitorPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
-            this.ParkingSpaceMonitorPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
-            this.ParkingSpaceMonitorPanel.Style.GradientAngle = 90;
-            this.ParkingSpaceMonitorPanel.TabIndex = 9;
-            // 
             // pdc_devStatus
             // 
             this.pdc_devStatus.CanvasColor = System.Drawing.SystemColors.GradientInactiveCaption;
@@ -571,7 +792,7 @@
             this.pdc_devStatus.DisabledBackColor = System.Drawing.Color.Empty;
             this.pdc_devStatus.Location = new System.Drawing.Point(3, 28);
             this.pdc_devStatus.Name = "pdc_devStatus";
-            this.pdc_devStatus.Size = new System.Drawing.Size(487, 256);
+            this.pdc_devStatus.Size = new System.Drawing.Size(724, 387);
             this.pdc_devStatus.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.pdc_devStatus.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
             this.pdc_devStatus.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
@@ -586,7 +807,7 @@
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(487, 256);
+            this.panel1.Size = new System.Drawing.Size(724, 387);
             this.panel1.TabIndex = 2;
             // 
             // tableLayoutPanel2
@@ -668,6 +889,30 @@
             this.lbx_web.Text = "web服务器";
             this.lbx_web.TextAlignment = System.Drawing.StringAlignment.Center;
             // 
+            // NumMachineMonitorPanel
+            // 
+            this.NumMachineMonitorPanel.Controls.Add(this.flowLayoutPanel1);
+            this.NumMachineMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
+            this.NumMachineMonitorPanel.Location = new System.Drawing.Point(3, 28);
+            this.NumMachineMonitorPanel.Name = "NumMachineMonitorPanel";
+            this.NumMachineMonitorPanel.Size = new System.Drawing.Size(724, 387);
+            this.NumMachineMonitorPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.NumMachineMonitorPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
+            this.NumMachineMonitorPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
+            this.NumMachineMonitorPanel.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText;
+            this.NumMachineMonitorPanel.Style.GradientAngle = 90;
+            this.NumMachineMonitorPanel.TabIndex = 0;
+            // 
+            // flowLayoutPanel1
+            // 
+            this.flowLayoutPanel1.BackColor = System.Drawing.SystemColors.GradientActiveCaption;
+            this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+            this.flowLayoutPanel1.Size = new System.Drawing.Size(724, 387);
+            this.flowLayoutPanel1.TabIndex = 1;
+            this.flowLayoutPanel1.Resize += new System.EventHandler(this.flowLayoutPanel1_Resize);
+            // 
             // dci_NumMachine
             // 
             this.dci_NumMachine.Control = this.NumMachineMonitorPanel;
@@ -720,10 +965,10 @@
             this.bar_bottom.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.dci_ParkingRecords});
             this.bar_bottom.LayoutType = DevComponents.DotNetBar.eLayoutType.DockContainer;
-            this.bar_bottom.Location = new System.Drawing.Point(0, 290);
+            this.bar_bottom.Location = new System.Drawing.Point(0, 421);
             this.bar_bottom.Name = "bar_bottom";
             this.bar_bottom.SelectedDockTab = 0;
-            this.bar_bottom.Size = new System.Drawing.Size(849, 257);
+            this.bar_bottom.Size = new System.Drawing.Size(1033, 207);
             this.bar_bottom.Stretch = true;
             this.bar_bottom.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
             this.bar_bottom.TabIndex = 1;
@@ -735,7 +980,7 @@
             this.RecordsMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
             this.RecordsMonitorPanel.Location = new System.Drawing.Point(3, 28);
             this.RecordsMonitorPanel.Name = "RecordsMonitorPanel";
-            this.RecordsMonitorPanel.Size = new System.Drawing.Size(843, 226);
+            this.RecordsMonitorPanel.Size = new System.Drawing.Size(1027, 176);
             this.RecordsMonitorPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.RecordsMonitorPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
             this.RecordsMonitorPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
@@ -757,20 +1002,20 @@
             this.receiptNum,
             this.parkingPrice,
             this.paymentStatus});
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvx_parkingRecords.DefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvx_parkingRecords.DefaultCellStyle = dataGridViewCellStyle2;
             this.dgvx_parkingRecords.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvx_parkingRecords.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
             this.dgvx_parkingRecords.Location = new System.Drawing.Point(0, 0);
             this.dgvx_parkingRecords.Name = "dgvx_parkingRecords";
             this.dgvx_parkingRecords.RowTemplate.Height = 23;
-            this.dgvx_parkingRecords.Size = new System.Drawing.Size(843, 226);
+            this.dgvx_parkingRecords.Size = new System.Drawing.Size(1027, 176);
             this.dgvx_parkingRecords.TabIndex = 0;
             // 
             // parkingRecordsID
@@ -874,11 +1119,11 @@
             this.bar_side.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
             this.dci_terminal});
             this.bar_side.LayoutType = DevComponents.DotNetBar.eLayoutType.DockContainer;
-            this.bar_side.Location = new System.Drawing.Point(496, 0);
+            this.bar_side.Location = new System.Drawing.Point(733, 0);
             this.bar_side.Name = "bar_side";
             this.bar_side.SelectedDockTab = 0;
             this.bar_side.SingleLineColor = System.Drawing.SystemColors.ActiveCaptionText;
-            this.bar_side.Size = new System.Drawing.Size(353, 287);
+            this.bar_side.Size = new System.Drawing.Size(300, 418);
             this.bar_side.Stretch = true;
             this.bar_side.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
             this.bar_side.TabIndex = 2;
@@ -890,7 +1135,7 @@
             this.terminalMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
             this.terminalMonitorPanel.Location = new System.Drawing.Point(3, 28);
             this.terminalMonitorPanel.Name = "terminalMonitorPanel";
-            this.terminalMonitorPanel.Size = new System.Drawing.Size(347, 256);
+            this.terminalMonitorPanel.Size = new System.Drawing.Size(294, 387);
             this.terminalMonitorPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.terminalMonitorPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
             this.terminalMonitorPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
@@ -905,7 +1150,7 @@
             this.flp_Term.Location = new System.Drawing.Point(0, 0);
             this.flp_Term.Name = "flp_Term";
             this.flp_Term.Padding = new System.Windows.Forms.Padding(5);
-            this.flp_Term.Size = new System.Drawing.Size(347, 256);
+            this.flp_Term.Size = new System.Drawing.Size(294, 387);
             this.flp_Term.TabIndex = 0;
             // 
             // dci_terminal
@@ -922,7 +1167,7 @@
             this.dockSite1.DocumentDockContainer = new DevComponents.DotNetBar.DocumentDockContainer();
             this.dockSite1.Location = new System.Drawing.Point(0, 0);
             this.dockSite1.Name = "dockSite1";
-            this.dockSite1.Size = new System.Drawing.Size(0, 668);
+            this.dockSite1.Size = new System.Drawing.Size(0, 749);
             this.dockSite1.TabIndex = 0;
             this.dockSite1.TabStop = false;
             // 
@@ -933,10 +1178,10 @@
             this.dockSite_notification.Controls.Add(this.bar_notification);
             this.dockSite_notification.Dock = System.Windows.Forms.DockStyle.Right;
             this.dockSite_notification.DocumentDockContainer = new DevComponents.DotNetBar.DocumentDockContainer(new DevComponents.DotNetBar.DocumentBaseContainer[] {
-            ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_notification, 342, 547)))}, DevComponents.DotNetBar.eOrientation.Vertical);
-            this.dockSite_notification.Location = new System.Drawing.Point(849, 121);
+            ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_notification, 308, 628)))}, DevComponents.DotNetBar.eOrientation.Vertical);
+            this.dockSite_notification.Location = new System.Drawing.Point(1033, 121);
             this.dockSite_notification.Name = "dockSite_notification";
-            this.dockSite_notification.Size = new System.Drawing.Size(345, 547);
+            this.dockSite_notification.Size = new System.Drawing.Size(311, 628);
             this.dockSite_notification.TabIndex = 1;
             this.dockSite_notification.TabStop = false;
             // 
@@ -957,7 +1202,7 @@
             this.bar_notification.LayoutType = DevComponents.DotNetBar.eLayoutType.DockContainer;
             this.bar_notification.Location = new System.Drawing.Point(3, 0);
             this.bar_notification.Name = "bar_notification";
-            this.bar_notification.Size = new System.Drawing.Size(342, 547);
+            this.bar_notification.Size = new System.Drawing.Size(308, 628);
             this.bar_notification.Stretch = true;
             this.bar_notification.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
             this.bar_notification.TabIndex = 1;
@@ -971,7 +1216,7 @@
             this.warningPanel.DisabledBackColor = System.Drawing.Color.Empty;
             this.warningPanel.Location = new System.Drawing.Point(3, 23);
             this.warningPanel.Name = "warningPanel";
-            this.warningPanel.Size = new System.Drawing.Size(336, 521);
+            this.warningPanel.Size = new System.Drawing.Size(302, 602);
             this.warningPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.warningPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
             this.warningPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
@@ -989,16 +1234,16 @@
             this.rtb_notification.Location = new System.Drawing.Point(0, 0);
             this.rtb_notification.Name = "rtb_notification";
             this.rtb_notification.ReadOnly = true;
-            this.rtb_notification.Size = new System.Drawing.Size(336, 500);
+            this.rtb_notification.Size = new System.Drawing.Size(302, 581);
             this.rtb_notification.TabIndex = 1;
             this.rtb_notification.Text = "";
             // 
             // progressBar1
             // 
             this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.progressBar1.Location = new System.Drawing.Point(0, 500);
+            this.progressBar1.Location = new System.Drawing.Point(0, 581);
             this.progressBar1.Name = "progressBar1";
-            this.progressBar1.Size = new System.Drawing.Size(336, 21);
+            this.progressBar1.Size = new System.Drawing.Size(302, 21);
             this.progressBar1.Step = 20;
             this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
             this.progressBar1.TabIndex = 0;
@@ -1013,9 +1258,9 @@
             // 
             this.dockSite8.AccessibleRole = System.Windows.Forms.AccessibleRole.Window;
             this.dockSite8.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.dockSite8.Location = new System.Drawing.Point(0, 668);
+            this.dockSite8.Location = new System.Drawing.Point(0, 749);
             this.dockSite8.Name = "dockSite8";
-            this.dockSite8.Size = new System.Drawing.Size(1194, 0);
+            this.dockSite8.Size = new System.Drawing.Size(1344, 0);
             this.dockSite8.TabIndex = 7;
             this.dockSite8.TabStop = false;
             // 
@@ -1025,7 +1270,7 @@
             this.dockSite5.Dock = System.Windows.Forms.DockStyle.Left;
             this.dockSite5.Location = new System.Drawing.Point(0, 0);
             this.dockSite5.Name = "dockSite5";
-            this.dockSite5.Size = new System.Drawing.Size(0, 668);
+            this.dockSite5.Size = new System.Drawing.Size(0, 749);
             this.dockSite5.TabIndex = 4;
             this.dockSite5.TabStop = false;
             // 
@@ -1033,9 +1278,9 @@
             // 
             this.dockSite6.AccessibleRole = System.Windows.Forms.AccessibleRole.Window;
             this.dockSite6.Dock = System.Windows.Forms.DockStyle.Right;
-            this.dockSite6.Location = new System.Drawing.Point(1194, 0);
+            this.dockSite6.Location = new System.Drawing.Point(1344, 0);
             this.dockSite6.Name = "dockSite6";
-            this.dockSite6.Size = new System.Drawing.Size(0, 668);
+            this.dockSite6.Size = new System.Drawing.Size(0, 749);
             this.dockSite6.TabIndex = 5;
             this.dockSite6.TabStop = false;
             // 
@@ -1047,7 +1292,7 @@
             this.dockSite_menu.Dock = System.Windows.Forms.DockStyle.Top;
             this.dockSite_menu.Location = new System.Drawing.Point(0, 0);
             this.dockSite_menu.Name = "dockSite_menu";
-            this.dockSite_menu.Size = new System.Drawing.Size(1194, 121);
+            this.dockSite_menu.Size = new System.Drawing.Size(1344, 121);
             this.dockSite_menu.TabIndex = 6;
             this.dockSite_menu.TabStop = false;
             // 
@@ -1069,7 +1314,7 @@
             this.bar_Menu.Location = new System.Drawing.Point(0, 0);
             this.bar_Menu.MenuBar = true;
             this.bar_Menu.Name = "bar_Menu";
-            this.bar_Menu.Size = new System.Drawing.Size(1194, 26);
+            this.bar_Menu.Size = new System.Drawing.Size(1344, 26);
             this.bar_Menu.Stretch = true;
             this.bar_Menu.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
             this.bar_Menu.TabIndex = 0;
@@ -1274,7 +1519,7 @@
             this.bar_shortcut.Location = new System.Drawing.Point(0, 27);
             this.bar_shortcut.MenuBar = true;
             this.bar_shortcut.Name = "bar_shortcut";
-            this.bar_shortcut.Size = new System.Drawing.Size(1194, 93);
+            this.bar_shortcut.Size = new System.Drawing.Size(1344, 93);
             this.bar_shortcut.Stretch = true;
             this.bar_shortcut.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
             this.bar_shortcut.TabIndex = 1;
@@ -1285,7 +1530,7 @@
             // 
             this.panel_freeSpace.Controls.Add(this.lbx_freeSpace);
             this.panel_freeSpace.Dock = System.Windows.Forms.DockStyle.Right;
-            this.panel_freeSpace.Location = new System.Drawing.Point(866, 0);
+            this.panel_freeSpace.Location = new System.Drawing.Point(1016, 0);
             this.panel_freeSpace.Name = "panel_freeSpace";
             this.panel_freeSpace.Size = new System.Drawing.Size(328, 93);
             this.panel_freeSpace.TabIndex = 3;
@@ -1383,7 +1628,7 @@
             this.dockSite3.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
             this.dockSite3.Location = new System.Drawing.Point(0, 0);
             this.dockSite3.Name = "dockSite3";
-            this.dockSite3.Size = new System.Drawing.Size(1194, 0);
+            this.dockSite3.Size = new System.Drawing.Size(1344, 0);
             this.dockSite3.TabIndex = 2;
             this.dockSite3.TabStop = false;
             // 
@@ -1494,7 +1739,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.AutoSize = true;
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.ClientSize = new System.Drawing.Size(1194, 668);
+            this.ClientSize = new System.Drawing.Size(1344, 749);
             this.Controls.Add(this.dockSite_mainView);
             this.Controls.Add(this.dockSite_notification);
             this.Controls.Add(this.dockSite_menu);
@@ -1513,6 +1758,10 @@
             this.dockSite_mainView.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.bar_mainWin)).EndInit();
             this.bar_mainWin.ResumeLayout(false);
+            this.paymentPanel.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dgvx_payment)).EndInit();
+            this.tlp_paymentFilter.ResumeLayout(false);
+            this.tlp_paymentFilter.PerformLayout();
             this.testPanel.ResumeLayout(false);
             this.testPanel.PerformLayout();
             this.groupPanel2.ResumeLayout(false);
@@ -1523,10 +1772,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
             this.tableLayoutPanel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
-            this.NumMachineMonitorPanel.ResumeLayout(false);
             this.pdc_devStatus.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.tableLayoutPanel2.ResumeLayout(false);
+            this.NumMachineMonitorPanel.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.bar_bottom)).EndInit();
             this.bar_bottom.ResumeLayout(false);
             this.RecordsMonitorPanel.ResumeLayout(false);
@@ -1658,6 +1907,24 @@
         private DevComponents.DotNetBar.ButtonItem btn_config;
         private DevComponents.DotNetBar.ButtonItem shortcut_pause;
         private System.Windows.Forms.Button button3;
+        private System.Windows.Forms.TableLayoutPanel tlp_paymentFilter;
+        private System.Windows.Forms.DateTimePicker dtp_paymentEndDate;
+        private DevComponents.DotNetBar.LabelX lbx_paymentStartDate;
+        private DevComponents.DotNetBar.LabelX lbx_paymentEndDate;
+        private DevComponents.DotNetBar.ButtonX btnx_paymentSearch;
+        private DevComponents.DotNetBar.LabelX lbx_paymentLicense;
+        private System.Windows.Forms.TextBox tb_paymentLicense;
+        private System.Windows.Forms.DateTimePicker dtp_paymentStartDate;
+        private DevComponents.DotNetBar.Controls.DataGridViewX dgvx_payment;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
     }
 }
 

PLCLinker/centralController/FormCentralController.cs

@@ -55,7 +55,8 @@ namespace centralController
                     }
                     if (temp == 5)
                     {
-                        dgvx_parkingRecords.Invoke(new Action(() => {
+                        dgvx_parkingRecords.Invoke(new Action(() =>
+                        {
 
                             //RefreshRecords(null, null);
                             //定时器，定时更新停车记录
@@ -79,10 +80,10 @@ namespace centralController
                         break;
                     }
                     sw.Stop();
-                    if(sw.ElapsedMilliseconds/1000 > 45)
+                    if (sw.ElapsedMilliseconds / 1000 > 45)
                     {
                         Log.WriteLog(LogType.process, LogFile.ERROR, "初始化超时");
-                        Monitor.Monitor.SetNotification("初始化超时，请检查连接后重启中控",TextColor.Error);
+                        Monitor.Monitor.SetNotification("初始化超时，请检查连接后重启中控", TextColor.Error);
                         this.Close();
                     }
                     Thread.Sleep(300);
@@ -278,21 +279,21 @@ namespace centralController
             //IPAddress temp;
             //if (IPAddress.TryParse(ip, out temp))
             //{
-                string license = "";
-                int id = 0;
-                int.TryParse(textBox1.Text, out id);
-                Task.Factory.StartNew(() =>
+            string license = "";
+            int id = 0;
+            int.TryParse(textBox1.Text, out id);
+            Task.Factory.StartNew(() =>
+            {
+                license = Monitor.Monitor.numMachineLinker.GetLicensePlate(id);
+                if (textBox2.InvokeRequired)
                 {
-                    license = Monitor.Monitor.numMachineLinker.GetLicensePlate(id);
-                    if (textBox2.InvokeRequired)
-                    {
-                        textBox2.Invoke(new Action(() => { textBox2.Text = license; }));
-                    }
-                    else
-                    {
-                        textBox2.Text = license;
-                    }
-                });
+                    textBox2.Invoke(new Action(() => { textBox2.Text = license; }));
+                }
+                else
+                {
+                    textBox2.Text = license;
+                }
+            });
             //}
         }
 
@@ -317,7 +318,7 @@ namespace centralController
         {
             string license = textBox1.Text;
             int id = Monitor.Monitor.numMachineLinker.GetLicenseID(license);
-            textBox2.Text = "终端"+id.ToString();
+            textBox2.Text = "终端" + id.ToString();
         }
         #endregion
 
@@ -832,7 +833,7 @@ namespace centralController
                 Monitor.Monitor.SetNotification(Monitor.Monitor.globalStatus ? "工作正常" : "终止状态");
                 Task.Factory.StartNew(() =>
                 {
-                    Thread.Sleep(3000);
+                    Thread.Sleep(1500);
                     try
                     {
                         this.Invoke(new Action(() =>
@@ -855,5 +856,60 @@ namespace centralController
             aboutUs.ShowDialog();
         }
         #endregion
+
+        /// <summary>
+        /// 支付信息查询功能
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnx_paymentSearch_Click(object sender, EventArgs e)
+        {
+            DateTime start, end;
+            string license = "";
+            try
+            {
+                start = DateTime.Parse(dtp_paymentStartDate.Text);
+                end = DateTime.Parse(dtp_paymentEndDate.Text);
+                license = tb_paymentLicense.Text;
+            }
+            catch { MessageBox.Show("日期输入异常，请重新输入"); return; }
+
+            dgvx_payment.Rows.Clear();
+            List<object[]> list = Monitor.Monitor.GetParkingRecords(license, start.ToString("yyyy-MM-dd"), end.AddDays(1).ToString("yyyy-MM-dd"));
+            List<object[]>.Enumerator listEnumer = list.GetEnumerator();
+            while (listEnumer.MoveNext())
+            {
+                dgvx_payment.Rows.Add(listEnumer.Current);
+                //Console.WriteLine(listEnumer.Current);
+            }
+        }
+        /// <summary>
+        /// 支付信息修改
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void dgvx_payment_CellEndEdit(object sender, DataGridViewCellEventArgs e)
+        {
+            int columnIndex = e.ColumnIndex;
+            int rowIndex = e.RowIndex;
+            if (columnIndex == 8)
+            {
+                DataGridViewRow selectedRow = dgvx_payment.Rows[rowIndex];
+                DataGridViewCellCollection cellCollection = selectedRow.Cells;
+                string license = cellCollection[2].Value.ToString();
+                string receiptNum = cellCollection[6].Value.ToString();
+                string parkingFee = cellCollection[7].Value.ToString();
+                string paymentStatus = cellCollection[8].Value.ToString();
+                string notification = "确认将号牌 " + license + " 凭证号 " + receiptNum + " 的这条记录中，停车费用与支付状态改为 " + parkingFee + " 与 " + paymentStatus + " 吗？";
+                DialogResult dResult = MessageBox.Show(notification, "修改确认", MessageBoxButtons.OKCancel);
+                if (dResult == DialogResult.OK)
+                {
+                    Monitor.Monitor.UpdateParkingRecords(license, receiptNum, parkingFee, paymentStatus, true);
+                    Monitor.Monitor.UpdateParkingRecords(license, receiptNum, parkingFee, paymentStatus, false);
+                    Monitor.Monitor.SetNotification("支付信息已修改", TextColor.Warning);
+                    Log.WriteLog(LogType.process, LogFile.INFO, "手动修改支付信息，号牌：" + license + ",凭证号：" + receiptNum + "，停车费用与支付状态改为：\n" + parkingFee + "与" + paymentStatus);
+                }
+            }
+        }
     }
 }

PLCLinker/centralController/FormCentralController.resx

@@ -120,6 +120,33 @@
   <metadata name="dotNetBarManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="dataGridViewTextBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn4.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn6.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn7.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn8.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewTextBoxColumn9.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="bar_bottom.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

PLCLinker/centralController/FormPLCConf.Designer.cs

@@ -149,16 +149,16 @@
             this.groupBox2.Controls.Add(this.button2);
             this.groupBox2.Controls.Add(this.textBox1);
             this.groupBox2.Controls.Add(this.label4);
-            this.groupBox2.Location = new System.Drawing.Point(199, 12);
+            this.groupBox2.Location = new System.Drawing.Point(199, 15);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(171, 418);
+            this.groupBox2.Size = new System.Drawing.Size(171, 460);
             this.groupBox2.TabIndex = 5;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "读取";
             // 
             // textBox5
             // 
-            this.textBox5.Location = new System.Drawing.Point(18, 40);
+            this.textBox5.Location = new System.Drawing.Point(20, 37);
             this.textBox5.Name = "textBox5";
             this.textBox5.Size = new System.Drawing.Size(121, 21);
             this.textBox5.TabIndex = 8;
@@ -166,7 +166,7 @@
             // 
             // button2
             // 
-            this.button2.Location = new System.Drawing.Point(46, 389);
+            this.button2.Location = new System.Drawing.Point(46, 431);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(75, 23);
             this.button2.TabIndex = 7;
@@ -176,17 +176,17 @@
             // 
             // textBox1
             // 
-            this.textBox1.Location = new System.Drawing.Point(18, 78);
+            this.textBox1.Location = new System.Drawing.Point(18, 75);
             this.textBox1.Multiline = true;
             this.textBox1.Name = "textBox1";
             this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-            this.textBox1.Size = new System.Drawing.Size(133, 305);
+            this.textBox1.Size = new System.Drawing.Size(133, 340);
             this.textBox1.TabIndex = 8;
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(18, 25);
+            this.label4.Location = new System.Drawing.Point(18, 22);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(41, 12);
             this.label4.TabIndex = 6;
@@ -332,7 +332,7 @@
             // 
             // button8
             // 
-            this.button8.Location = new System.Drawing.Point(245, 430);
+            this.button8.Location = new System.Drawing.Point(245, 481);
             this.button8.Name = "button8";
             this.button8.Size = new System.Drawing.Size(75, 23);
             this.button8.TabIndex = 14;
@@ -342,7 +342,7 @@
             // 
             // button9
             // 
-            this.button9.Location = new System.Drawing.Point(245, 459);
+            this.button9.Location = new System.Drawing.Point(245, 510);
             this.button9.Name = "button9";
             this.button9.Size = new System.Drawing.Size(75, 23);
             this.button9.TabIndex = 15;
@@ -384,7 +384,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(803, 527);
+            this.ClientSize = new System.Drawing.Size(808, 558);
             this.Controls.Add(this.btn_PLCLink);
             this.Controls.Add(this.button11);
             this.Controls.Add(this.button10);

PLCLinker/centralController/FormRecordsManager.Designer.cs

@@ -28,31 +28,9 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             this.stc_recordManager = new DevComponents.DotNetBar.SuperTabControl();
-            this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel();
-            this.tlp_orderRecords = new System.Windows.Forms.TableLayoutPanel();
-            this.dgvx_orderRecords = new DevComponents.DotNetBar.Controls.DataGridViewX();
-            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.预约状态 = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
-            this.dtp_endDate2 = new System.Windows.Forms.DateTimePicker();
-            this.labelX3 = new DevComponents.DotNetBar.LabelX();
-            this.labelX4 = new DevComponents.DotNetBar.LabelX();
-            this.btnx_orderRecordSearch = new DevComponents.DotNetBar.ButtonX();
-            this.btn_orderRecordExport = new DevComponents.DotNetBar.ButtonX();
-            this.labelX5 = new DevComponents.DotNetBar.LabelX();
-            this.tb_license2 = new System.Windows.Forms.TextBox();
-            this.dtp_startDate2 = new System.Windows.Forms.DateTimePicker();
-            this.sti_orderRecords = new DevComponents.DotNetBar.SuperTabItem();
             this.superTabControlPanel1 = new DevComponents.DotNetBar.SuperTabControlPanel();
             this.tlp_parkingRecord = new System.Windows.Forms.TableLayoutPanel();
             this.dgvx_parkingRecords = new DevComponents.DotNetBar.Controls.DataGridViewX();
@@ -65,29 +43,51 @@
             this.receiptNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.parkingPrice = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.paymentStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.dtp_endDate = new System.Windows.Forms.DateTimePicker();
-            this.lbx_startDate = new DevComponents.DotNetBar.LabelX();
-            this.labelX1 = new DevComponents.DotNetBar.LabelX();
+            this.tlp_parkingRecordsFilter = new System.Windows.Forms.TableLayoutPanel();
+            this.dtp_parkEndDate = new System.Windows.Forms.DateTimePicker();
+            this.lbx_parkStartDate = new DevComponents.DotNetBar.LabelX();
+            this.lbx_parkEndDate = new DevComponents.DotNetBar.LabelX();
             this.btnx_parkingRecordSearch = new DevComponents.DotNetBar.ButtonX();
             this.btnx_parkingRecordExport = new DevComponents.DotNetBar.ButtonX();
-            this.labelX2 = new DevComponents.DotNetBar.LabelX();
-            this.tb_license = new System.Windows.Forms.TextBox();
-            this.dtp_startDate = new System.Windows.Forms.DateTimePicker();
+            this.lbx_parkLicense = new DevComponents.DotNetBar.LabelX();
+            this.tb_parkLicense = new System.Windows.Forms.TextBox();
+            this.dtp_parkStartDate = new System.Windows.Forms.DateTimePicker();
             this.sti_parkingRecords = new DevComponents.DotNetBar.SuperTabItem();
+            this.superTabControlPanel2 = new DevComponents.DotNetBar.SuperTabControlPanel();
+            this.tlp_orderRecords = new System.Windows.Forms.TableLayoutPanel();
+            this.dgvx_orderRecords = new DevComponents.DotNetBar.Controls.DataGridViewX();
+            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.预约状态 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.tlp_orderRecordsFilter = new System.Windows.Forms.TableLayoutPanel();
+            this.dtp_orderEndDate = new System.Windows.Forms.DateTimePicker();
+            this.lbx_orderStartDate = new DevComponents.DotNetBar.LabelX();
+            this.lbx_orderEndDate = new DevComponents.DotNetBar.LabelX();
+            this.btnx_orderRecordSearch = new DevComponents.DotNetBar.ButtonX();
+            this.btnx_orderRecordExport = new DevComponents.DotNetBar.ButtonX();
+            this.lbx_orderLicense = new DevComponents.DotNetBar.LabelX();
+            this.tb_orderLicense = new System.Windows.Forms.TextBox();
+            this.dtp_orderStartDate = new System.Windows.Forms.DateTimePicker();
+            this.sti_orderRecords = new DevComponents.DotNetBar.SuperTabItem();
             this.superTabControlPanel3 = new DevComponents.DotNetBar.SuperTabControlPanel();
             this.sti_dailySummary = new DevComponents.DotNetBar.SuperTabItem();
             this.sti_carRecords = new DevComponents.DotNetBar.SuperTabItem();
             ((System.ComponentModel.ISupportInitialize)(this.stc_recordManager)).BeginInit();
             this.stc_recordManager.SuspendLayout();
-            this.superTabControlPanel2.SuspendLayout();
-            this.tlp_orderRecords.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dgvx_orderRecords)).BeginInit();
-            this.tableLayoutPanel3.SuspendLayout();
             this.superTabControlPanel1.SuspendLayout();
             this.tlp_parkingRecord.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.dgvx_parkingRecords)).BeginInit();
-            this.tableLayoutPanel1.SuspendLayout();
+            this.tlp_parkingRecordsFilter.SuspendLayout();
+            this.superTabControlPanel2.SuspendLayout();
+            this.tlp_orderRecords.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvx_orderRecords)).BeginInit();
+            this.tlp_orderRecordsFilter.SuspendLayout();
             this.SuspendLayout();
             // 
             // stc_recordManager
@@ -108,8 +108,8 @@
             this.stc_recordManager.ControlBox.MenuBox,
             this.stc_recordManager.ControlBox.CloseBox});
             this.stc_recordManager.Controls.Add(this.superTabControlPanel1);
-            this.stc_recordManager.Controls.Add(this.superTabControlPanel2);
             this.stc_recordManager.Controls.Add(this.superTabControlPanel3);
+            this.stc_recordManager.Controls.Add(this.superTabControlPanel2);
             this.stc_recordManager.Dock = System.Windows.Forms.DockStyle.Fill;
             this.stc_recordManager.Location = new System.Drawing.Point(0, 0);
             this.stc_recordManager.Name = "stc_recordManager";
@@ -126,269 +126,6 @@
             this.sti_dailySummary});
             this.stc_recordManager.Text = "superTabControl1";
             // 
-            // superTabControlPanel2
-            // 
-            this.superTabControlPanel2.Controls.Add(this.tlp_orderRecords);
-            this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.superTabControlPanel2.Location = new System.Drawing.Point(99, 0);
-            this.superTabControlPanel2.Name = "superTabControlPanel2";
-            this.superTabControlPanel2.Size = new System.Drawing.Size(932, 481);
-            this.superTabControlPanel2.TabIndex = 0;
-            this.superTabControlPanel2.TabItem = this.sti_orderRecords;
-            // 
-            // tlp_orderRecords
-            // 
-            this.tlp_orderRecords.ColumnCount = 1;
-            this.tlp_orderRecords.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tlp_orderRecords.Controls.Add(this.dgvx_orderRecords, 0, 1);
-            this.tlp_orderRecords.Controls.Add(this.tableLayoutPanel3, 0, 0);
-            this.tlp_orderRecords.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tlp_orderRecords.Location = new System.Drawing.Point(0, 0);
-            this.tlp_orderRecords.Name = "tlp_orderRecords";
-            this.tlp_orderRecords.RowCount = 2;
-            this.tlp_orderRecords.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 15F));
-            this.tlp_orderRecords.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 85F));
-            this.tlp_orderRecords.Size = new System.Drawing.Size(932, 481);
-            this.tlp_orderRecords.TabIndex = 3;
-            // 
-            // dgvx_orderRecords
-            // 
-            this.dgvx_orderRecords.BackgroundColor = System.Drawing.SystemColors.ActiveCaption;
-            this.dgvx_orderRecords.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dgvx_orderRecords.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.dataGridViewTextBoxColumn1,
-            this.dataGridViewTextBoxColumn2,
-            this.dataGridViewTextBoxColumn3,
-            this.dataGridViewTextBoxColumn5,
-            this.dataGridViewTextBoxColumn6,
-            this.dataGridViewTextBoxColumn7,
-            this.dataGridViewTextBoxColumn8,
-            this.dataGridViewTextBoxColumn9,
-            this.预约状态});
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvx_orderRecords.DefaultCellStyle = dataGridViewCellStyle2;
-            this.dgvx_orderRecords.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dgvx_orderRecords.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
-            this.dgvx_orderRecords.Location = new System.Drawing.Point(3, 75);
-            this.dgvx_orderRecords.MinimumSize = new System.Drawing.Size(389, 0);
-            this.dgvx_orderRecords.Name = "dgvx_orderRecords";
-            this.dgvx_orderRecords.RowTemplate.Height = 23;
-            this.dgvx_orderRecords.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-            this.dgvx_orderRecords.Size = new System.Drawing.Size(926, 403);
-            this.dgvx_orderRecords.TabIndex = 1;
-            // 
-            // dataGridViewTextBoxColumn1
-            // 
-            this.dataGridViewTextBoxColumn1.HeaderText = "预约记录ID";
-            this.dataGridViewTextBoxColumn1.MaxInputLength = 11;
-            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
-            this.dataGridViewTextBoxColumn1.ReadOnly = true;
-            this.dataGridViewTextBoxColumn1.Width = 90;
-            // 
-            // dataGridViewTextBoxColumn2
-            // 
-            this.dataGridViewTextBoxColumn2.HeaderText = "用户ID";
-            this.dataGridViewTextBoxColumn2.MaxInputLength = 8;
-            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
-            this.dataGridViewTextBoxColumn2.ReadOnly = true;
-            this.dataGridViewTextBoxColumn2.Width = 70;
-            // 
-            // dataGridViewTextBoxColumn3
-            // 
-            this.dataGridViewTextBoxColumn3.HeaderText = "号牌";
-            this.dataGridViewTextBoxColumn3.MaxInputLength = 9;
-            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
-            this.dataGridViewTextBoxColumn3.ReadOnly = true;
-            this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn3.Width = 80;
-            // 
-            // dataGridViewTextBoxColumn5
-            // 
-            this.dataGridViewTextBoxColumn5.HeaderText = "停车预约时间";
-            this.dataGridViewTextBoxColumn5.MaxInputLength = 50;
-            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
-            this.dataGridViewTextBoxColumn5.ReadOnly = true;
-            this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn5.Width = 140;
-            // 
-            // dataGridViewTextBoxColumn6
-            // 
-            this.dataGridViewTextBoxColumn6.HeaderText = "停车预约取消时间";
-            this.dataGridViewTextBoxColumn6.MaxInputLength = 50;
-            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
-            this.dataGridViewTextBoxColumn6.ReadOnly = true;
-            this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.dataGridViewTextBoxColumn6.Width = 140;
-            // 
-            // dataGridViewTextBoxColumn7
-            // 
-            this.dataGridViewTextBoxColumn7.HeaderText = "预约取车时间";
-            this.dataGridViewTextBoxColumn7.MaxInputLength = 50;
-            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
-            this.dataGridViewTextBoxColumn7.ReadOnly = true;
-            this.dataGridViewTextBoxColumn7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // dataGridViewTextBoxColumn8
-            // 
-            this.dataGridViewTextBoxColumn8.HeaderText = "预约时长";
-            this.dataGridViewTextBoxColumn8.MaxInputLength = 11;
-            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
-            this.dataGridViewTextBoxColumn8.ReadOnly = true;
-            this.dataGridViewTextBoxColumn8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            // 
-            // dataGridViewTextBoxColumn9
-            // 
-            this.dataGridViewTextBoxColumn9.HeaderText = "预约费用";
-            this.dataGridViewTextBoxColumn9.MaxInputLength = 11;
-            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
-            this.dataGridViewTextBoxColumn9.ReadOnly = true;
-            // 
-            // 预约状态
-            // 
-            this.预约状态.HeaderText = "预约状态";
-            this.预约状态.MaxInputLength = 8;
-            this.预约状态.Name = "预约状态";
-            this.预约状态.ReadOnly = true;
-            // 
-            // tableLayoutPanel3
-            // 
-            this.tableLayoutPanel3.ColumnCount = 8;
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F));
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F));
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F));
-            this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 87F));
-            this.tableLayoutPanel3.Controls.Add(this.dtp_endDate2, 3, 0);
-            this.tableLayoutPanel3.Controls.Add(this.labelX3, 0, 0);
-            this.tableLayoutPanel3.Controls.Add(this.labelX4, 2, 0);
-            this.tableLayoutPanel3.Controls.Add(this.btnx_orderRecordSearch, 6, 0);
-            this.tableLayoutPanel3.Controls.Add(this.btn_orderRecordExport, 7, 0);
-            this.tableLayoutPanel3.Controls.Add(this.labelX5, 4, 0);
-            this.tableLayoutPanel3.Controls.Add(this.tb_license2, 5, 0);
-            this.tableLayoutPanel3.Controls.Add(this.dtp_startDate2, 1, 0);
-            this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel3.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 3);
-            this.tableLayoutPanel3.Name = "tableLayoutPanel3";
-            this.tableLayoutPanel3.RowCount = 1;
-            this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel3.Size = new System.Drawing.Size(926, 66);
-            this.tableLayoutPanel3.TabIndex = 2;
-            // 
-            // dtp_endDate2
-            // 
-            this.dtp_endDate2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.dtp_endDate2.CalendarFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtp_endDate2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtp_endDate2.Location = new System.Drawing.Point(341, 20);
-            this.dtp_endDate2.Name = "dtp_endDate2";
-            this.dtp_endDate2.Size = new System.Drawing.Size(162, 26);
-            this.dtp_endDate2.TabIndex = 12;
-            // 
-            // labelX3
-            // 
-            // 
-            // 
-            // 
-            this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelX3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labelX3.Location = new System.Drawing.Point(3, 3);
-            this.labelX3.Name = "labelX3";
-            this.labelX3.Size = new System.Drawing.Size(79, 60);
-            this.labelX3.TabIndex = 3;
-            this.labelX3.Text = "起始日期:";
-            // 
-            // labelX4
-            // 
-            // 
-            // 
-            // 
-            this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelX4.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labelX4.Location = new System.Drawing.Point(256, 3);
-            this.labelX4.Name = "labelX4";
-            this.labelX4.Size = new System.Drawing.Size(79, 60);
-            this.labelX4.TabIndex = 4;
-            this.labelX4.Text = "截止日期:";
-            // 
-            // btnx_orderRecordSearch
-            // 
-            this.btnx_orderRecordSearch.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-            this.btnx_orderRecordSearch.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.btnx_orderRecordSearch.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-            this.btnx_orderRecordSearch.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnx_orderRecordSearch.Location = new System.Drawing.Point(761, 15);
-            this.btnx_orderRecordSearch.Name = "btnx_orderRecordSearch";
-            this.btnx_orderRecordSearch.Size = new System.Drawing.Size(74, 35);
-            this.btnx_orderRecordSearch.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.btnx_orderRecordSearch.TabIndex = 7;
-            this.btnx_orderRecordSearch.Text = "查询";
-            this.btnx_orderRecordSearch.Click += new System.EventHandler(this.btnx_orderRecordSearch_Click);
-            // 
-            // btn_orderRecordExport
-            // 
-            this.btn_orderRecordExport.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
-            this.btn_orderRecordExport.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.btn_orderRecordExport.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
-            this.btn_orderRecordExport.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btn_orderRecordExport.Location = new System.Drawing.Point(841, 15);
-            this.btn_orderRecordExport.Name = "btn_orderRecordExport";
-            this.btn_orderRecordExport.Size = new System.Drawing.Size(75, 35);
-            this.btn_orderRecordExport.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.btn_orderRecordExport.TabIndex = 8;
-            this.btn_orderRecordExport.Text = "导出";
-            this.btn_orderRecordExport.Click += new System.EventHandler(this.btn_orderRecordExport_Click);
-            // 
-            // labelX5
-            // 
-            // 
-            // 
-            // 
-            this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX5.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelX5.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labelX5.Location = new System.Drawing.Point(509, 3);
-            this.labelX5.Name = "labelX5";
-            this.labelX5.Size = new System.Drawing.Size(79, 60);
-            this.labelX5.TabIndex = 9;
-            this.labelX5.Text = "车辆号牌:";
-            // 
-            // tb_license2
-            // 
-            this.tb_license2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.tb_license2.Location = new System.Drawing.Point(594, 20);
-            this.tb_license2.Name = "tb_license2";
-            this.tb_license2.Size = new System.Drawing.Size(161, 26);
-            this.tb_license2.TabIndex = 10;
-            // 
-            // dtp_startDate2
-            // 
-            this.dtp_startDate2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.dtp_startDate2.CalendarFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtp_startDate2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtp_startDate2.Location = new System.Drawing.Point(88, 20);
-            this.dtp_startDate2.Name = "dtp_startDate2";
-            this.dtp_startDate2.Size = new System.Drawing.Size(162, 26);
-            this.dtp_startDate2.TabIndex = 11;
-            // 
-            // sti_orderRecords
-            // 
-            this.sti_orderRecords.AttachedControl = this.superTabControlPanel2;
-            this.sti_orderRecords.GlobalItem = false;
-            this.sti_orderRecords.Name = "sti_orderRecords";
-            this.sti_orderRecords.Text = "预约记录";
-            // 
             // superTabControlPanel1
             // 
             this.superTabControlPanel1.Controls.Add(this.tlp_parkingRecord);
@@ -404,7 +141,7 @@
             this.tlp_parkingRecord.ColumnCount = 1;
             this.tlp_parkingRecord.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
             this.tlp_parkingRecord.Controls.Add(this.dgvx_parkingRecords, 0, 1);
-            this.tlp_parkingRecord.Controls.Add(this.tableLayoutPanel1, 0, 0);
+            this.tlp_parkingRecord.Controls.Add(this.tlp_parkingRecordsFilter, 0, 0);
             this.tlp_parkingRecord.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tlp_parkingRecord.Location = new System.Drawing.Point(0, 0);
             this.tlp_parkingRecord.Name = "tlp_parkingRecord";
@@ -521,71 +258,71 @@
             this.paymentStatus.Name = "paymentStatus";
             this.paymentStatus.ReadOnly = true;
             // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.ColumnCount = 8;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 87F));
-            this.tableLayoutPanel1.Controls.Add(this.dtp_endDate, 3, 0);
-            this.tableLayoutPanel1.Controls.Add(this.lbx_startDate, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.labelX1, 2, 0);
-            this.tableLayoutPanel1.Controls.Add(this.btnx_parkingRecordSearch, 6, 0);
-            this.tableLayoutPanel1.Controls.Add(this.btnx_parkingRecordExport, 7, 0);
-            this.tableLayoutPanel1.Controls.Add(this.labelX2, 4, 0);
-            this.tableLayoutPanel1.Controls.Add(this.tb_license, 5, 0);
-            this.tableLayoutPanel1.Controls.Add(this.dtp_startDate, 1, 0);
-            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 3);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 1;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(926, 66);
-            this.tableLayoutPanel1.TabIndex = 2;
-            // 
-            // dtp_endDate
-            // 
-            this.dtp_endDate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.dtp_endDate.CalendarFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtp_endDate.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtp_endDate.Location = new System.Drawing.Point(341, 20);
-            this.dtp_endDate.Name = "dtp_endDate";
-            this.dtp_endDate.Size = new System.Drawing.Size(162, 26);
-            this.dtp_endDate.TabIndex = 12;
-            // 
-            // lbx_startDate
-            // 
-            // 
-            // 
-            // 
-            this.lbx_startDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.lbx_startDate.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.lbx_startDate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lbx_startDate.Location = new System.Drawing.Point(3, 3);
-            this.lbx_startDate.Name = "lbx_startDate";
-            this.lbx_startDate.Size = new System.Drawing.Size(79, 60);
-            this.lbx_startDate.TabIndex = 3;
-            this.lbx_startDate.Text = "起始日期:";
-            // 
-            // labelX1
-            // 
-            // 
-            // 
-            // 
-            this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelX1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labelX1.Location = new System.Drawing.Point(256, 3);
-            this.labelX1.Name = "labelX1";
-            this.labelX1.Size = new System.Drawing.Size(79, 60);
-            this.labelX1.TabIndex = 4;
-            this.labelX1.Text = "截止日期:";
+            // tlp_parkingRecordsFilter
+            // 
+            this.tlp_parkingRecordsFilter.ColumnCount = 8;
+            this.tlp_parkingRecordsFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
+            this.tlp_parkingRecordsFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F));
+            this.tlp_parkingRecordsFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
+            this.tlp_parkingRecordsFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F));
+            this.tlp_parkingRecordsFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
+            this.tlp_parkingRecordsFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
+            this.tlp_parkingRecordsFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F));
+            this.tlp_parkingRecordsFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 88F));
+            this.tlp_parkingRecordsFilter.Controls.Add(this.dtp_parkEndDate, 3, 0);
+            this.tlp_parkingRecordsFilter.Controls.Add(this.lbx_parkStartDate, 0, 0);
+            this.tlp_parkingRecordsFilter.Controls.Add(this.lbx_parkEndDate, 2, 0);
+            this.tlp_parkingRecordsFilter.Controls.Add(this.btnx_parkingRecordSearch, 6, 0);
+            this.tlp_parkingRecordsFilter.Controls.Add(this.btnx_parkingRecordExport, 7, 0);
+            this.tlp_parkingRecordsFilter.Controls.Add(this.lbx_parkLicense, 4, 0);
+            this.tlp_parkingRecordsFilter.Controls.Add(this.tb_parkLicense, 5, 0);
+            this.tlp_parkingRecordsFilter.Controls.Add(this.dtp_parkStartDate, 1, 0);
+            this.tlp_parkingRecordsFilter.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tlp_parkingRecordsFilter.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tlp_parkingRecordsFilter.Location = new System.Drawing.Point(3, 3);
+            this.tlp_parkingRecordsFilter.Name = "tlp_parkingRecordsFilter";
+            this.tlp_parkingRecordsFilter.RowCount = 1;
+            this.tlp_parkingRecordsFilter.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tlp_parkingRecordsFilter.Size = new System.Drawing.Size(926, 66);
+            this.tlp_parkingRecordsFilter.TabIndex = 2;
+            // 
+            // dtp_parkEndDate
+            // 
+            this.dtp_parkEndDate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.dtp_parkEndDate.CalendarFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtp_parkEndDate.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtp_parkEndDate.Location = new System.Drawing.Point(340, 20);
+            this.dtp_parkEndDate.Name = "dtp_parkEndDate";
+            this.dtp_parkEndDate.Size = new System.Drawing.Size(161, 26);
+            this.dtp_parkEndDate.TabIndex = 12;
+            // 
+            // lbx_parkStartDate
+            // 
+            // 
+            // 
+            // 
+            this.lbx_parkStartDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lbx_parkStartDate.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbx_parkStartDate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lbx_parkStartDate.Location = new System.Drawing.Point(3, 3);
+            this.lbx_parkStartDate.Name = "lbx_parkStartDate";
+            this.lbx_parkStartDate.Size = new System.Drawing.Size(79, 60);
+            this.lbx_parkStartDate.TabIndex = 3;
+            this.lbx_parkStartDate.Text = "起始日期:";
+            // 
+            // lbx_parkEndDate
+            // 
+            // 
+            // 
+            // 
+            this.lbx_parkEndDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lbx_parkEndDate.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbx_parkEndDate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lbx_parkEndDate.Location = new System.Drawing.Point(255, 3);
+            this.lbx_parkEndDate.Name = "lbx_parkEndDate";
+            this.lbx_parkEndDate.Size = new System.Drawing.Size(79, 60);
+            this.lbx_parkEndDate.TabIndex = 4;
+            this.lbx_parkEndDate.Text = "截止日期:";
             // 
             // btnx_parkingRecordSearch
             // 
@@ -593,7 +330,7 @@
             this.btnx_parkingRecordSearch.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.btnx_parkingRecordSearch.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
             this.btnx_parkingRecordSearch.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnx_parkingRecordSearch.Location = new System.Drawing.Point(761, 15);
+            this.btnx_parkingRecordSearch.Location = new System.Drawing.Point(759, 15);
             this.btnx_parkingRecordSearch.Name = "btnx_parkingRecordSearch";
             this.btnx_parkingRecordSearch.Size = new System.Drawing.Size(74, 35);
             this.btnx_parkingRecordSearch.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -607,7 +344,7 @@
             this.btnx_parkingRecordExport.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.btnx_parkingRecordExport.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
             this.btnx_parkingRecordExport.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnx_parkingRecordExport.Location = new System.Drawing.Point(841, 15);
+            this.btnx_parkingRecordExport.Location = new System.Drawing.Point(839, 15);
             this.btnx_parkingRecordExport.Name = "btnx_parkingRecordExport";
             this.btnx_parkingRecordExport.Size = new System.Drawing.Size(75, 35);
             this.btnx_parkingRecordExport.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -615,37 +352,37 @@
             this.btnx_parkingRecordExport.Text = "导出";
             this.btnx_parkingRecordExport.Click += new System.EventHandler(this.btnx_parkingRecrodExport_Click);
             // 
-            // labelX2
+            // lbx_parkLicense
             // 
             // 
             // 
             // 
-            this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.labelX2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelX2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.labelX2.Location = new System.Drawing.Point(509, 3);
-            this.labelX2.Name = "labelX2";
-            this.labelX2.Size = new System.Drawing.Size(79, 60);
-            this.labelX2.TabIndex = 9;
-            this.labelX2.Text = "车辆号牌:";
+            this.lbx_parkLicense.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lbx_parkLicense.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbx_parkLicense.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lbx_parkLicense.Location = new System.Drawing.Point(507, 3);
+            this.lbx_parkLicense.Name = "lbx_parkLicense";
+            this.lbx_parkLicense.Size = new System.Drawing.Size(79, 60);
+            this.lbx_parkLicense.TabIndex = 9;
+            this.lbx_parkLicense.Text = "车辆号牌:";
             // 
-            // tb_license
+            // tb_parkLicense
             // 
-            this.tb_license.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.tb_license.Location = new System.Drawing.Point(594, 20);
-            this.tb_license.Name = "tb_license";
-            this.tb_license.Size = new System.Drawing.Size(161, 26);
-            this.tb_license.TabIndex = 10;
+            this.tb_parkLicense.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.tb_parkLicense.Location = new System.Drawing.Point(592, 20);
+            this.tb_parkLicense.Name = "tb_parkLicense";
+            this.tb_parkLicense.Size = new System.Drawing.Size(161, 26);
+            this.tb_parkLicense.TabIndex = 10;
             // 
-            // dtp_startDate
+            // dtp_parkStartDate
             // 
-            this.dtp_startDate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.dtp_startDate.CalendarFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtp_startDate.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.dtp_startDate.Location = new System.Drawing.Point(88, 20);
-            this.dtp_startDate.Name = "dtp_startDate";
-            this.dtp_startDate.Size = new System.Drawing.Size(162, 26);
-            this.dtp_startDate.TabIndex = 11;
+            this.dtp_parkStartDate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.dtp_parkStartDate.CalendarFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtp_parkStartDate.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtp_parkStartDate.Location = new System.Drawing.Point(88, 20);
+            this.dtp_parkStartDate.Name = "dtp_parkStartDate";
+            this.dtp_parkStartDate.Size = new System.Drawing.Size(161, 26);
+            this.dtp_parkStartDate.TabIndex = 11;
             // 
             // sti_parkingRecords
             // 
@@ -654,6 +391,269 @@
             this.sti_parkingRecords.Name = "sti_parkingRecords";
             this.sti_parkingRecords.Text = "原始停取记录";
             // 
+            // superTabControlPanel2
+            // 
+            this.superTabControlPanel2.Controls.Add(this.tlp_orderRecords);
+            this.superTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.superTabControlPanel2.Location = new System.Drawing.Point(99, 0);
+            this.superTabControlPanel2.Name = "superTabControlPanel2";
+            this.superTabControlPanel2.Size = new System.Drawing.Size(932, 481);
+            this.superTabControlPanel2.TabIndex = 0;
+            this.superTabControlPanel2.TabItem = this.sti_orderRecords;
+            // 
+            // tlp_orderRecords
+            // 
+            this.tlp_orderRecords.ColumnCount = 1;
+            this.tlp_orderRecords.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tlp_orderRecords.Controls.Add(this.dgvx_orderRecords, 0, 1);
+            this.tlp_orderRecords.Controls.Add(this.tlp_orderRecordsFilter, 0, 0);
+            this.tlp_orderRecords.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tlp_orderRecords.Location = new System.Drawing.Point(0, 0);
+            this.tlp_orderRecords.Name = "tlp_orderRecords";
+            this.tlp_orderRecords.RowCount = 2;
+            this.tlp_orderRecords.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 15F));
+            this.tlp_orderRecords.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 85F));
+            this.tlp_orderRecords.Size = new System.Drawing.Size(932, 481);
+            this.tlp_orderRecords.TabIndex = 3;
+            // 
+            // dgvx_orderRecords
+            // 
+            this.dgvx_orderRecords.BackgroundColor = System.Drawing.SystemColors.ActiveCaption;
+            this.dgvx_orderRecords.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dgvx_orderRecords.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.dataGridViewTextBoxColumn1,
+            this.dataGridViewTextBoxColumn2,
+            this.dataGridViewTextBoxColumn3,
+            this.dataGridViewTextBoxColumn5,
+            this.dataGridViewTextBoxColumn6,
+            this.dataGridViewTextBoxColumn7,
+            this.dataGridViewTextBoxColumn8,
+            this.dataGridViewTextBoxColumn9,
+            this.预约状态});
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvx_orderRecords.DefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvx_orderRecords.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvx_orderRecords.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
+            this.dgvx_orderRecords.Location = new System.Drawing.Point(3, 75);
+            this.dgvx_orderRecords.MinimumSize = new System.Drawing.Size(389, 0);
+            this.dgvx_orderRecords.Name = "dgvx_orderRecords";
+            this.dgvx_orderRecords.RowTemplate.Height = 23;
+            this.dgvx_orderRecords.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvx_orderRecords.Size = new System.Drawing.Size(926, 403);
+            this.dgvx_orderRecords.TabIndex = 1;
+            // 
+            // dataGridViewTextBoxColumn1
+            // 
+            this.dataGridViewTextBoxColumn1.HeaderText = "预约记录ID";
+            this.dataGridViewTextBoxColumn1.MaxInputLength = 11;
+            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+            this.dataGridViewTextBoxColumn1.ReadOnly = true;
+            this.dataGridViewTextBoxColumn1.Width = 90;
+            // 
+            // dataGridViewTextBoxColumn2
+            // 
+            this.dataGridViewTextBoxColumn2.HeaderText = "用户ID";
+            this.dataGridViewTextBoxColumn2.MaxInputLength = 8;
+            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+            this.dataGridViewTextBoxColumn2.ReadOnly = true;
+            this.dataGridViewTextBoxColumn2.Width = 70;
+            // 
+            // dataGridViewTextBoxColumn3
+            // 
+            this.dataGridViewTextBoxColumn3.HeaderText = "号牌";
+            this.dataGridViewTextBoxColumn3.MaxInputLength = 9;
+            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
+            this.dataGridViewTextBoxColumn3.ReadOnly = true;
+            this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn3.Width = 80;
+            // 
+            // dataGridViewTextBoxColumn5
+            // 
+            this.dataGridViewTextBoxColumn5.HeaderText = "停车预约时间";
+            this.dataGridViewTextBoxColumn5.MaxInputLength = 50;
+            this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
+            this.dataGridViewTextBoxColumn5.ReadOnly = true;
+            this.dataGridViewTextBoxColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn5.Width = 140;
+            // 
+            // dataGridViewTextBoxColumn6
+            // 
+            this.dataGridViewTextBoxColumn6.HeaderText = "停车预约取消时间";
+            this.dataGridViewTextBoxColumn6.MaxInputLength = 50;
+            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
+            this.dataGridViewTextBoxColumn6.ReadOnly = true;
+            this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.dataGridViewTextBoxColumn6.Width = 140;
+            // 
+            // dataGridViewTextBoxColumn7
+            // 
+            this.dataGridViewTextBoxColumn7.HeaderText = "预约取车时间";
+            this.dataGridViewTextBoxColumn7.MaxInputLength = 50;
+            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
+            this.dataGridViewTextBoxColumn7.ReadOnly = true;
+            this.dataGridViewTextBoxColumn7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // dataGridViewTextBoxColumn8
+            // 
+            this.dataGridViewTextBoxColumn8.HeaderText = "预约时长";
+            this.dataGridViewTextBoxColumn8.MaxInputLength = 11;
+            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
+            this.dataGridViewTextBoxColumn8.ReadOnly = true;
+            this.dataGridViewTextBoxColumn8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // dataGridViewTextBoxColumn9
+            // 
+            this.dataGridViewTextBoxColumn9.HeaderText = "预约费用";
+            this.dataGridViewTextBoxColumn9.MaxInputLength = 11;
+            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
+            this.dataGridViewTextBoxColumn9.ReadOnly = true;
+            // 
+            // 预约状态
+            // 
+            this.预约状态.HeaderText = "预约状态";
+            this.预约状态.MaxInputLength = 8;
+            this.预约状态.Name = "预约状态";
+            this.预约状态.ReadOnly = true;
+            // 
+            // tlp_orderRecordsFilter
+            // 
+            this.tlp_orderRecordsFilter.ColumnCount = 8;
+            this.tlp_orderRecordsFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
+            this.tlp_orderRecordsFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F));
+            this.tlp_orderRecordsFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
+            this.tlp_orderRecordsFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F));
+            this.tlp_orderRecordsFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
+            this.tlp_orderRecordsFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
+            this.tlp_orderRecordsFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 80F));
+            this.tlp_orderRecordsFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 88F));
+            this.tlp_orderRecordsFilter.Controls.Add(this.dtp_orderEndDate, 3, 0);
+            this.tlp_orderRecordsFilter.Controls.Add(this.lbx_orderStartDate, 0, 0);
+            this.tlp_orderRecordsFilter.Controls.Add(this.lbx_orderEndDate, 2, 0);
+            this.tlp_orderRecordsFilter.Controls.Add(this.btnx_orderRecordSearch, 6, 0);
+            this.tlp_orderRecordsFilter.Controls.Add(this.btnx_orderRecordExport, 7, 0);
+            this.tlp_orderRecordsFilter.Controls.Add(this.lbx_orderLicense, 4, 0);
+            this.tlp_orderRecordsFilter.Controls.Add(this.tb_orderLicense, 5, 0);
+            this.tlp_orderRecordsFilter.Controls.Add(this.dtp_orderStartDate, 1, 0);
+            this.tlp_orderRecordsFilter.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tlp_orderRecordsFilter.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.tlp_orderRecordsFilter.Location = new System.Drawing.Point(3, 3);
+            this.tlp_orderRecordsFilter.Name = "tlp_orderRecordsFilter";
+            this.tlp_orderRecordsFilter.RowCount = 1;
+            this.tlp_orderRecordsFilter.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tlp_orderRecordsFilter.Size = new System.Drawing.Size(926, 66);
+            this.tlp_orderRecordsFilter.TabIndex = 2;
+            // 
+            // dtp_orderEndDate
+            // 
+            this.dtp_orderEndDate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.dtp_orderEndDate.CalendarFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtp_orderEndDate.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtp_orderEndDate.Location = new System.Drawing.Point(340, 20);
+            this.dtp_orderEndDate.Name = "dtp_orderEndDate";
+            this.dtp_orderEndDate.Size = new System.Drawing.Size(161, 26);
+            this.dtp_orderEndDate.TabIndex = 12;
+            // 
+            // lbx_orderStartDate
+            // 
+            // 
+            // 
+            // 
+            this.lbx_orderStartDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lbx_orderStartDate.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbx_orderStartDate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lbx_orderStartDate.Location = new System.Drawing.Point(3, 3);
+            this.lbx_orderStartDate.Name = "lbx_orderStartDate";
+            this.lbx_orderStartDate.Size = new System.Drawing.Size(79, 60);
+            this.lbx_orderStartDate.TabIndex = 3;
+            this.lbx_orderStartDate.Text = "起始日期:";
+            // 
+            // lbx_orderEndDate
+            // 
+            // 
+            // 
+            // 
+            this.lbx_orderEndDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lbx_orderEndDate.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbx_orderEndDate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lbx_orderEndDate.Location = new System.Drawing.Point(255, 3);
+            this.lbx_orderEndDate.Name = "lbx_orderEndDate";
+            this.lbx_orderEndDate.Size = new System.Drawing.Size(79, 60);
+            this.lbx_orderEndDate.TabIndex = 4;
+            this.lbx_orderEndDate.Text = "截止日期:";
+            // 
+            // btnx_orderRecordSearch
+            // 
+            this.btnx_orderRecordSearch.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnx_orderRecordSearch.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.btnx_orderRecordSearch.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnx_orderRecordSearch.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnx_orderRecordSearch.Location = new System.Drawing.Point(759, 15);
+            this.btnx_orderRecordSearch.Name = "btnx_orderRecordSearch";
+            this.btnx_orderRecordSearch.Size = new System.Drawing.Size(74, 35);
+            this.btnx_orderRecordSearch.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnx_orderRecordSearch.TabIndex = 7;
+            this.btnx_orderRecordSearch.Text = "查询";
+            this.btnx_orderRecordSearch.Click += new System.EventHandler(this.btnx_orderRecordSearch_Click);
+            // 
+            // btnx_orderRecordExport
+            // 
+            this.btnx_orderRecordExport.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton;
+            this.btnx_orderRecordExport.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.btnx_orderRecordExport.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
+            this.btnx_orderRecordExport.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnx_orderRecordExport.Location = new System.Drawing.Point(839, 15);
+            this.btnx_orderRecordExport.Name = "btnx_orderRecordExport";
+            this.btnx_orderRecordExport.Size = new System.Drawing.Size(75, 35);
+            this.btnx_orderRecordExport.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnx_orderRecordExport.TabIndex = 8;
+            this.btnx_orderRecordExport.Text = "导出";
+            this.btnx_orderRecordExport.Click += new System.EventHandler(this.btn_orderRecordExport_Click);
+            // 
+            // lbx_orderLicense
+            // 
+            // 
+            // 
+            // 
+            this.lbx_orderLicense.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.lbx_orderLicense.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lbx_orderLicense.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.lbx_orderLicense.Location = new System.Drawing.Point(507, 3);
+            this.lbx_orderLicense.Name = "lbx_orderLicense";
+            this.lbx_orderLicense.Size = new System.Drawing.Size(79, 60);
+            this.lbx_orderLicense.TabIndex = 9;
+            this.lbx_orderLicense.Text = "车辆号牌:";
+            // 
+            // tb_orderLicense
+            // 
+            this.tb_orderLicense.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.tb_orderLicense.Location = new System.Drawing.Point(592, 20);
+            this.tb_orderLicense.Name = "tb_orderLicense";
+            this.tb_orderLicense.Size = new System.Drawing.Size(161, 26);
+            this.tb_orderLicense.TabIndex = 10;
+            // 
+            // dtp_orderStartDate
+            // 
+            this.dtp_orderStartDate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.dtp_orderStartDate.CalendarFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtp_orderStartDate.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.dtp_orderStartDate.Location = new System.Drawing.Point(88, 20);
+            this.dtp_orderStartDate.Name = "dtp_orderStartDate";
+            this.dtp_orderStartDate.Size = new System.Drawing.Size(161, 26);
+            this.dtp_orderStartDate.TabIndex = 11;
+            // 
+            // sti_orderRecords
+            // 
+            this.sti_orderRecords.AttachedControl = this.superTabControlPanel2;
+            this.sti_orderRecords.GlobalItem = false;
+            this.sti_orderRecords.Name = "sti_orderRecords";
+            this.sti_orderRecords.Text = "预约记录";
+            // 
             // superTabControlPanel3
             // 
             this.superTabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -686,16 +686,16 @@
             this.Text = "记录管理器";
             ((System.ComponentModel.ISupportInitialize)(this.stc_recordManager)).EndInit();
             this.stc_recordManager.ResumeLayout(false);
-            this.superTabControlPanel2.ResumeLayout(false);
-            this.tlp_orderRecords.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dgvx_orderRecords)).EndInit();
-            this.tableLayoutPanel3.ResumeLayout(false);
-            this.tableLayoutPanel3.PerformLayout();
             this.superTabControlPanel1.ResumeLayout(false);
             this.tlp_parkingRecord.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.dgvx_parkingRecords)).EndInit();
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.tableLayoutPanel1.PerformLayout();
+            this.tlp_parkingRecordsFilter.ResumeLayout(false);
+            this.tlp_parkingRecordsFilter.PerformLayout();
+            this.superTabControlPanel2.ResumeLayout(false);
+            this.tlp_orderRecords.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dgvx_orderRecords)).EndInit();
+            this.tlp_orderRecordsFilter.ResumeLayout(false);
+            this.tlp_orderRecordsFilter.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -707,18 +707,18 @@
         private DevComponents.DotNetBar.SuperTabItem sti_parkingRecords;
         private System.Windows.Forms.TableLayoutPanel tlp_parkingRecord;
         private DevComponents.DotNetBar.Controls.DataGridViewX dgvx_parkingRecords;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private DevComponents.DotNetBar.LabelX lbx_startDate;
-        private DevComponents.DotNetBar.LabelX labelX1;
+        private System.Windows.Forms.TableLayoutPanel tlp_parkingRecordsFilter;
+        private DevComponents.DotNetBar.LabelX lbx_parkStartDate;
+        private DevComponents.DotNetBar.LabelX lbx_parkEndDate;
         private DevComponents.DotNetBar.ButtonX btnx_parkingRecordSearch;
         private DevComponents.DotNetBar.ButtonX btnx_parkingRecordExport;
         private DevComponents.DotNetBar.SuperTabControlPanel superTabControlPanel3;
         private DevComponents.DotNetBar.SuperTabItem sti_dailySummary;
         private DevComponents.DotNetBar.SuperTabItem sti_carRecords;
-        private DevComponents.DotNetBar.LabelX labelX2;
-        private System.Windows.Forms.TextBox tb_license;
-        private System.Windows.Forms.DateTimePicker dtp_endDate;
-        private System.Windows.Forms.DateTimePicker dtp_startDate;
+        private DevComponents.DotNetBar.LabelX lbx_parkLicense;
+        private System.Windows.Forms.TextBox tb_parkLicense;
+        private System.Windows.Forms.DateTimePicker dtp_parkEndDate;
+        private System.Windows.Forms.DateTimePicker dtp_parkStartDate;
         private System.Windows.Forms.DataGridViewTextBoxColumn parkingRecordsID;
         private System.Windows.Forms.DataGridViewTextBoxColumn userID;
         private System.Windows.Forms.DataGridViewTextBoxColumn numberPlate;
@@ -740,15 +740,15 @@
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
         private System.Windows.Forms.DataGridViewTextBoxColumn 预约状态;
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
-        private System.Windows.Forms.DateTimePicker dtp_endDate2;
-        private DevComponents.DotNetBar.LabelX labelX3;
-        private DevComponents.DotNetBar.LabelX labelX4;
+        private System.Windows.Forms.TableLayoutPanel tlp_orderRecordsFilter;
+        private System.Windows.Forms.DateTimePicker dtp_orderEndDate;
+        private DevComponents.DotNetBar.LabelX lbx_orderStartDate;
+        private DevComponents.DotNetBar.LabelX lbx_orderEndDate;
         private DevComponents.DotNetBar.ButtonX btnx_orderRecordSearch;
-        private DevComponents.DotNetBar.ButtonX btn_orderRecordExport;
-        private DevComponents.DotNetBar.LabelX labelX5;
-        private System.Windows.Forms.TextBox tb_license2;
-        private System.Windows.Forms.DateTimePicker dtp_startDate2;
+        private DevComponents.DotNetBar.ButtonX btnx_orderRecordExport;
+        private DevComponents.DotNetBar.LabelX lbx_orderLicense;
+        private System.Windows.Forms.TextBox tb_orderLicense;
+        private System.Windows.Forms.DateTimePicker dtp_orderStartDate;
         private DevComponents.DotNetBar.SuperTabItem sti_orderRecords;
     }
 }

PLCLinker/centralController/FormRecordsManager.cs

@@ -27,9 +27,9 @@ namespace centralController
             string license="";
             try
             {
-                start = DateTime.Parse(dtp_startDate.Text);
-                end = DateTime.Parse(dtp_endDate.Text);
-                license = tb_license.Text;
+                start = DateTime.Parse(dtp_parkStartDate.Text);
+                end = DateTime.Parse(dtp_parkEndDate.Text);
+                license = tb_parkLicense.Text;
             }
             catch { MessageBox.Show("日期输入异常，请重新输入");return; }
 
@@ -55,9 +55,9 @@ namespace centralController
             string license = "";
             try
             {
-                start = DateTime.Parse(dtp_startDate2.Text);
-                end = DateTime.Parse(dtp_endDate2.Text);
-                license = tb_license2.Text;
+                start = DateTime.Parse(dtp_orderStartDate.Text);
+                end = DateTime.Parse(dtp_orderEndDate.Text);
+                license = tb_orderLicense.Text;
             }
             catch { MessageBox.Show("日期输入异常，请重新输入"); return; }
 

PLCLinker/centralController/Monitor/Monitor.cs

@@ -7,6 +7,7 @@ using Monitor;
 using MySql.Data.MySqlClient;
 using NumMachine;
 using parkMonitor.language;
+using parkMonitor.LOG;
 using parkMonitor.model;
 using PLCS7;
 using System;
@@ -118,7 +119,7 @@ namespace Monitor
                     count = 0;
                     updateCount = false;
                 }
-                if (count > 1000)
+                if (count > 300)
                     count = 3;
                 count++;
                 if (PLC != null)
@@ -536,6 +537,78 @@ namespace Monitor
             result.Reverse();
             return result;
         }
+        /// <summary>
+        /// 更新停车记录关于支付的信息
+        /// </summary>
+        /// <param name="license"></param>
+        /// <param name="receiptNum"></param>
+        /// <param name="parkingFee"></param>
+        /// <param name="paymentStatus"></param>
+        /// <returns></returns>
+        public static bool UpdateParkingRecords(string license, string receiptNum, string parkingFee, string paymentStatus, bool local)
+        {
+            bool result = false;
+            string updateRecordsSql = "update parkingrecords set parkingPrice = " + parkingFee + " ,paymentStatus = " + paymentStatus + " where numberPlate = '" + license + "' and receiptNum = " + receiptNum+";";
+            List<string> updateList = new List<string>();
+            updateList.Add(updateRecordsSql);
+            if (local && localDBOper != null)
+            {
+                lock (localDBOper)
+                {
+                    try
+                    {
+                        result = localDBOper.UpdateTransaction(updateList);
+                    }
+                    catch { Log.WriteLog(LogType.database, "更新本地停车记录中支付信息出现异常。\n" + updateRecordsSql); return false; }
+                }
+            }else if(!local && remoteDBOper != null)
+            {
+                lock (remoteDBOper)
+                {
+                    try
+                    {
+                        result = remoteDBOper.UpdateTransaction(updateList);
+                    }
+                    catch { Log.WriteLog(LogType.database, "更新云端记录中支付信息出现异常。\n" + updateRecordsSql); return false; }
+                }
+            }
+            return result;
+        }
+        /// <summary>
+        /// 更新终端停车费用，便于车辆放行
+        /// </summary>
+        /// <returns></returns>
+        public static bool UpdateTermFeeStatus(string receiptNum)
+        {
+            for (int i = 0; i < Terminal.Terminal.terminalInfo.Count; i++)
+            {
+                if(Terminal.Terminal.terminalInfo[i].receiptNum.ToString() == receiptNum)
+                {
+                    if(Terminal.Terminal.terminalInfo[i].terminalStatus==2 && Terminal.Terminal.terminalInfo[i].paymentStatus == 3)
+                    {
+                        TerminalStru tsFromCentral = new TerminalStru
+                        {
+                            terminalID = (short)Terminal.Terminal.terminalInfo[i].terminalID,
+                            parkingFee = (short)-1,
+                            receiptNum = -1,
+                            paymentStatus = 3,
+                        };
+                        PLC.WriteToPLC(tsFromCentral, PLCDataType.central);
+                        return true;
+                    }
+                    else
+                    {
+                        SetNotification((Terminal.Terminal.terminalInfo[i].terminalStatus == 1 ? "停车" : "非取车状态")+"终端，支付状态:"+ Terminal.Terminal.terminalInfo[i].paymentStatus+"，不进行修改",TextColor.Warning);
+                        Log.WriteLog(LogType.process,LogFile.ERROR, (Terminal.Terminal.terminalInfo[i].terminalStatus == 1 ? "停车" : "非取车状态") + "终端，支付状态:" + Terminal.Terminal.terminalInfo[i].paymentStatus + "，不进行修改");
+                        return false;
+                    }
+                }
+            }
+            SetNotification("未找到待修改终端", TextColor.Warning);
+            Log.WriteLog(LogType.process, LogFile.ERROR, "未找到待修改终端");
+            return false;
+        }
+
         /// <summary>
         /// 返回空闲正常车位数
         /// </summary>

PLCLinker/centralController/Terminal/Terminal.cs

@@ -289,6 +289,13 @@ namespace Terminal
         /// <param name="id"></param>
         private static void ClearTerminal(int id, bool removeReceipt)
         {
+            for(int i = 0; i < terminalInfo.Count; i++)
+            {
+                if(terminalInfo[i].terminalID == id)
+                {
+                    Log.WriteLog(LogType.process, LogFile.WARNING, "即将删除终端" + id + "数据：" +terminalInfo[i].ToString());
+                }
+            }
             TerminalStru tsFromCentral = new TerminalStru
             {
                 terminalID = (short)id,
@@ -483,7 +490,8 @@ namespace Terminal
                 {
                     if (!Monitor.Monitor.globalStatus)
                     {
-                        Monitor.Monitor.SetNotification("号牌系统已暂停，请检查无误后手动开启", parkMonitor.model.TextColor.Warning);
+                        Monitor.Monitor.SetNotification("号牌系统已暂停，将清除终端数据", parkMonitor.model.TextColor.Warning);
+                        ClearTerminal(i, true);
                         Thread.Sleep(5000);
                         return;
                     }
@@ -503,11 +511,20 @@ namespace Terminal
                             idLicMap.TryGetValue(term.terminalID, out license);
                         }
 
-                        //无论号牌有无，皆记录或更新当前号牌，若无则填入默认号牌
+                        //记录或更新当前号牌，若无则填入默认号牌
                         string currentLic = "";
                         lock (idLicMap)
                         {
-                            currentLic = license == "" ? Monitor.Monitor.defaultLic : license;
+                            if(license == "")
+                            {
+                                currentLic = Monitor.Monitor.defaultLic;
+                                Monitor.Monitor.SetNotification("使用默认号牌，凭证号"+ term.receiptNum, parkMonitor.model.TextColor.Error);
+                                Log.WriteLog(LogType.process, LogFile.ERROR, term.terminalID + "号号牌机未获得号牌，使用默认号牌，凭证号：" + term.receiptNum);
+                            }
+                            else
+                            {
+                                currentLic = license;
+                            }
                             try
                             {
                                 if (idLicMap.ContainsKey(term.terminalID))
@@ -536,34 +553,34 @@ namespace Terminal
                             catch (Exception e) { Log.WriteLog(LogType.process, LogFile.ERROR, "凭证号" + term.receiptNum + "记录凭证号异常\n" + e.StackTrace); }
                         }
                         Log.WriteLog(LogType.process, LogFile.INFO, "号牌" + license + "已记录");
-                        //未获得号牌，告知PLC终止，告诉终端提示用户重新操作
-                        if (currentLic == "")
-                        {
-                            MainBlockStru mbs = new MainBlockStru
-                            {
-                                centralHearbeat = (short)-1,
-                                bookParkCmd = -1,
-                                bookFetchCmd = -1,
-                                processCompleted = (short)-1,
-                                licenseReceived = (short)2
-                            };
-                            Monitor.Monitor.PLC.WriteToPLC(mbs, PLCDataType.central);
-                            TerminalStru ts = new TerminalStru
-                            {
-                                terminalID = (short)term.terminalID,
-                                paymentStatus = -1,
-                                parkingFee = -1,
-                                userType = -1,
-                                licVerification = (short)1
-                            };
-                            Monitor.Monitor.PLC.WriteToPLC(ts, PLCDataType.central);
-                            Thread.Sleep(500);
-                            ClearTerminal(term.terminalID, false);
-                            ResetCompleteSignal();
-                            Log.WriteLog(LogType.process, LogFile.ERROR, "未获得号牌");
-                        }
-                        else
-                        {
+                        ////未获得号牌，告知PLC终止，告诉终端提示用户重新操作
+                        //if (currentLic == "")
+                        //{
+                        //    MainBlockStru mbs = new MainBlockStru
+                        //    {
+                        //        centralHearbeat = (short)-1,
+                        //        bookParkCmd = -1,
+                        //        bookFetchCmd = -1,
+                        //        processCompleted = (short)-1,
+                        //        licenseReceived = (short)2
+                        //    };
+                        //    Monitor.Monitor.PLC.WriteToPLC(mbs, PLCDataType.central);
+                        //    TerminalStru ts = new TerminalStru
+                        //    {
+                        //        terminalID = (short)term.terminalID,
+                        //        paymentStatus = -1,
+                        //        parkingFee = -1,
+                        //        userType = -1,
+                        //        licVerification = (short)1
+                        //    };
+                        //    Monitor.Monitor.PLC.WriteToPLC(ts, PLCDataType.central);
+                        //    Thread.Sleep(500);
+                        //    ClearTerminal(term.terminalID, false);
+                        //    ResetCompleteSignal();
+                        //    Log.WriteLog(LogType.process, LogFile.ERROR, "未获得号牌");
+                        //}
+                        //else
+                        //{
                             TerminalStru ts = new TerminalStru
                             {
                                 terminalID = (short)term.terminalID,
@@ -617,7 +634,7 @@ namespace Terminal
                             Monitor.Monitor.PLC.WriteToPLC(mbst, PLCDataType.central);
                             //号牌获取结果被清零才跳出
                             Monitor.Monitor.SetNotification("已写入号牌获取结果"+ numReceivedStatus + "，等待号牌机启动指令清零", parkMonitor.model.TextColor.Info);
-                        }
+                        //}
                         int countdown = 10;
                         while (countdown-- > 0)
                         {
@@ -645,7 +662,7 @@ namespace Terminal
             //int processCompleted = Monitor.Monitor.mainBlockInfo.processCompleted;
             int currentTerm = Monitor.Monitor.mainBlockInfo.terminalID;
             int parkingSpaceID = 0;
-            if (processAttrib == 1 && Monitor.Monitor.globalStatus)
+            if (processAttrib == 1)
             {
                 TerminalStru term = new TerminalStru();
                 string license;
@@ -712,15 +729,15 @@ namespace Terminal
                     {
                         parkingRecordsSql = "INSERT INTO parkingrecords (userID, numberPlate,parkingSpaceID,garageID,parkingRecordsState,realParkTime,receiptNum,parkingPrice)" +
                             "values ('" + term.licenseCodeA + "','" + license + "','" + parkingSpaceID + "','" + Monitor.Monitor.garageID + "',3,'" + DateTime.Now.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss") + "','" + receipt + "',NULL);";
-                        Monitor.Monitor.SetNotification("用户"+ term.licenseCodeA + "停车记录已插入", parkMonitor.model.TextColor.Info);
-                        Log.WriteLog(LogType.process, LogFile.INFO, "用户" + term.licenseCodeA + "停车记录已插入," + license + "停在" + parkingSpaceID + ",凭证号:" + receipt);
+                        Monitor.Monitor.SetNotification("用户"+ term.licenseCodeA + "插入停车记录", parkMonitor.model.TextColor.Info);
+                        Log.WriteLog(LogType.process, LogFile.INFO, "用户" + term.licenseCodeA + "插入停车记录，" + license + "停在" + parkingSpaceID + ",凭证号:" + receipt);
                     }
                     else
                     {
                         parkingRecordsSql = "INSERT INTO parkingrecords (userID, numberPlate,parkingSpaceID,garageID,parkingRecordsState,realParkTime,receiptNum,parkingPrice)" +
                             "values ('" + 30 + "','" + license + "','" + parkingSpaceID + "','" + Monitor.Monitor.garageID + "',3,'" + DateTime.Now.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss") + "','" + receipt + "',NULL);";
-                        Monitor.Monitor.SetNotification("用户" + term.licenseCodeA + "停车记录已插入", parkMonitor.model.TextColor.Info);
-                        Log.WriteLog(LogType.process, LogFile.INFO, "用户" + term.licenseCodeA + "停车记录已插入," + license + "停在" + parkingSpaceID + ",凭证号:" + receipt);
+                        Monitor.Monitor.SetNotification("管理员用户，插入停车记录，" + license + "停在" + parkingSpaceID, parkMonitor.model.TextColor.Info);
+                        Log.WriteLog(LogType.process, LogFile.INFO, "管理员用户，插入停车记录，凭证号: " + receipt + "，终端块数据：" + term.ToString());
                     }
                     List<string> list = new List<string>();
                     list.Add(parkingRecordsSql);
@@ -758,6 +775,8 @@ namespace Terminal
                     try { idLicMap.Remove(currentTerm); }
                     catch { }
                     Monitor.Monitor.SetNotification(license + " 数据库已更新，停车流程结束", parkMonitor.model.TextColor.Info);
+                    Log.WriteLog(LogType.process, LogFile.INFO, license + " 停车流程结束");
+                    Log.WriteLog(LogType.process, "--------------------------------");
                 }
             }
         }
@@ -1187,6 +1206,7 @@ namespace Terminal
                     if (!Monitor.Monitor.globalStatus)
                     {
                         Monitor.Monitor.SetNotification("取车计费系统已暂停，请检查无误后手动开启", parkMonitor.model.TextColor.Warning);
+                        ClearTerminal(termIndex, true);
                         Thread.Sleep(5000);
                         return;
                     }
@@ -1380,6 +1400,7 @@ namespace Terminal
                                     }
                                     Monitor.Monitor.SetNotification(fi.license + " 取车流程结束", parkMonitor.model.TextColor.Info);
                                     Log.WriteLog(LogType.process, LogFile.INFO, fi.license + " 取车流程结束");
+                                    Log.WriteLog(LogType.process, LogFile.INFO, "--------------------------------");
                                     break;
                                 }
                                 Thread.Sleep(200);

PLCLinker/centralController/obj/Release/centralController.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-1894c814d0c0ce0d40c4a43d30ae54298a837fad
+e54dca5ae57e19841adc9305edf5acb99320d11d

PLCLinker/centralController/sdk/PLC/PLCS7.xml

@@ -390,6 +390,41 @@
             当前需更新车位ID
             </summary>
         </member>
+        <member name="F:PLCS7.MainBlockStru.currentCarLength">
+            <summary>
+            当前车辆长度
+            </summary>
+        </member>
+        <member name="F:PLCS7.MainBlockStru.currentCarWidth">
+            <summary>
+            当前车辆宽度
+            </summary>
+        </member>
+        <member name="F:PLCS7.MainBlockStru.currentCarHeight">
+            <summary>
+            当前车辆高度
+            </summary>
+        </member>
+        <member name="F:PLCS7.MainBlockStru.currentCarWheelbase">
+            <summary>
+            当前车辆轴距
+            </summary>
+        </member>
+        <member name="F:PLCS7.MainBlockStru.currentCarCenterX">
+            <summary>
+            当前车辆中心X坐标
+            </summary>
+        </member>
+        <member name="F:PLCS7.MainBlockStru.currentCarCenterY">
+            <summary>
+            当前车辆中心Y坐标
+            </summary>
+        </member>
+        <member name="F:PLCS7.MainBlockStru.currentCarAngle">
+            <summary>
+            当前车辆偏转角
+            </summary>
+        </member>
         <member name="T:PLCS7.ParkingSpaceStru">
             <summary>
             车位单元结构体

PLCLinker/newPLCConnector/App.config

@@ -4,7 +4,7 @@
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
     </startup>
   <appSettings>
-    <add key="plcIpAddress" value="192.168.10.60" />
+    <add key="plcIpAddress" value="192.168.2.178" />
     <add key="plcRack" value="0" />
     <add key="plcSlot" value="1" />
     <add key="plcDatablockId" value="18,41,20" />

PLCLinker/newPLCConnector/Form1.Designer.cs

@@ -151,7 +151,7 @@
             this.groupBox2.Controls.Add(this.label4);
             this.groupBox2.Location = new System.Drawing.Point(199, 12);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(171, 418);
+            this.groupBox2.Size = new System.Drawing.Size(171, 470);
             this.groupBox2.TabIndex = 5;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "读取";
@@ -166,7 +166,7 @@
             // 
             // button2
             // 
-            this.button2.Location = new System.Drawing.Point(46, 389);
+            this.button2.Location = new System.Drawing.Point(46, 441);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(75, 23);
             this.button2.TabIndex = 7;
@@ -180,7 +180,7 @@
             this.textBox1.Multiline = true;
             this.textBox1.Name = "textBox1";
             this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-            this.textBox1.Size = new System.Drawing.Size(133, 305);
+            this.textBox1.Size = new System.Drawing.Size(133, 357);
             this.textBox1.TabIndex = 8;
             // 
             // label4
@@ -332,7 +332,7 @@
             // 
             // button8
             // 
-            this.button8.Location = new System.Drawing.Point(245, 430);
+            this.button8.Location = new System.Drawing.Point(245, 496);
             this.button8.Name = "button8";
             this.button8.Size = new System.Drawing.Size(75, 23);
             this.button8.TabIndex = 14;
@@ -342,7 +342,7 @@
             // 
             // button9
             // 
-            this.button9.Location = new System.Drawing.Point(245, 459);
+            this.button9.Location = new System.Drawing.Point(245, 525);
             this.button9.Name = "button9";
             this.button9.Size = new System.Drawing.Size(75, 23);
             this.button9.TabIndex = 15;
@@ -384,7 +384,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(803, 527);
+            this.ClientSize = new System.Drawing.Size(809, 566);
             this.Controls.Add(this.btn_input);
             this.Controls.Add(this.button11);
             this.Controls.Add(this.button10);

PLCLinker/newPLCConnector/PLC/PLCS7.xml

@@ -385,6 +385,46 @@
             预约车位总数
             </summary>
         </member>
+        <member name="F:PLCS7.MainBlockStru.currentParkingSpaceID">
+            <summary>
+            当前需更新车位ID
+            </summary>
+        </member>
+        <member name="F:PLCS7.MainBlockStru.currentCarLength">
+            <summary>
+            当前车辆长度
+            </summary>
+        </member>
+        <member name="F:PLCS7.MainBlockStru.currentCarWidth">
+            <summary>
+            当前车辆宽度
+            </summary>
+        </member>
+        <member name="F:PLCS7.MainBlockStru.currentCarHeight">
+            <summary>
+            当前车辆高度
+            </summary>
+        </member>
+        <member name="F:PLCS7.MainBlockStru.currentCarWheelbase">
+            <summary>
+            当前车辆轴距
+            </summary>
+        </member>
+        <member name="F:PLCS7.MainBlockStru.currentCarCenterX">
+            <summary>
+            当前车辆中心X坐标
+            </summary>
+        </member>
+        <member name="F:PLCS7.MainBlockStru.currentCarCenterY">
+            <summary>
+            当前车辆中心Y坐标
+            </summary>
+        </member>
+        <member name="F:PLCS7.MainBlockStru.currentCarAngle">
+            <summary>
+            当前车辆偏转角
+            </summary>
+        </member>
         <member name="T:PLCS7.ParkingSpaceStru">
             <summary>
             车位单元结构体