From 07bf5764833f1d5beafee7aa94dc261a9a73a905 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期四, 24 七月 2025 17:49:00 +0800
Subject: [PATCH] 增加计时单价,计件单价,异常工资,计时类型维护,考勤表记录的前台代码

---
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs  | 1011 ++++++
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs           |  456 +++
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.resx        |  123 
 DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.cs                      |   85 
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs  |  893 ++++++
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.Designer.cs  |  609 ++++
 DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.resx             |  120 
 DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.resx                   |  120 
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs  |  889 ++++++
 DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.resx                    |  120 
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs           |  520 +++
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.resx         |  123 
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs | 1238 ++++++++
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.cs           |  474 +++
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.resx         |  123 
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs          |  706 ++++
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.resx         |  126 
 DevApp/Gs.DevApp/Gs.DevApp.csproj                         |   72 
 DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.cs                     |   40 
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.resx         |  123 
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.cs           |  360 ++
 DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs      |  170 +
 DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.cs               |   89 
 DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs            |   89 
 DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs             |  136 
 25 files changed, 8,815 insertions(+), 0 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
new file mode 100644
index 0000000..0a38a7b
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
@@ -0,0 +1,1238 @@
+锘縩amespace Gs.DevApp.DevFrm.JJGZ
+{
+    partial class Frm_MESJJERRORJS
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.pageBar1 = new UserControls.Data.UcPageBar();
+            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
+            this.lbGuid = new System.Windows.Forms.Label();
+            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_Remark = new DevExpress.XtraEditors.TextEdit();
+            this.txt_Guid = new DevExpress.XtraEditors.TextEdit();
+            this.txt_ErrorTime = new DevExpress.XtraEditors.DateEdit();
+            this.txt_ErrorNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_ErrorType = new DevExpress.XtraEditors.TextEdit();
+            this.txt_DAAType = new DevExpress.XtraEditors.TextEdit();
+            this.txt_DAA001 = new DevExpress.XtraEditors.SearchLookUpEdit();
+            this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.txt_HourlyType = new DevExpress.XtraEditors.SearchLookUpEdit();
+            this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.txt_HourlySalary = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.gridControl1 = new DevExpress.XtraGrid.GridControl();
+            this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
+            this.repositoryItemSearchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.picCheckBox = new System.Windows.Forms.PictureBox();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.xtraTabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+            this.split1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+            this.split1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            this.xtraTabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+            this.splitMx1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+            this.splitMx1.Panel2.SuspendLayout();
+            this.splitMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+            this.layoutMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ErrorTime.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ErrorTime.Properties.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ErrorNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ErrorType.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_DAAType.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_DAA001.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_HourlyType.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_HourlySalary.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // toolBarMenu1
+            // 
+            this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
+            this.toolBarMenu1.defaultActions = null;
+            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.toolBarMenu1.guidKey = null;
+            this.toolBarMenu1.isSetBtn = false;
+            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
+            this.toolBarMenu1.Name = "toolBarMenu1";
+            this.toolBarMenu1.rptParameter = null;
+            this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+            this.toolBarMenu1.TabIndex = 0;
+            this.toolBarMenu1.xlsInService = null;
+            this.toolBarMenu1.xlsOutParameter = null;
+            // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
+            this.xtraTabControl1.TabIndex = 3;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1,
+            this.xtraTabPage2});
+            // 
+            // xtraTabPage1
+            // 
+            this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+            // 
+            // split1
+            // 
+            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+            this.split1.Horizontal = false;
+            this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Margin = new System.Windows.Forms.Padding(4);
+            this.split1.Name = "split1";
+            // 
+            // split1.Panel1
+            // 
+            this.split1.Panel1.Controls.Add(this.gcMain1);
+            this.split1.Panel1.Controls.Add(this.pageBar1);
+            this.split1.Panel1.Text = "Panel1";
+            // 
+            // split1.Panel2
+            // 
+            this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.split1.Size = new System.Drawing.Size(1408, 698);
+            this.split1.SplitterPosition = 0;
+            this.split1.TabIndex = 0;
+            // 
+            // gcMain1
+            // 
+            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain1.Location = new System.Drawing.Point(0, 0);
+            this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain1.Name = "gcMain1";
+            this.gcMain1.Size = new System.Drawing.Size(1408, 635);
+            this.gcMain1.TabIndex = 2;
+            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.ColumnPanelRowHeight = 61;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gv_createBy,
+            this.gv_createDate,
+            this.gridColumn6,
+            this.gridColumn1,
+            this.gridColumn2,
+            this.gridColumn3,
+            this.gridColumn4,
+            this.gridColumn5,
+            this.gridColumn7,
+            this.gridColumn17});
+            this.gridView1.DetailHeight = 428;
+            this.gridView1.GridControl = this.gcMain1;
+            this.gridView1.IndicatorWidth = 62;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gv_createBy
+            // 
+            this.gv_createBy.AppearanceCell.Options.UseFont = true;
+            this.gv_createBy.Caption = "寤虹珛鑰�";
+            this.gv_createBy.FieldName = "createBy";
+            this.gv_createBy.MinWidth = 62;
+            this.gv_createBy.Name = "gv_createBy";
+            this.gv_createBy.OptionsColumn.AllowEdit = false;
+            this.gv_createBy.Tag = "query_a.create_by";
+            this.gv_createBy.Visible = true;
+            this.gv_createBy.VisibleIndex = 1;
+            this.gv_createBy.Width = 100;
+            // 
+            // gv_createDate
+            // 
+            this.gv_createDate.AppearanceCell.Options.UseFont = true;
+            this.gv_createDate.Caption = "寤虹珛鏃堕棿";
+            this.gv_createDate.FieldName = "createDate";
+            this.gv_createDate.MinWidth = 225;
+            this.gv_createDate.Name = "gv_createDate";
+            this.gv_createDate.OptionsColumn.AllowEdit = false;
+            this.gv_createDate.Tag = "query_a.create_date";
+            this.gv_createDate.Visible = true;
+            this.gv_createDate.VisibleIndex = 2;
+            this.gv_createDate.Width = 286;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "瀹℃牳";
+            this.gridColumn6.FieldName = "checkStatus";
+            this.gridColumn6.MinWidth = 31;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 0;
+            this.gridColumn6.Width = 117;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "鍗曟嵁缂栧彿";
+            this.gridColumn1.FieldName = "errorNo";
+            this.gridColumn1.MinWidth = 30;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Tag = "errorNo";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 3;
+            this.gridColumn1.Width = 112;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "寮傚父鏃ユ湡";
+            this.gridColumn2.FieldName = "errorTime";
+            this.gridColumn2.MinWidth = 30;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Tag = "errorTime";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 4;
+            this.gridColumn2.Width = 112;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "鍗曟嵁绫诲瀷";
+            this.gridColumn3.FieldName = "errorType";
+            this.gridColumn3.MinWidth = 30;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Tag = "errorType";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 5;
+            this.gridColumn3.Width = 112;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "璁℃椂绫诲瀷";
+            this.gridColumn4.FieldName = "hourlyType";
+            this.gridColumn4.MinWidth = 30;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Tag = "hourlyType";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 6;
+            this.gridColumn4.Width = 112;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "璇存槑";
+            this.gridColumn5.FieldName = "remark";
+            this.gridColumn5.MinWidth = 30;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Tag = "remark";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 7;
+            this.gridColumn5.Width = 112;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "宸ュ崟鍙�";
+            this.gridColumn7.FieldName = "dAA001";
+            this.gridColumn7.MinWidth = 30;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Tag = "dAA001";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 8;
+            this.gridColumn7.Width = 112;
+            // 
+            // gridColumn17
+            // 
+            this.gridColumn17.Caption = "宸ュ崟绫诲瀷";
+            this.gridColumn17.FieldName = "dAAType";
+            this.gridColumn17.MinWidth = 30;
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.Tag = "dAAType";
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 9;
+            this.gridColumn17.Width = 112;
+            // 
+            // pageBar1
+            // 
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pageBar1.Location = new System.Drawing.Point(0, 635);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+            this.pageBar1.Name = "pageBar1";
+            this.pageBar1.RecordCount = 0;
+            this.pageBar1.Size = new System.Drawing.Size(1408, 48);
+            this.pageBar1.TabIndex = 4;
+            this.pageBar1.TotalPages = 0;
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Controls.Add(this.splitMx1);
+            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
+            this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+            // 
+            // splitMx1
+            // 
+            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitMx1.Horizontal = false;
+            this.splitMx1.Location = new System.Drawing.Point(0, 0);
+            this.splitMx1.Margin = new System.Windows.Forms.Padding(4);
+            this.splitMx1.Name = "splitMx1";
+            // 
+            // splitMx1.Panel1
+            // 
+            this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+            this.splitMx1.Panel1.Text = "Panel1";
+            // 
+            // splitMx1.Panel2
+            // 
+            this.splitMx1.Panel2.Controls.Add(this.gridControl1);
+            this.splitMx1.Panel2.Text = "Panel2";
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx1.Size = new System.Drawing.Size(1408, 698);
+            this.splitMx1.SplitterPosition = 185;
+            this.splitMx1.TabIndex = 0;
+            // 
+            // layoutMx1
+            // 
+            this.layoutMx1.Controls.Add(this.btnSelect);
+            this.layoutMx1.Controls.Add(this.lbGuid);
+            this.layoutMx1.Controls.Add(this.txt_createDate);
+            this.layoutMx1.Controls.Add(this.txt_createBy);
+            this.layoutMx1.Controls.Add(this.txt_checkBy);
+            this.layoutMx1.Controls.Add(this.txt_checkDate);
+            this.layoutMx1.Controls.Add(this.txt_checkStatus);
+            this.layoutMx1.Controls.Add(this.txt_Remark);
+            this.layoutMx1.Controls.Add(this.txt_Guid);
+            this.layoutMx1.Controls.Add(this.txt_ErrorTime);
+            this.layoutMx1.Controls.Add(this.txt_ErrorNo);
+            this.layoutMx1.Controls.Add(this.txt_ErrorType);
+            this.layoutMx1.Controls.Add(this.txt_DAAType);
+            this.layoutMx1.Controls.Add(this.txt_DAA001);
+            this.layoutMx1.Controls.Add(this.txt_HourlyType);
+            this.layoutMx1.Controls.Add(this.txt_HourlySalary);
+            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem9});
+            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
+            this.layoutMx1.Name = "layoutMx1";
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
+            this.layoutMx1.Root = this.Root;
+            this.layoutMx1.Size = new System.Drawing.Size(1408, 185);
+            this.layoutMx1.TabIndex = 0;
+            this.layoutMx1.Text = "layoutControl1";
+            // 
+            // btnSelect
+            // 
+            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            this.btnSelect.Location = new System.Drawing.Point(359, 135);
+            this.btnSelect.Margin = new System.Windows.Forms.Padding(4);
+            this.btnSelect.Name = "btnSelect";
+            this.btnSelect.Size = new System.Drawing.Size(121, 32);
+            this.btnSelect.StyleController = this.layoutMx1;
+            this.btnSelect.TabIndex = 458;
+            this.btnSelect.Text = "閫夊彇浜哄憳";
+            // 
+            // lbGuid
+            // 
+            this.lbGuid.Location = new System.Drawing.Point(692, 131);
+            this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lbGuid.Name = "lbGuid";
+            this.lbGuid.Size = new System.Drawing.Size(334, 34);
+            this.lbGuid.TabIndex = 1;
+            this.lbGuid.Text = "lbGuid";
+            this.lbGuid.Visible = false;
+            // 
+            // txt_createDate
+            // 
+            this.txt_createDate.Location = new System.Drawing.Point(96, 135);
+            this.txt_createDate.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_createDate.Name = "txt_createDate";
+            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_createDate.Size = new System.Drawing.Size(259, 28);
+            this.txt_createDate.StyleController = this.layoutMx1;
+            this.txt_createDate.TabIndex = 231;
+            this.txt_createDate.Tag = "readonly";
+            // 
+            // txt_createBy
+            // 
+            this.txt_createBy.Location = new System.Drawing.Point(1137, 94);
+            this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_createBy.Name = "txt_createBy";
+            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+            this.txt_createBy.Size = new System.Drawing.Size(259, 28);
+            this.txt_createBy.StyleController = this.layoutMx1;
+            this.txt_createBy.TabIndex = 228;
+            this.txt_createBy.Tag = "readonly";
+            // 
+            // txt_checkBy
+            // 
+            this.txt_checkBy.Location = new System.Drawing.Point(443, 94);
+            this.txt_checkBy.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_checkBy.Name = "txt_checkBy";
+            this.txt_checkBy.Size = new System.Drawing.Size(259, 28);
+            this.txt_checkBy.StyleController = this.layoutMx1;
+            this.txt_checkBy.TabIndex = 247;
+            this.txt_checkBy.Tag = "readonly";
+            // 
+            // txt_checkDate
+            // 
+            this.txt_checkDate.Location = new System.Drawing.Point(790, 94);
+            this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_checkDate.Name = "txt_checkDate";
+            this.txt_checkDate.Size = new System.Drawing.Size(259, 28);
+            this.txt_checkDate.StyleController = this.layoutMx1;
+            this.txt_checkDate.TabIndex = 248;
+            this.txt_checkDate.Tag = "readonly";
+            // 
+            // txt_checkStatus
+            // 
+            this.txt_checkStatus.Location = new System.Drawing.Point(12, 94);
+            this.txt_checkStatus.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_checkStatus.Name = "txt_checkStatus";
+            this.txt_checkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
+            this.txt_checkStatus.Size = new System.Drawing.Size(343, 27);
+            this.txt_checkStatus.StyleController = this.layoutMx1;
+            this.txt_checkStatus.TabIndex = 249;
+            this.txt_checkStatus.Tag = "readonly";
+            // 
+            // txt_Remark
+            // 
+            this.txt_Remark.Location = new System.Drawing.Point(443, 53);
+            this.txt_Remark.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_Remark.Name = "txt_Remark";
+            this.txt_Remark.Size = new System.Drawing.Size(259, 28);
+            this.txt_Remark.StyleController = this.layoutMx1;
+            this.txt_Remark.TabIndex = 250;
+            this.txt_Remark.Tag = "";
+            // 
+            // txt_Guid
+            // 
+            this.txt_Guid.Location = new System.Drawing.Point(790, 135);
+            this.txt_Guid.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_Guid.Name = "txt_Guid";
+            this.txt_Guid.Size = new System.Drawing.Size(259, 28);
+            this.txt_Guid.StyleController = this.layoutMx1;
+            this.txt_Guid.TabIndex = 250;
+            this.txt_Guid.Tag = "";
+            // 
+            // txt_ErrorTime
+            // 
+            this.txt_ErrorTime.EditValue = null;
+            this.txt_ErrorTime.Location = new System.Drawing.Point(96, 53);
+            this.txt_ErrorTime.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_ErrorTime.Name = "txt_ErrorTime";
+            this.txt_ErrorTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_ErrorTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_ErrorTime.Properties.DisplayFormat.FormatString = "";
+            this.txt_ErrorTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txt_ErrorTime.Properties.EditFormat.FormatString = "";
+            this.txt_ErrorTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txt_ErrorTime.Properties.MaskSettings.Set("mask", "");
+            this.txt_ErrorTime.Size = new System.Drawing.Size(259, 28);
+            this.txt_ErrorTime.StyleController = this.layoutMx1;
+            this.txt_ErrorTime.TabIndex = 250;
+            this.txt_ErrorTime.Tag = "";
+            // 
+            // txt_ErrorNo
+            // 
+            this.txt_ErrorNo.Location = new System.Drawing.Point(96, 12);
+            this.txt_ErrorNo.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_ErrorNo.Name = "txt_ErrorNo";
+            this.txt_ErrorNo.Properties.Appearance.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.txt_ErrorNo.Properties.Appearance.Options.UseBackColor = true;
+            this.txt_ErrorNo.Size = new System.Drawing.Size(259, 28);
+            this.txt_ErrorNo.StyleController = this.layoutMx1;
+            this.txt_ErrorNo.TabIndex = 250;
+            this.txt_ErrorNo.Tag = "readonly";
+            // 
+            // txt_ErrorType
+            // 
+            this.txt_ErrorType.EditValue = "";
+            this.txt_ErrorType.Location = new System.Drawing.Point(1137, 12);
+            this.txt_ErrorType.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_ErrorType.Name = "txt_ErrorType";
+            this.txt_ErrorType.Size = new System.Drawing.Size(259, 28);
+            this.txt_ErrorType.StyleController = this.layoutMx1;
+            this.txt_ErrorType.TabIndex = 250;
+            this.txt_ErrorType.Tag = "readonly";
+            // 
+            // txt_DAAType
+            // 
+            this.txt_DAAType.Location = new System.Drawing.Point(1137, 53);
+            this.txt_DAAType.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_DAAType.Name = "txt_DAAType";
+            this.txt_DAAType.Properties.Appearance.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.txt_DAAType.Properties.Appearance.Options.UseBackColor = true;
+            this.txt_DAAType.Size = new System.Drawing.Size(259, 28);
+            this.txt_DAAType.StyleController = this.layoutMx1;
+            this.txt_DAAType.TabIndex = 250;
+            this.txt_DAAType.Tag = "readonly";
+            // 
+            // txt_DAA001
+            // 
+            this.txt_DAA001.Location = new System.Drawing.Point(790, 53);
+            this.txt_DAA001.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_DAA001.Name = "txt_DAA001";
+            this.txt_DAA001.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_DAA001.Properties.NullText = "";
+            this.txt_DAA001.Properties.PopupView = this.searchLookUpEdit1View;
+            this.txt_DAA001.Size = new System.Drawing.Size(259, 28);
+            this.txt_DAA001.StyleController = this.layoutMx1;
+            this.txt_DAA001.TabIndex = 250;
+            this.txt_DAA001.Tag = "";
+            // 
+            // searchLookUpEdit1View
+            // 
+            this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
+            this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+            this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+            // 
+            // txt_HourlyType
+            // 
+            this.txt_HourlyType.Location = new System.Drawing.Point(443, 12);
+            this.txt_HourlyType.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_HourlyType.Name = "txt_HourlyType";
+            this.txt_HourlyType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_HourlyType.Properties.NullText = "";
+            this.txt_HourlyType.Properties.PopupSizeable = false;
+            this.txt_HourlyType.Properties.PopupView = this.gridView3;
+            this.txt_HourlyType.Size = new System.Drawing.Size(259, 28);
+            this.txt_HourlyType.StyleController = this.layoutMx1;
+            this.txt_HourlyType.TabIndex = 250;
+            this.txt_HourlyType.Tag = "";
+            this.txt_HourlyType.EditValueChanged += new System.EventHandler(this.txt_HourlyType_EditValueChanged);
+            // 
+            // gridView3
+            // 
+            this.gridView3.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            this.gridView3.Name = "gridView3";
+            this.gridView3.OptionsSelection.EnableAppearanceFocusedCell = false;
+            this.gridView3.OptionsView.ShowGroupPanel = false;
+            // 
+            // txt_HourlySalary
+            // 
+            this.txt_HourlySalary.Location = new System.Drawing.Point(790, 12);
+            this.txt_HourlySalary.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_HourlySalary.Name = "txt_HourlySalary";
+            this.txt_HourlySalary.Properties.Appearance.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.txt_HourlySalary.Properties.Appearance.Options.UseBackColor = true;
+            this.txt_HourlySalary.Size = new System.Drawing.Size(259, 28);
+            this.txt_HourlySalary.StyleController = this.layoutMx1;
+            this.txt_HourlySalary.TabIndex = 250;
+            this.txt_HourlySalary.Tag = "readonly";
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.lbGuid;
+            this.layoutControlItem9.Location = new System.Drawing.Point(542, 96);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem9.Text = "lbGuid";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem9.TextVisible = false;
+            // 
+            // Root
+            // 
+            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.Root.GroupBordersVisible = false;
+            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem12,
+            this.layoutControlItem13,
+            this.layoutControlItem15,
+            this.layoutControlItem6,
+            this.layoutControlItem5,
+            this.layoutControlItem8,
+            this.layoutControlItem7,
+            this.layoutControlItem10,
+            this.layoutControlItem14,
+            this.layoutControlItem3,
+            this.layoutControlItem1,
+            this.layoutControlItem2,
+            this.layoutControlItem11,
+            this.layoutControlItem16,
+            this.layoutControlItem4});
+            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.Root.Name = "Root";
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
+            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4});
+            this.Root.Size = new System.Drawing.Size(1408, 185);
+            this.Root.TextVisible = false;
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_HourlyType;
+            this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem12.CustomizationFormText = "璁℃椂绫诲瀷";
+            this.layoutControlItem12.Location = new System.Drawing.Point(347, 0);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem12.Size = new System.Drawing.Size(347, 41);
+            this.layoutControlItem12.Text = "璁℃椂绫诲瀷";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_Guid;
+            this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem13.CustomizationFormText = "Guid";
+            this.layoutControlItem13.Location = new System.Drawing.Point(694, 123);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem13.Size = new System.Drawing.Size(347, 42);
+            this.layoutControlItem13.Text = "Guid";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
+            this.layoutControlItem13.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.btnSelect;
+            this.layoutControlItem15.Location = new System.Drawing.Point(347, 123);
+            this.layoutControlItem15.MaxSize = new System.Drawing.Size(125, 36);
+            this.layoutControlItem15.MinSize = new System.Drawing.Size(37, 36);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem15.Size = new System.Drawing.Size(347, 42);
+            this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem15.TextVisible = false;
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_createDate;
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 123);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem6.Size = new System.Drawing.Size(347, 42);
+            this.layoutControlItem6.Text = "寤虹珛鏃堕棿";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txt_createBy;
+            this.layoutControlItem5.Location = new System.Drawing.Point(1041, 82);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem5.Size = new System.Drawing.Size(347, 41);
+            this.layoutControlItem5.Text = "寤虹珛鑰�";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_checkDate;
+            this.layoutControlItem8.Location = new System.Drawing.Point(694, 82);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem8.Size = new System.Drawing.Size(347, 41);
+            this.layoutControlItem8.Text = "瀹℃牳鏃堕棿";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_checkBy;
+            this.layoutControlItem7.Location = new System.Drawing.Point(347, 82);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem7.Size = new System.Drawing.Size(347, 41);
+            this.layoutControlItem7.Text = "瀹℃牳鑰�";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_checkStatus;
+            this.layoutControlItem10.Location = new System.Drawing.Point(0, 82);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem10.Size = new System.Drawing.Size(347, 41);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem10.TextVisible = false;
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_DAAType;
+            this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem14.CustomizationFormText = "宸ュ崟绫诲瀷";
+            this.layoutControlItem14.Location = new System.Drawing.Point(1041, 41);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem14.Size = new System.Drawing.Size(347, 41);
+            this.layoutControlItem14.Text = "宸ュ崟绫诲瀷";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_DAA001;
+            this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem3.CustomizationFormText = "宸ュ崟鍙�";
+            this.layoutControlItem3.Location = new System.Drawing.Point(694, 41);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem3.Size = new System.Drawing.Size(347, 41);
+            this.layoutControlItem3.Text = "宸ュ崟鍙�";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txt_Remark;
+            this.layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem1.CustomizationFormText = "璁℃椂璇存槑";
+            this.layoutControlItem1.Location = new System.Drawing.Point(347, 41);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem1.Size = new System.Drawing.Size(347, 41);
+            this.layoutControlItem1.Text = "璇存槑";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_ErrorTime;
+            this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem2.CustomizationFormText = "寮傚父鏃ユ湡";
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 41);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem2.Size = new System.Drawing.Size(347, 41);
+            this.layoutControlItem2.Text = "寮傚父鏃ユ湡";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txt_ErrorType;
+            this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem11.CustomizationFormText = "鍗曟嵁绫诲瀷";
+            this.layoutControlItem11.Location = new System.Drawing.Point(1041, 0);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem11.Size = new System.Drawing.Size(347, 41);
+            this.layoutControlItem11.Text = "鍗曟嵁绫诲瀷";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem16
+            // 
+            this.layoutControlItem16.Control = this.txt_HourlySalary;
+            this.layoutControlItem16.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem16.CustomizationFormText = "璁℃椂鍗曚环";
+            this.layoutControlItem16.Location = new System.Drawing.Point(694, 0);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem16.Size = new System.Drawing.Size(347, 41);
+            this.layoutControlItem16.Text = "璁℃椂鍗曚环";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_ErrorNo;
+            this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem4.CustomizationFormText = "寮傚父鍗曞彿";
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.Size = new System.Drawing.Size(347, 41);
+            this.layoutControlItem4.Text = "寮傚父鍗曞彿";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // gridControl1
+            // 
+            this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gridControl1.Location = new System.Drawing.Point(0, 0);
+            this.gridControl1.MainView = this.gridView2;
+            this.gridControl1.Name = "gridControl1";
+            this.gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemSearchLookUpEdit1,
+            this.repositoryItemButtonEdit1});
+            this.gridControl1.Size = new System.Drawing.Size(1408, 498);
+            this.gridControl1.TabIndex = 0;
+            this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView2});
+            // 
+            // gridView2
+            // 
+            this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn16,
+            this.gridColumn9,
+            this.gridColumn10,
+            this.gridColumn11,
+            this.gridColumn12,
+            this.gridColumn13,
+            this.gridColumn14,
+            this.gridColumn15,
+            this.gridColumn18,
+            this.gridColumn19,
+            this.gvMxDel});
+            this.gridView2.GridControl = this.gridControl1;
+            this.gridView2.Name = "gridView2";
+            this.gridView2.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn16
+            // 
+            this.gridColumn16.Caption = "浜哄憳Id";
+            this.gridColumn16.FieldName = "staffId";
+            this.gridColumn16.MinWidth = 30;
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 0;
+            this.gridColumn16.Width = 112;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "浜哄憳宸ュ彿";
+            this.gridColumn9.FieldName = "staffNo";
+            this.gridColumn9.MinWidth = 30;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 1;
+            this.gridColumn9.Width = 112;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "浜哄憳濮撳悕";
+            this.gridColumn10.FieldName = "staffName";
+            this.gridColumn10.MinWidth = 30;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 2;
+            this.gridColumn10.Width = 112;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "鏃堕暱锛堝皬鏃讹級";
+            this.gridColumn11.FieldName = "hour";
+            this.gridColumn11.MinWidth = 30;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 3;
+            this.gridColumn11.Width = 112;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "浜х嚎";
+            this.gridColumn12.ColumnEdit = this.repositoryItemSearchLookUpEdit1;
+            this.gridColumn12.FieldName = "lineNo";
+            this.gridColumn12.MinWidth = 30;
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 4;
+            this.gridColumn12.Width = 112;
+            // 
+            // repositoryItemSearchLookUpEdit1
+            // 
+            this.repositoryItemSearchLookUpEdit1.AutoHeight = false;
+            this.repositoryItemSearchLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1";
+            this.repositoryItemSearchLookUpEdit1.PopupView = this.repositoryItemSearchLookUpEdit1View;
+            this.repositoryItemSearchLookUpEdit1.EditValueChanged += new System.EventHandler(this.repositoryItemSearchLookUpEdit1_EditValueChanged);
+            // 
+            // repositoryItemSearchLookUpEdit1View
+            // 
+            this.repositoryItemSearchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            this.repositoryItemSearchLookUpEdit1View.Name = "repositoryItemSearchLookUpEdit1View";
+            this.repositoryItemSearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+            this.repositoryItemSearchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "浜х嚎鍚嶇О";
+            this.gridColumn13.FieldName = "lineName";
+            this.gridColumn13.MinWidth = 30;
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.OptionsColumn.ReadOnly = true;
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 5;
+            this.gridColumn13.Width = 112;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.Caption = "璁℃椂宸ヨ祫";
+            this.gridColumn14.FieldName = "salary";
+            this.gridColumn14.MinWidth = 30;
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.OptionsColumn.ReadOnly = true;
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 6;
+            this.gridColumn14.Width = 112;
+            // 
+            // gridColumn15
+            // 
+            this.gridColumn15.Caption = "璇存槑";
+            this.gridColumn15.FieldName = "remark";
+            this.gridColumn15.MinWidth = 30;
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 7;
+            this.gridColumn15.Width = 112;
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.Caption = "涓婚敭";
+            this.gridColumn18.FieldName = "id";
+            this.gridColumn18.MinWidth = 30;
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.Width = 112;
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.Caption = "澶栭敭";
+            this.gridColumn19.FieldName = "pid";
+            this.gridColumn19.MinWidth = 30;
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.Width = 112;
+            // 
+            // gvMxDel
+            // 
+            this.gvMxDel.Caption = "绉诲嚭";
+            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gvMxDel.MinWidth = 30;
+            this.gvMxDel.Name = "gvMxDel";
+            this.gvMxDel.Visible = true;
+            this.gvMxDel.VisibleIndex = 8;
+            this.gvMxDel.Width = 112;
+            // 
+            // repositoryItemButtonEdit1
+            // 
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+            // 
+            // picCheckBox
+            // 
+            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+            this.picCheckBox.Location = new System.Drawing.Point(1285, 29);
+            this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
+            this.picCheckBox.Name = "picCheckBox";
+            this.picCheckBox.Size = new System.Drawing.Size(125, 61);
+            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.picCheckBox.TabIndex = 9;
+            this.picCheckBox.TabStop = false;
+            this.picCheckBox.Visible = false;
+            // 
+            // Frm_MESJJERRORJS
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1410, 834);
+            this.Controls.Add(this.picCheckBox);
+            this.Controls.Add(this.xtraTabControl1);
+            this.Controls.Add(this.toolBarMenu1);
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "Frm_MESJJERRORJS";
+            this.Text = "寮傚父宸ユ椂";
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.xtraTabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+            this.split1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+            this.split1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            this.xtraTabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+            this.splitMx1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+            this.splitMx1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+            this.splitMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+            this.layoutMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ErrorTime.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ErrorTime.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ErrorNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ErrorType.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_DAAType.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_DAA001.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_HourlyType.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_HourlySalary.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1View)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+        #endregion
+        private UserControl.UcToolBarMenu toolBarMenu1;
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+        private DevExpress.XtraEditors.SplitContainerControl split1;
+        private DevExpress.XtraGrid.GridControl gcMain1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+        private UserControls.Data.UcPageBar pageBar1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+        private System.Windows.Forms.Label lbGuid;
+        private DevExpress.XtraEditors.TextEdit txt_createDate;
+        private DevExpress.XtraEditors.TextEdit txt_createBy;
+        private DevExpress.XtraLayout.LayoutControl layoutMx1;
+        private DevExpress.XtraLayout.LayoutControlGroup Root;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraEditors.TextEdit txt_checkBy;
+        private DevExpress.XtraEditors.TextEdit txt_checkDate;
+        private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
+        private System.Windows.Forms.PictureBox picCheckBox;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraEditors.TextEdit txt_Remark;
+        private DevExpress.XtraEditors.TextEdit txt_Guid;
+        private DevExpress.XtraEditors.DateEdit txt_ErrorTime;
+        private DevExpress.XtraGrid.GridControl gridControl1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraEditors.TextEdit txt_ErrorNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraEditors.TextEdit txt_ErrorType;
+        private DevExpress.XtraEditors.TextEdit txt_DAAType;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraEditors.SearchLookUpEdit txt_DAA001;
+        private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
+        private DevExpress.XtraEditors.SimpleButton btnSelect;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraEditors.SearchLookUpEdit txt_HourlyType;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraEditors.TextEdit txt_HourlySalary;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1;
+        private DevExpress.XtraGrid.Views.Grid.GridView repositoryItemSearchLookUpEdit1View;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
new file mode 100644
index 0000000..db29302
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
@@ -0,0 +1,706 @@
+锘縰sing DevExpress.ClipboardSource.SpreadsheetML;
+using DevExpress.XtraEditors;
+using DevExpress.XtraEditors.Repository;
+using DevExpress.XtraPrinting.Native;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using System.Windows.Media.Animation;
+
+namespace Gs.DevApp.DevFrm.JJGZ
+{
+    public partial class Frm_MESJJERRORJS : DevExpress.XtraEditors.XtraForm
+    {
+        string _webServiceName = "MesJjgzErrorJs/";
+        List<FilterEntity> _filterList = new List<FilterEntity>();
+
+        public Frm_MESJJERRORJS()
+        {
+            InitializeComponent();
+            gridView2.CellValueChanged += gridView2_CellValueChanged;
+            this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
+            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            this.toolBarMenu1.getXmlConfig();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
+            {
+                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+            }, tips);
+            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+            {
+                getModel(value);
+            }, (value) =>
+            {
+                getPageList(this.pageBar1.CurrentPage);
+            }, lbGuid);
+            getPageList(1);
+            pageBar1.PagerEvent += PageBar1_PagerEvent;
+
+            //閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
+            btnSelect.Click += (s, e) =>
+            {
+                var frm = new SelectSTAFF();
+                //璧嬪�肩粰鏄庣粏琛�
+                frm.UpdateParent += (ss, ee) =>
+                {
+                    try
+                    {
+                        var lst = new List<string>();
+                        lst = ee.StringList;
+                        var _obj = lst;
+                        var strReturn = UtilityHelper.HttpPost("",
+                            "MesJjgzErrorJs/SelectPbaToView",
+                            JsonConvert.SerializeObject(_obj));
+                        ReturnModel <dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strReturn);
+
+                        dynamic dy = _rtn.rtnData.list;
+                        JObject _job = JObject.Parse(strReturn);
+                        JArray array = new JArray();
+                        foreach (var a in _job["rtnData"]["list"])
+                        {
+                            array.Add(a);
+                        }
+
+                        DataTable _newTable = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+                        DataTable _oldTable = _newTable.Clone();
+                        DataRow[] sourceRows = _newTable.Select();
+                        for (int i = 0; i < sourceRows.Length; i++)
+                        {
+                            _oldTable.ImportRow(sourceRows[i]);
+                        }
+                        gridControl1.BindingContext = new BindingContext();
+                        gridControl1.DataSource = _oldTable;
+                        gridControl1.ForceInitialize();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView2);
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show(ex.Message);
+                    }
+                };
+                frm.ShowDialog();
+            };
+            GetWORKSHOPLINE();
+        }
+
+        /// <summary>
+        /// 鑾峰彇涓嬫媺妗嗘暟鎹�
+        /// </summary>
+        private void GetTimeType()
+        {
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetTimeType", "");
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    dynamic dy = _rtn.rtnData;
+                    JObject _job = JObject.Parse(strJson);
+                    JArray array = new JArray();
+                    foreach (var a in _job["rtnData"]["list"])
+                    {
+                        array.Add(a);
+                    }
+                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+
+                    txt_HourlyType.Properties.ValueMember = "璁℃椂绫诲瀷";
+                    txt_HourlyType.Properties.DisplayMember = "璁℃椂绫诲瀷";
+                    txt_HourlyType.Properties.ShowClearButton = false;
+                    txt_HourlyType.Properties.DataSource = dt;
+                }
+                else
+                {
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 鑾峰彇涓嬫媺妗嗘暟鎹�
+        /// </summary>
+        private void GetWOMDAAInfo()
+        {
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetWOMDAAInfo", "");
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    dynamic dy = _rtn.rtnData;
+                    JObject _job = JObject.Parse(strJson);
+                    JArray array = new JArray();
+                    foreach (var a in _job["rtnData"]["list"])
+                    {
+                        array.Add(a);
+                    }
+                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+
+                    txt_DAA001.Properties.ValueMember = "宸ュ崟鍙�";
+                    txt_DAA001.Properties.DisplayMember = "宸ュ崟鍙�";
+                    txt_DAA001.Properties.ShowClearButton = false;
+                    txt_DAA001.Properties.DataSource = dt;
+                }
+                else
+                {
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 鑾峰彇涓嬫媺妗嗘暟鎹�
+        /// </summary>
+        private void GetWORKSHOPLINE()
+        {
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetWORKSHOPLINE", "");
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    dynamic dy = _rtn.rtnData;
+                    JObject _job = JObject.Parse(strJson);
+                    JArray array = new JArray();
+                    foreach (var a in _job["rtnData"]["list"])
+                    {
+                        array.Add(a);
+                    }
+                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+
+                    this.repositoryItemSearchLookUpEdit1.ValueMember = "浜х嚎";
+                    this.repositoryItemSearchLookUpEdit1.DisplayMember = "浜х嚎";
+                    this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+                }
+                else
+                {
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        {
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            await Task.Delay(100);
+            getPageList(1);
+        }
+
+        /// <summary>
+        /// 鍒嗛〉浜嬩欢
+        /// </summary>
+        /// <param name="curPage"></param>
+        /// <param name="pageSize"></param>
+        private void PageBar1_PagerEvent(int curPage, int pageSize)
+        {
+            getPageList(curPage);
+        }
+        /// <summary>
+        /// 鏌ヨ浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+        {
+            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+            gridView1.ActiveFilter.Clear();
+            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+            frm.UpdateParent += Frm_UpdateParent;
+            frm.ShowDialog();
+        }
+        /// <summary>
+        /// 鏌ヨ鍥炶皟
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+        {
+            _filterList = e.FilterList;
+            getPageList(1);
+        }
+        /// <summary>
+        ///     瀹℃牳浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+        {
+            _toolCk(1);
+        }
+
+        /// <summary>
+        ///     鍙嶅鏍�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+        {
+            _toolCk(0);
+        }
+        /// <summary>
+        /// 鍙栨秷浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+        {
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+        }
+
+        /// <summary>
+        /// 鍒犻櫎浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
+        {
+            string rowGuid = "", rowName = "";
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "guid");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+                return;
+            List<dynamic> lst = new List<dynamic>();
+            lst.Add(rowGuid);
+            var _obj = new
+            {
+                guid = rowGuid,
+                mxGuid = Guid.Empty.ToString(),
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    if (xtraTabControl1.SelectedTabPageIndex == 0)
+                    { }
+                    else
+                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+                    getPageList(this.pageBar1.CurrentPage);
+                }
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 鍒锋柊浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+        {
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+                getModel(lbGuid.Text.Trim());
+            else
+            {
+                //_filterList.Clear();
+                //if (gridView1.ActiveFilter.Count > 0)
+                //{
+                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                //    gridView1.ActiveFilter.Clear();
+                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                //}
+                //getPageList(1);
+                getPageList(this.pageBar1.CurrentPage);
+                GetTimeType();
+                GetWOMDAAInfo();
+            }
+        }
+
+        /// <summary>
+        /// 鏂板浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
+        {
+            lbGuid.Text = "";
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
+            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
+            txt_ErrorType.EditValue = "璁℃椂宸ユ椂";
+            GetTimeType();
+            GetWOMDAAInfo();
+        }
+        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+        {
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_Guid, gridView1);
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+
+                getModel(rowGuid);
+            GetTimeType();
+            GetWOMDAAInfo();
+        }
+
+        /// <summary>
+        /// 淇濆瓨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.isSetBtn = false;
+            if (string.IsNullOrWhiteSpace( txt_HourlyType.Text))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璁℃椂绫诲瀷锛�");
+                txt_HourlyType.Focus();
+                return;
+            }
+            if (string.IsNullOrWhiteSpace(txt_ErrorTime.Text))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐢熸晥鏃ユ湡锛�");
+                txt_ErrorTime.Focus();
+                return;
+            }
+
+            var _obj = new
+            {
+                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+                errorNo = txt_ErrorNo.Text.Trim(),//寮傚父鍗曞彿
+                hourlyType = txt_HourlyType.Text.Trim(),//璁℃椂绫诲瀷
+                errorType = txt_ErrorType.Text.Trim(),//鍗曟嵁绫诲瀷
+                errorTime = txt_ErrorTime.Text.Trim(),//寮傚父鏃ユ湡
+                hourlySalary = txt_HourlySalary.Text.Trim(),
+                remark = txt_Remark.Text.Trim(),//璇存槑
+                DAA001 = txt_DAA001.Text.Trim(),//宸ュ崟鍙�
+                DAAType = txt_DAAType.Text.Trim(),//宸ュ崟绫诲瀷
+                list = new List<dynamic>(),
+            };
+            gridView2.CloseEditor();
+            gridView2.PostEditor();
+            gridView2.UpdateCurrentRow();
+            if (gridView2.DataRowCount <= 0)
+            {
+                MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏄庣粏锛�");
+                return;
+            }
+            for (var i = 0; i < gridView2.DataRowCount; i++)
+            {
+                var row = gridView2.GetDataRow(i);
+                if (row != null)
+                {
+                    Guid? _guid = UtilityHelper.ToGuid(row["id"].ToString());
+                    if (string.IsNullOrEmpty(row["staffId"].ToString()))
+                    {
+                        MsgHelper.ShowError("鍛樺伐涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(row["hour"].ToString()))
+                    {
+                        MsgHelper.ShowError("鏃堕暱涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(row["lineNo"].ToString()))
+                    {
+                        MsgHelper.ShowError("鐢熶骇绾夸笉鑳戒负绌猴紒");
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(row["salary"].ToString()))
+                    {
+                        MsgHelper.ShowError("璁℃椂宸ヨ祫涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+
+                    _obj.list.Add(new
+                    {
+                        Guid = _guid,
+                        ID = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["id"].ToString()),
+                        Staff_Id = row["staffId"].ToString(),
+                        Staff_No = row["staffNo"].ToString(),
+                        Staff_Name = row["staffName"].ToString(),
+                        Hour = row["hour"].ToString(), //璁℃椂绫诲瀷
+                        Line_No = row["lineNo"].ToString(),
+                        Line_Name = row["lineName"].ToString(),
+                        Salary = row["salary"].ToString(), //璁℃椂宸ヨ祫
+                        Remark = row["remark"].ToString(), //澶囨敞
+                    });
+                }
+            }
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+
+                if (_rtn.rtnCode > 0)
+                {
+                    ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+                    lbGuid.Text = _rtn.rtnData.outGuid;
+                   
+                    toolBarMenu1.isSetBtn = true;
+                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+                
+                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
+                    toolBarMenu1.currentAction = "";
+                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+                }
+                else
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage)
+        {
+            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "", "", "", _sbSqlWhere.ToString());
+            var json = JsonConvert.SerializeObject(pgq);
+            try
+            {
+                var strReturn = UtilityHelper.HttpPost("",
+                    _webServiceName + "GetListPage", json);
+                var dd = UtilityHelper.ReturnToTablePage(strReturn);
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    gcMain1.BindingContext = new BindingContext();
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain1.DataSource = dt;
+                        gcMain1.ForceInitialize();
+                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
+                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="strGuid">涓婚敭</param>
+        /// <param name="isEdit">鏄惁鍙紪杈�</param>
+        /// <param name="tabIdx">閫夐」鍗″簭鍙�</param>
+        private void getModel(string strGuid)
+        {
+            bool isEdit = false;
+            if (toolBarMenu1.currentAction == "add") return;
+            if (toolBarMenu1.currentAction == "edit") isEdit = true;
+            if (string.IsNullOrEmpty(strGuid))
+            {
+                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            var _obj = new
+            {
+                guid = strGuid,//涓诲缓
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    dynamic dy = _rtn.rtnData;
+                    lbGuid.Text = strGuid;
+                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
+                    JObject _job = JObject.Parse(strJson);
+                    JArray array = new JArray();
+                    foreach (var a in _job["rtnData"]["list"])
+                    {
+                        array.Add(a);
+                    }
+                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+                    if (dt.Rows.Count > 0)
+                    {
+                        gridControl1.BindingContext = new BindingContext();
+                        gridControl1.DataSource = dt;
+                        gridControl1.ForceInitialize();
+                        gridView2.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView2);
+                    }
+                    else
+                    {
+                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gridControl1, gridView2);
+                    }
+                }
+                else
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+
+        /// <summary>
+        /// 宸ュ叿鏉′簨浠�
+        /// </summary>
+        /// <param name="inFieldValue"></param>
+        private void _toolCk(int _inFieldValue)
+        {
+            string strMsg = "";
+            switch (_inFieldValue)
+            {
+                case 1:
+                    strMsg = "瀹℃牳";
+                    break;
+                case 0:
+                    strMsg = "鍙嶅鏍�";
+                    break;
+            }
+            ;
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "guid");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+                return;
+            var _obj = new
+            {
+                guid = rowGuid,
+                ckValue = _inFieldValue,
+                parameter = "MES_JJGZ_ERRORJS,check_Date,check_Status,check_user"
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
+                    if (xtraTabControl1.SelectedTabPageIndex == 1)
+                    {
+                        getModel(lbGuid.Text.Trim());
+                    }
+                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+                    gridView1.FocusedRowHandle = rowHandle;
+                    UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
+                }
+                else
+                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        private void txt_HourlyType_EditValueChanged(object sender, EventArgs e)
+        {
+            SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
+            DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
+            if (SelectedDataRow != null)
+            {
+                txt_HourlyType.EditValue = SelectedDataRow["璁℃椂绫诲瀷"].ToString();
+                txt_HourlySalary.EditValue = SelectedDataRow["璁℃椂鍗曚环"];
+            }
+            
+        }
+
+        private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
+        {
+            SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
+            DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
+            gridView2.SetFocusedRowCellValue("lineNo", SelectedDataRow["浜х嚎"]);
+            gridView2.SetFocusedRowCellValue("lineName", SelectedDataRow["浜х嚎鍚嶇О"]);
+        }
+
+        /// <summary>
+        /// 绉诲嚭鏄庣粏
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+        {
+            var rowhandle = gridView2.FocusedRowHandle;
+            if (rowhandle < 0)
+                return;
+            if (e.Button.Index == 0)
+            {
+                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+                    return;
+                gridView2.DeleteRow(rowhandle);
+            }
+        }
+
+        private void gridView2_CellValueChanged(object sender, DevExpress.XtraGrid.Views.Base.CellValueChangedEventArgs e)
+        {
+            if (e.Column.FieldName == "hour")
+            {
+                var row = gridView2.GetDataRow(e.RowHandle);
+                if (row != null)
+                {
+                    decimal hourlySalary = 0;
+                    decimal hour = 0;
+                    // 鑾峰彇璁℃椂鍗曚环
+                    decimal.TryParse(txt_HourlySalary.Text, out hourlySalary);
+                    // 鑾峰彇鏃堕暱
+                    decimal.TryParse(row["hour"]?.ToString(), out hour);
+                    // 璁$畻璁℃椂宸ヨ祫
+                    row["salary"] = hourlySalary * hour;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.resx b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.resx
new file mode 100644
index 0000000..5160e8b
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.resx
@@ -0,0 +1,123 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs
new file mode 100644
index 0000000..3cb9ccd
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.Designer.cs
@@ -0,0 +1,893 @@
+锘縩amespace Gs.DevApp.DevFrm.JJGZ
+{
+    partial class Frm_MesAttanCon
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.gridControl1 = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.gridControl2 = new DevExpress.XtraGrid.GridControl();
+            this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn46 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.gridControl3 = new DevExpress.XtraGrid.GridControl();
+            this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn45 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
+            this.gridControl4 = new DevExpress.XtraGrid.GridControl();
+            this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn41 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn44 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
+            this.splitContainerControl1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
+            this.splitContainerControl1.Panel2.SuspendLayout();
+            this.splitContainerControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.xtraTabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
+            this.xtraTabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
+            this.xtraTabPage3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // toolBarMenu1
+            // 
+            this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
+            this.toolBarMenu1.defaultActions = null;
+            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.toolBarMenu1.guidKey = null;
+            this.toolBarMenu1.isSetBtn = false;
+            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
+            this.toolBarMenu1.Name = "toolBarMenu1";
+            this.toolBarMenu1.rptParameter = null;
+            this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+            this.toolBarMenu1.TabIndex = 0;
+            this.toolBarMenu1.xlsInService = null;
+            this.toolBarMenu1.xlsOutParameter = null;
+            // 
+            // picCheckBox
+            // 
+            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+            this.picCheckBox.Location = new System.Drawing.Point(1285, 29);
+            this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
+            this.picCheckBox.Name = "picCheckBox";
+            this.picCheckBox.Size = new System.Drawing.Size(125, 61);
+            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.picCheckBox.TabIndex = 9;
+            this.picCheckBox.TabStop = false;
+            this.picCheckBox.Visible = false;
+            // 
+            // splitContainerControl1
+            // 
+            this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainerControl1.Horizontal = false;
+            this.splitContainerControl1.Location = new System.Drawing.Point(0, 98);
+            this.splitContainerControl1.Name = "splitContainerControl1";
+            // 
+            // splitContainerControl1.Panel1
+            // 
+            this.splitContainerControl1.Panel1.Controls.Add(this.gridControl1);
+            this.splitContainerControl1.Panel1.Text = "Panel1";
+            // 
+            // splitContainerControl1.Panel2
+            // 
+            this.splitContainerControl1.Panel2.Controls.Add(this.xtraTabControl1);
+            this.splitContainerControl1.Panel2.Text = "Panel2";
+            this.splitContainerControl1.Size = new System.Drawing.Size(1410, 736);
+            this.splitContainerControl1.SplitterPosition = 292;
+            this.splitContainerControl1.TabIndex = 10;
+            // 
+            // gridControl1
+            // 
+            this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gridControl1.Location = new System.Drawing.Point(0, 0);
+            this.gridControl1.MainView = this.gridView1;
+            this.gridControl1.Name = "gridControl1";
+            this.gridControl1.Size = new System.Drawing.Size(1410, 292);
+            this.gridControl1.TabIndex = 0;
+            this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn1,
+            this.gridColumn2,
+            this.gridColumn3,
+            this.gridColumn4,
+            this.gridColumn5,
+            this.gridColumn6,
+            this.gridColumn7,
+            this.gridColumn8,
+            this.gridColumn9,
+            this.gridColumn10,
+            this.gridColumn11,
+            this.gridColumn47,
+            this.gridColumn48});
+            this.gridView1.GridControl = this.gridControl1;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "鍑哄嫟鏃ユ湡";
+            this.gridColumn1.FieldName = "attenDate";
+            this.gridColumn1.MinWidth = 30;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 1;
+            this.gridColumn1.Width = 112;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "浜х嚎缂栧彿";
+            this.gridColumn2.FieldName = "lineNo";
+            this.gridColumn2.MinWidth = 30;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 2;
+            this.gridColumn2.Width = 112;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "浜х嚎鍚嶇О";
+            this.gridColumn3.FieldName = "lineName";
+            this.gridColumn3.MinWidth = 30;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 3;
+            this.gridColumn3.Width = 112;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "浜哄憳";
+            this.gridColumn4.FieldName = "staffNo";
+            this.gridColumn4.MinWidth = 30;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 4;
+            this.gridColumn4.Width = 112;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "濮撳悕";
+            this.gridColumn5.FieldName = "staffName";
+            this.gridColumn5.MinWidth = 30;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 5;
+            this.gridColumn5.Width = 112;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "骞冲潎宸ヨ祫";
+            this.gridColumn6.FieldName = "salary";
+            this.gridColumn6.MinWidth = 30;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 6;
+            this.gridColumn6.Width = 112;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "鍑哄嫟宸ユ椂";
+            this.gridColumn7.FieldName = "hour";
+            this.gridColumn7.MinWidth = 30;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 7;
+            this.gridColumn7.Width = 112;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "璁′欢宸ヨ祫";
+            this.gridColumn8.FieldName = "jJSalary";
+            this.gridColumn8.MinWidth = 30;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 8;
+            this.gridColumn8.Width = 112;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "璁℃椂宸ヨ祫";
+            this.gridColumn9.FieldName = "jSSalary";
+            this.gridColumn9.MinWidth = 30;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 9;
+            this.gridColumn9.Width = 112;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "鎬诲伐璧�";
+            this.gridColumn10.FieldName = "sumSalary";
+            this.gridColumn10.MinWidth = 30;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 10;
+            this.gridColumn10.Width = 112;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "澶囨敞";
+            this.gridColumn11.FieldName = "remark";
+            this.gridColumn11.MinWidth = 30;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 11;
+            this.gridColumn11.Width = 112;
+            // 
+            // gridColumn47
+            // 
+            this.gridColumn47.Caption = "涓婚敭";
+            this.gridColumn47.FieldName = "guid";
+            this.gridColumn47.MinWidth = 30;
+            this.gridColumn47.Name = "gridColumn47";
+            this.gridColumn47.Width = 112;
+            // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1410, 429);
+            this.xtraTabControl1.TabIndex = 0;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1,
+            this.xtraTabPage2,
+            this.xtraTabPage3});
+            // 
+            // xtraTabPage1
+            // 
+            this.xtraTabPage1.Controls.Add(this.gridControl2);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1408, 391);
+            this.xtraTabPage1.Text = "鑰冨嫟琛ㄧ‘璁�";
+            // 
+            // gridControl2
+            // 
+            this.gridControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gridControl2.Location = new System.Drawing.Point(0, 0);
+            this.gridControl2.MainView = this.gridView2;
+            this.gridControl2.Name = "gridControl2";
+            this.gridControl2.Size = new System.Drawing.Size(1408, 391);
+            this.gridControl2.TabIndex = 0;
+            this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView2});
+            // 
+            // gridView2
+            // 
+            this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn12,
+            this.gridColumn13,
+            this.gridColumn14,
+            this.gridColumn15,
+            this.gridColumn16,
+            this.gridColumn17,
+            this.gridColumn18,
+            this.gridColumn19,
+            this.gridColumn20,
+            this.gridColumn21,
+            this.gridColumn22,
+            this.gridColumn46});
+            this.gridView2.GridControl = this.gridControl2;
+            this.gridView2.Name = "gridView2";
+            this.gridView2.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "鍑哄嫟鏃ユ湡";
+            this.gridColumn12.FieldName = "attenDate";
+            this.gridColumn12.MinWidth = 30;
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 0;
+            this.gridColumn12.Width = 112;
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "浜х嚎缂栧彿";
+            this.gridColumn13.FieldName = "lineNo";
+            this.gridColumn13.MinWidth = 30;
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 1;
+            this.gridColumn13.Width = 112;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.Caption = "浜х嚎鍚嶇О";
+            this.gridColumn14.FieldName = "lineName";
+            this.gridColumn14.MinWidth = 30;
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 2;
+            this.gridColumn14.Width = 112;
+            // 
+            // gridColumn15
+            // 
+            this.gridColumn15.Caption = "浜哄憳";
+            this.gridColumn15.FieldName = "staffNo";
+            this.gridColumn15.MinWidth = 30;
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 3;
+            this.gridColumn15.Width = 112;
+            // 
+            // gridColumn16
+            // 
+            this.gridColumn16.Caption = "濮撳悕";
+            this.gridColumn16.FieldName = "staffName";
+            this.gridColumn16.MinWidth = 30;
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 4;
+            this.gridColumn16.Width = 112;
+            // 
+            // gridColumn17
+            // 
+            this.gridColumn17.Caption = "鍑哄嫟鎬绘椂闀�";
+            this.gridColumn17.FieldName = "workTime";
+            this.gridColumn17.MinWidth = 30;
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 5;
+            this.gridColumn17.Width = 112;
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.Caption = "鍦ㄥ矖";
+            this.gridColumn18.FieldName = "hour";
+            this.gridColumn18.MinWidth = 30;
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.Visible = true;
+            this.gridColumn18.VisibleIndex = 6;
+            this.gridColumn18.Width = 112;
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.Caption = "淇敼鍘熷洜";
+            this.gridColumn19.FieldName = "reason";
+            this.gridColumn19.MinWidth = 30;
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 7;
+            this.gridColumn19.Width = 112;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.Caption = "鎵撳崱淇℃伅";
+            this.gridColumn20.FieldName = "checkInfo";
+            this.gridColumn20.MinWidth = 30;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 8;
+            this.gridColumn20.Width = 112;
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.Caption = "淇敼灞ュ巻";
+            this.gridColumn21.FieldName = "modiLog";
+            this.gridColumn21.MinWidth = 30;
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 9;
+            this.gridColumn21.Width = 112;
+            // 
+            // gridColumn22
+            // 
+            this.gridColumn22.Caption = "澶囨敞";
+            this.gridColumn22.FieldName = "remark";
+            this.gridColumn22.MinWidth = 30;
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 10;
+            this.gridColumn22.Width = 112;
+            // 
+            // gridColumn46
+            // 
+            this.gridColumn46.Caption = "涓婚敭";
+            this.gridColumn46.FieldName = "guid";
+            this.gridColumn46.MinWidth = 30;
+            this.gridColumn46.Name = "gridColumn46";
+            this.gridColumn46.Width = 112;
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Controls.Add(this.gridControl3);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(1408, 391);
+            this.xtraTabPage2.Text = "浜у搧鍖呰鎶ュ憡";
+            // 
+            // gridControl3
+            // 
+            this.gridControl3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gridControl3.Location = new System.Drawing.Point(0, 0);
+            this.gridControl3.MainView = this.gridView3;
+            this.gridControl3.Name = "gridControl3";
+            this.gridControl3.Size = new System.Drawing.Size(1408, 391);
+            this.gridControl3.TabIndex = 0;
+            this.gridControl3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView3});
+            // 
+            // gridView3
+            // 
+            this.gridView3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn23,
+            this.gridColumn24,
+            this.gridColumn25,
+            this.gridColumn26,
+            this.gridColumn27,
+            this.gridColumn28,
+            this.gridColumn29,
+            this.gridColumn30,
+            this.gridColumn31,
+            this.gridColumn32,
+            this.gridColumn33,
+            this.gridColumn45});
+            this.gridView3.GridControl = this.gridControl3;
+            this.gridView3.Name = "gridView3";
+            this.gridView3.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn23
+            // 
+            this.gridColumn23.Caption = "妫�楠屾棩鏈�";
+            this.gridColumn23.FieldName = "attenDate";
+            this.gridColumn23.MinWidth = 30;
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.Visible = true;
+            this.gridColumn23.VisibleIndex = 0;
+            this.gridColumn23.Width = 112;
+            // 
+            // gridColumn24
+            // 
+            this.gridColumn24.Caption = "浜у搧缂栧彿";
+            this.gridColumn24.FieldName = "lineNo";
+            this.gridColumn24.MinWidth = 30;
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.Visible = true;
+            this.gridColumn24.VisibleIndex = 1;
+            this.gridColumn24.Width = 112;
+            // 
+            // gridColumn25
+            // 
+            this.gridColumn25.Caption = "浜х嚎鍚嶇О";
+            this.gridColumn25.FieldName = "lineName";
+            this.gridColumn25.MinWidth = 30;
+            this.gridColumn25.Name = "gridColumn25";
+            this.gridColumn25.Visible = true;
+            this.gridColumn25.VisibleIndex = 2;
+            this.gridColumn25.Width = 112;
+            // 
+            // gridColumn26
+            // 
+            this.gridColumn26.Caption = "宸ュ崟";
+            this.gridColumn26.FieldName = "dAA001";
+            this.gridColumn26.MinWidth = 30;
+            this.gridColumn26.Name = "gridColumn26";
+            this.gridColumn26.Visible = true;
+            this.gridColumn26.VisibleIndex = 3;
+            this.gridColumn26.Width = 112;
+            // 
+            // gridColumn27
+            // 
+            this.gridColumn27.Caption = "浜у搧缂栫爜";
+            this.gridColumn27.FieldName = "itemNo";
+            this.gridColumn27.MinWidth = 30;
+            this.gridColumn27.Name = "gridColumn27";
+            this.gridColumn27.Visible = true;
+            this.gridColumn27.VisibleIndex = 4;
+            this.gridColumn27.Width = 112;
+            // 
+            // gridColumn28
+            // 
+            this.gridColumn28.Caption = "浜у搧鍚嶇О";
+            this.gridColumn28.FieldName = "itemName";
+            this.gridColumn28.MinWidth = 30;
+            this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.Visible = true;
+            this.gridColumn28.VisibleIndex = 5;
+            this.gridColumn28.Width = 112;
+            // 
+            // gridColumn29
+            // 
+            this.gridColumn29.Caption = "浜у搧瑙勬牸";
+            this.gridColumn29.FieldName = "itemModel";
+            this.gridColumn29.MinWidth = 30;
+            this.gridColumn29.Name = "gridColumn29";
+            this.gridColumn29.Visible = true;
+            this.gridColumn29.VisibleIndex = 6;
+            this.gridColumn29.Width = 112;
+            // 
+            // gridColumn30
+            // 
+            this.gridColumn30.Caption = "鏁伴噺";
+            this.gridColumn30.FieldName = "num";
+            this.gridColumn30.MinWidth = 30;
+            this.gridColumn30.Name = "gridColumn30";
+            this.gridColumn30.Visible = true;
+            this.gridColumn30.VisibleIndex = 7;
+            this.gridColumn30.Width = 112;
+            // 
+            // gridColumn31
+            // 
+            this.gridColumn31.Caption = "鎹嗗寘鏁伴噺";
+            this.gridColumn31.FieldName = "aCNum";
+            this.gridColumn31.MinWidth = 30;
+            this.gridColumn31.Name = "gridColumn31";
+            this.gridColumn31.Visible = true;
+            this.gridColumn31.VisibleIndex = 8;
+            this.gridColumn31.Width = 112;
+            // 
+            // gridColumn32
+            // 
+            this.gridColumn32.Caption = "鎵ц鍗曚环";
+            this.gridColumn32.FieldName = "salary";
+            this.gridColumn32.MinWidth = 30;
+            this.gridColumn32.Name = "gridColumn32";
+            this.gridColumn32.Visible = true;
+            this.gridColumn32.VisibleIndex = 9;
+            this.gridColumn32.Width = 112;
+            // 
+            // gridColumn33
+            // 
+            this.gridColumn33.Caption = "鎵ц宸ヨ祫";
+            this.gridColumn33.FieldName = "sumSalary";
+            this.gridColumn33.MinWidth = 30;
+            this.gridColumn33.Name = "gridColumn33";
+            this.gridColumn33.Visible = true;
+            this.gridColumn33.VisibleIndex = 10;
+            this.gridColumn33.Width = 112;
+            // 
+            // gridColumn45
+            // 
+            this.gridColumn45.Caption = "涓婚敭";
+            this.gridColumn45.FieldName = "guid";
+            this.gridColumn45.MinWidth = 30;
+            this.gridColumn45.Name = "gridColumn45";
+            this.gridColumn45.Width = 112;
+            // 
+            // xtraTabPage3
+            // 
+            this.xtraTabPage3.Controls.Add(this.gridControl4);
+            this.xtraTabPage3.Name = "xtraTabPage3";
+            this.xtraTabPage3.Size = new System.Drawing.Size(1408, 391);
+            this.xtraTabPage3.Text = "闈炴甯歌鏃�";
+            // 
+            // gridControl4
+            // 
+            this.gridControl4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gridControl4.Location = new System.Drawing.Point(0, 0);
+            this.gridControl4.MainView = this.gridView4;
+            this.gridControl4.Name = "gridControl4";
+            this.gridControl4.Size = new System.Drawing.Size(1408, 391);
+            this.gridControl4.TabIndex = 0;
+            this.gridControl4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView4});
+            // 
+            // gridView4
+            // 
+            this.gridView4.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn34,
+            this.gridColumn35,
+            this.gridColumn36,
+            this.gridColumn37,
+            this.gridColumn38,
+            this.gridColumn39,
+            this.gridColumn40,
+            this.gridColumn41,
+            this.gridColumn42,
+            this.gridColumn43,
+            this.gridColumn44});
+            this.gridView4.GridControl = this.gridControl4;
+            this.gridView4.Name = "gridView4";
+            this.gridView4.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn34
+            // 
+            this.gridColumn34.Caption = "鍑哄嫟鏃ユ湡";
+            this.gridColumn34.FieldName = "attenDate";
+            this.gridColumn34.MinWidth = 30;
+            this.gridColumn34.Name = "gridColumn34";
+            this.gridColumn34.Visible = true;
+            this.gridColumn34.VisibleIndex = 0;
+            this.gridColumn34.Width = 112;
+            // 
+            // gridColumn35
+            // 
+            this.gridColumn35.Caption = "浜哄憳";
+            this.gridColumn35.FieldName = "staffNo";
+            this.gridColumn35.MinWidth = 30;
+            this.gridColumn35.Name = "gridColumn35";
+            this.gridColumn35.Visible = true;
+            this.gridColumn35.VisibleIndex = 1;
+            this.gridColumn35.Width = 112;
+            // 
+            // gridColumn36
+            // 
+            this.gridColumn36.Caption = "濮撳悕";
+            this.gridColumn36.FieldName = "staffName";
+            this.gridColumn36.MinWidth = 30;
+            this.gridColumn36.Name = "gridColumn36";
+            this.gridColumn36.Visible = true;
+            this.gridColumn36.VisibleIndex = 2;
+            this.gridColumn36.Width = 112;
+            // 
+            // gridColumn37
+            // 
+            this.gridColumn37.Caption = "鏃堕暱";
+            this.gridColumn37.FieldName = "hour";
+            this.gridColumn37.MinWidth = 30;
+            this.gridColumn37.Name = "gridColumn37";
+            this.gridColumn37.Visible = true;
+            this.gridColumn37.VisibleIndex = 3;
+            this.gridColumn37.Width = 112;
+            // 
+            // gridColumn38
+            // 
+            this.gridColumn38.Caption = "浜х嚎";
+            this.gridColumn38.FieldName = "lineNo";
+            this.gridColumn38.MinWidth = 30;
+            this.gridColumn38.Name = "gridColumn38";
+            this.gridColumn38.Visible = true;
+            this.gridColumn38.VisibleIndex = 4;
+            this.gridColumn38.Width = 112;
+            // 
+            // gridColumn39
+            // 
+            this.gridColumn39.Caption = "浜х嚎鍚嶇О";
+            this.gridColumn39.FieldName = "lineName";
+            this.gridColumn39.MinWidth = 30;
+            this.gridColumn39.Name = "gridColumn39";
+            this.gridColumn39.Visible = true;
+            this.gridColumn39.VisibleIndex = 5;
+            this.gridColumn39.Width = 112;
+            // 
+            // gridColumn40
+            // 
+            this.gridColumn40.Caption = "寮傚父绫诲瀷";
+            this.gridColumn40.FieldName = "errorType";
+            this.gridColumn40.MinWidth = 30;
+            this.gridColumn40.Name = "gridColumn40";
+            this.gridColumn40.Visible = true;
+            this.gridColumn40.VisibleIndex = 6;
+            this.gridColumn40.Width = 112;
+            // 
+            // gridColumn41
+            // 
+            this.gridColumn41.Caption = "璁″叆绫诲瀷";
+            this.gridColumn41.FieldName = "hourlyType";
+            this.gridColumn41.MinWidth = 30;
+            this.gridColumn41.Name = "gridColumn41";
+            this.gridColumn41.Visible = true;
+            this.gridColumn41.VisibleIndex = 7;
+            this.gridColumn41.Width = 112;
+            // 
+            // gridColumn42
+            // 
+            this.gridColumn42.Caption = "璁℃椂宸ヨ祫";
+            this.gridColumn42.FieldName = "hourlySalary";
+            this.gridColumn42.MinWidth = 30;
+            this.gridColumn42.Name = "gridColumn42";
+            this.gridColumn42.Visible = true;
+            this.gridColumn42.VisibleIndex = 8;
+            this.gridColumn42.Width = 112;
+            // 
+            // gridColumn43
+            // 
+            this.gridColumn43.Caption = "鎬诲伐璧�";
+            this.gridColumn43.FieldName = "sumSalary";
+            this.gridColumn43.MinWidth = 30;
+            this.gridColumn43.Name = "gridColumn43";
+            this.gridColumn43.Visible = true;
+            this.gridColumn43.VisibleIndex = 9;
+            this.gridColumn43.Width = 112;
+            // 
+            // gridColumn44
+            // 
+            this.gridColumn44.Caption = "涓婚敭";
+            this.gridColumn44.FieldName = "guid";
+            this.gridColumn44.MinWidth = 30;
+            this.gridColumn44.Name = "gridColumn44";
+            this.gridColumn44.Width = 112;
+            // 
+            // gridColumn48
+            // 
+            this.gridColumn48.Caption = "瀹℃牳";
+            this.gridColumn48.FieldName = "checkStatus";
+            this.gridColumn48.MinWidth = 30;
+            this.gridColumn48.Name = "gridColumn48";
+            this.gridColumn48.Visible = true;
+            this.gridColumn48.VisibleIndex = 0;
+            this.gridColumn48.Width = 112;
+            // 
+            // Frm_MesAttanCon
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1410, 834);
+            this.Controls.Add(this.splitContainerControl1);
+            this.Controls.Add(this.picCheckBox);
+            this.Controls.Add(this.toolBarMenu1);
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "Frm_MesAttanCon";
+            this.Text = "鑰冨嫟琛ㄧ‘璁�";
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
+            this.splitContainerControl1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
+            this.splitContainerControl1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
+            this.splitContainerControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.xtraTabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
+            this.xtraTabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
+            this.xtraTabPage3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gridControl4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+        #endregion
+        private UserControl.UcToolBarMenu toolBarMenu1;
+        private DevExpress.Utils.ToolTipController tips;
+        private System.Windows.Forms.PictureBox picCheckBox;
+        private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
+        private DevExpress.XtraGrid.GridControl gridControl1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+        private DevExpress.XtraGrid.GridControl gridControl3;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
+        private DevExpress.XtraGrid.GridControl gridControl4;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView4;
+        private DevExpress.XtraGrid.GridControl gridControl2;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn47;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn46;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn45;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn37;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn39;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn40;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn41;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn42;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn43;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn44;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn48;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs
new file mode 100644
index 0000000..678a20c
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs
@@ -0,0 +1,520 @@
+锘縰sing DevExpress.Utils.DirectXPaint;
+using DevExpress.XtraEditors;
+using DevExpress.XtraGrid.Columns;
+using Gs.DevApp.DevFrm.QC;
+using Gs.DevApp.DevFrm.Rpt;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.JJGZ
+{
+    public partial class Frm_MesAttanCon : DevExpress.XtraEditors.XtraForm
+    {
+        string _webServiceName = "MesAttanCon/";
+        List<FilterEntity> _filterList = new List<FilterEntity>();
+        string date;
+        string lineNo;
+        
+        // 鐢ㄤ簬璺熻釜鍘熷鍊肩殑瀛楀吀
+        private Dictionary<string, Dictionary<string, object>> _originalValues = new Dictionary<string, Dictionary<string, object>>();
+
+        public Frm_MesAttanCon()
+        {
+            InitializeComponent();
+            //this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+            //this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
+            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+            this.toolBarMenu1.btnGongZiClick += ToolBarMenu1_btnGongZiClick;
+            this.toolBarMenu1.btnLianBanClick += ToolBarMenu1_btnLianBanClick;
+            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            this.toolBarMenu1.getXmlConfig();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
+            {
+                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+            }, tips);
+            //getPageList(1);
+            //_setIno();
+
+        }
+
+        /// <summary>
+        ///     鏌ヨ浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+        {
+            var frm = new KQCX(lineNo, date);
+            //璧嬪�肩粰鏄庣粏琛�
+            frm.UpdateParent += (ss, ee) =>
+            {
+                var lst = new List<string>();
+                lst = ee.StringList;
+                lineNo = string.IsNullOrEmpty(lst[0]) ? "0" : lst[0];
+                date = string.IsNullOrEmpty(lst[1]) ? DateTime.Now.AddMonths(-1).ToString() : lst[1];
+                getPageList();
+            };
+            frm.ShowDialog();
+        }
+
+        /// <summary>
+        ///     鍒锋柊浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+        {
+
+            //getPageList(1);
+            getPageList();
+
+        }
+
+        /// <summary>
+        /// 杩炵彮璁剧疆
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLianBanClick(object sender, EventArgs e)
+        {
+
+            var frm = new SetLB();
+            //璧嬪�肩粰鏄庣粏琛�
+            frm.UpdateParent += (ss, ee) =>
+            {
+                var lst = new List<string>();
+                lst = ee.StringList;
+                var time = string.IsNullOrEmpty(lst[0]) ? "0" : lst[0];
+                SetLB(time);
+            };
+            frm.ShowDialog();
+
+        }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList()
+        {
+            var _obj = new
+            {
+                date = date,
+                lineNo = lineNo
+            };
+           // gcMain1.DataSource = null; 
+            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+
+            try
+            {
+                var strReturn = UtilityHelper.HttpPost("",
+                    _webServiceName + "GetListPage", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strReturn);
+                if (_rtn.rtnCode > 0)
+                {
+                    dynamic dy = _rtn.rtnData;
+                    JObject _job = JObject.Parse(strReturn);
+
+
+                    JArray array = new JArray();
+                    foreach (var a in _job["rtnData"]["list"])
+                    {
+                        array.Add(a);
+                    }
+                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+                    if (dt.Rows.Count > 0)
+                    {
+                        gridControl1.BindingContext = new BindingContext();
+                        gridControl1.DataSource = dt;
+                        gridControl1.ForceInitialize();
+                        gridView1.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+                    }
+                    else
+                    {
+                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gridControl1, gridView1);
+                    }
+
+                    JArray array1 = new JArray();
+                    foreach (var a in _job["rtnData"]["list1"])
+                    {
+                        array1.Add(a);
+                    }
+                    DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
+                    if (dt1.Rows.Count > 0)
+                    {
+                        gridControl2.BindingContext = new BindingContext();
+                        gridControl2.DataSource = dt1;
+                        gridControl2.ForceInitialize();
+                        gridView2.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView2);
+                        // 淇濆瓨鍘熷鍊�
+                        SaveOriginalValues();
+                    }
+                    else
+                    {
+                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gridControl2, gridView2);
+                        _originalValues.Clear();
+                    }
+
+                    JArray array2 = new JArray();
+                    foreach (var a in _job["rtnData"]["list2"])
+                    {
+                        array2.Add(a);
+                    }
+                    DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+                    if (dt2.Rows.Count > 0)
+                    {
+                        gridControl3.BindingContext = new BindingContext();
+                        gridControl3.DataSource = dt2;
+                        gridControl3.ForceInitialize();
+                        gridView3.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView3);
+                    }
+                    else
+                    {
+                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gridControl3, gridView3);
+                    }
+
+                    JArray array3 = new JArray();
+                    foreach (var a in _job["rtnData"]["list3"])
+                    {
+                        array3.Add(a);
+                    }
+                    DataTable dt3 = JsonConvert.DeserializeObject<DataTable>(array3.ToString());
+                    if (dt3.Rows.Count > 0)
+                    {
+                        gridControl4.BindingContext = new BindingContext();
+                        gridControl4.DataSource = dt3;
+                        gridControl4.ForceInitialize();
+                        gridView4.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView4);
+                    }
+                    else
+                    {
+                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gridControl4, gridView4);
+                    }
+                }
+                else
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 鍙栨秷浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+        {
+           // Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+        }
+
+        /// <summary>
+        ///     璁$畻宸ヨ祫
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnGongZiClick(object sender, EventArgs e)
+        {
+
+            var _obj = new
+            {
+                date = date,
+                lineNo = lineNo
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "CountModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+
+                if (_rtn.rtnCode > 0)
+                {
+                    ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+                    getPageList();
+                }
+                else
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        ///     璁剧疆杩炵彮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void SetLB(string time)
+        {
+            // 楠岃瘉鍙傛暟
+            if (string.IsNullOrEmpty(time) || !decimal.TryParse(time, out decimal addTime))
+            {
+                ToolBox.MsgHelper.ShowError("杩炵彮鏃堕暱鏍煎紡涓嶆纭紒");
+                return;
+            }
+
+            // 鑾峰彇褰撳墠 gridControl2 鐨勬暟鎹�
+            DataTable dt = gridControl2.DataSource as DataTable;
+            if (dt == null || dt.Rows.Count == 0)
+            {
+                ToolBox.MsgHelper.ShowError("娌℃湁鍙缃繛鐝殑鏁版嵁锛�");
+                return;
+            }
+
+            var list = new List<object>();
+            
+            // 閬嶅巻鎵�鏈夎锛岃缃繛鐝�
+            foreach (DataRow row in dt.Rows)
+            {
+                if (row["GUID"] != null)
+                {
+                    string guid = row["GUID"].ToString();
+                    
+                    // 鑾峰彇鍘熷鐨� Hour 鍊煎苟鍔犱笂杩炵彮鏃堕暱
+                    decimal originalHour = 0;
+                    if (row["Hour"] != null && decimal.TryParse(row["Hour"].ToString(), out originalHour))
+                    {
+                        decimal newHour = originalHour + addTime;
+                        
+                        list.Add(new
+                        {
+                            GUID = guid,
+                            Hour = newHour,
+                            Reason = "杩炵彮"
+                        });
+                    }
+                }
+            }
+
+            if (list.Count == 0)
+            {
+                ToolBox.MsgHelper.ShowError("娌℃湁鏈夋晥鐨勬暟鎹彲浠ヨ缃繛鐝紒");
+                return;
+            }
+
+            var postObj = new
+            {
+                lineNo = lineNo,
+                date = date,
+                list = list
+            };
+
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(postObj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+
+                if (_rtn.rtnCode > 0)
+                {
+                    ToolBox.MsgHelper.ShowInformation($"杩炵彮璁剧疆鎴愬姛锛佸叡璁剧疆 {list.Count} 鏉¤褰曪紝姣忔潯澧炲姞 {addTime} 灏忔椂銆�");
+                    getPageList();
+                    
+                }
+                else
+                    ToolBox.MsgHelper.ShowError("杩炵彮璁剧疆澶辫触锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.ShowError("杩炵彮璁剧疆寮傚父锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 淇濆瓨鍘熷鍊�
+        /// </summary>
+        private void SaveOriginalValues()
+        {
+            _originalValues.Clear();
+            DataTable dt = gridControl2.DataSource as DataTable;
+            if (dt == null) return;
+
+            foreach (DataRow row in dt.Rows)
+            {
+                if (row["GUID"] != null)
+                {
+                    string guid = row["GUID"].ToString();
+                    _originalValues[guid] = new Dictionary<string, object>
+                    {
+                        ["Hour"] = row["Hour"]
+                    };
+                }
+            }
+        }
+
+        /// <summary>
+        ///     淇敼
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+        {
+            // 鍏跺畠闇�瑕佺殑UI鐘舵�佸垏鎹�
+            //Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+        }
+
+        /// <summary>
+        ///     淇濆瓨
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+
+        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+        {
+            // 缁撴潫缂栬緫锛岀‘淇濇暟鎹凡鎻愪氦鍒癉ataTable
+            gridView2.CloseEditor();
+            gridView2.UpdateCurrentRow();
+            gridView2.PostEditor();
+            BindingContext[gridControl2.DataSource].EndCurrentEdit();
+
+            DataTable dt = gridControl2.DataSource as DataTable;
+            if (dt == null) return;
+
+            var list = new List<object>();
+            foreach (DataRow row in dt.Rows)
+            {
+                if (row["GUID"] != null)
+                {
+                    string guid = row["GUID"].ToString();
+                    
+                    // 妫�鏌ユ槸鍚︽湁鍘熷鍊艰褰�
+                    if (_originalValues.ContainsKey(guid))
+                    {
+                        var originalRow = _originalValues[guid];
+                        object currentHour = row["Hour"];
+                        object originalHour = originalRow["Hour"];
+
+                        // 鍙瘮杈� Hour 瀛楁鐨勫綋鍓嶅�间笌鍘熷鍊�
+                        bool hourChanged = !Equals(currentHour, originalHour);
+
+                        if (hourChanged)
+                        {
+                            list.Add(new
+                            {
+                                GUID = guid,
+                                Hour = currentHour,
+                                Reason = row["Reason"]
+                            });
+                        }
+                    }
+                }
+            }
+
+            if (list.Count == 0)
+            {
+                ToolBox.MsgHelper.ShowInformation("娌℃湁闇�瑕佷繚瀛樼殑鏇存敼銆�");
+                return;
+            }
+
+            var postObj = new
+            {
+                lineNo = lineNo,
+                date = date,
+                list = list
+            };
+
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(postObj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    ToolBox.MsgHelper.ShowInformation("淇濆瓨鎴愬姛锛�");
+                    getPageList();
+                    toolBarMenu1.isSetBtn = true;
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("淇濆瓨澶辫触锛�" + _rtn.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.ShowError("寮傚父锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        ///     瀹℃牳浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+        {
+            _toolCk(1);
+        }
+
+        /// <summary>
+        ///     鍙嶅鏍�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+        {
+            _toolCk(0);
+        }
+
+        private void _toolCk(int _inFieldValue)
+        {
+            string strMsg = "";
+            switch (_inFieldValue)
+            {
+                case 1:
+                    strMsg = "瀹℃牳";
+                    break;
+                case 0:
+                    strMsg = "鍙嶅鏍�";
+                    break;
+            }
+    ;
+            toolBarMenu1.guidKey = "";
+            var _obj = new
+            {
+                lineNo = lineNo,
+                attenDate = date,
+                inFieldValue = _inFieldValue
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModelSubmit",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
+                    UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
+                }
+                else
+                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.resx b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.resx
new file mode 100644
index 0000000..4375a03
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.resx
@@ -0,0 +1,126 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>83</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs
new file mode 100644
index 0000000..6e24f77
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.Designer.cs
@@ -0,0 +1,1011 @@
+锘縩amespace Gs.DevApp.DevFrm.JJGZ
+{
+    partial class Frm_MesJJSalary
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.pageBar1 = new UserControls.Data.UcPageBar();
+            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.lbGuid = new System.Windows.Forms.Label();
+            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_Guid = new DevExpress.XtraEditors.TextEdit();
+            this.txt_BeginTime = new DevExpress.XtraEditors.DateEdit();
+            this.txt_EndTime = new DevExpress.XtraEditors.DateEdit();
+            this.txt_itemId = new DevExpress.XtraEditors.ButtonEdit();
+            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fSubsidiary = new DevExpress.XtraEditors.TextEdit();
+            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_Remark = new DevExpress.XtraEditors.TextEdit();
+            this.txt_Salary = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.xtraTabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+            this.split1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+            this.split1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            this.xtraTabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+            this.splitMx1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+            this.splitMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+            this.layoutMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_BeginTime.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_BeginTime.Properties.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_EndTime.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_EndTime.Properties.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Salary.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // toolBarMenu1
+            // 
+            this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
+            this.toolBarMenu1.defaultActions = null;
+            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.toolBarMenu1.guidKey = null;
+            this.toolBarMenu1.isSetBtn = false;
+            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
+            this.toolBarMenu1.Name = "toolBarMenu1";
+            this.toolBarMenu1.rptParameter = null;
+            this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+            this.toolBarMenu1.TabIndex = 0;
+            this.toolBarMenu1.xlsInService = null;
+            this.toolBarMenu1.xlsOutParameter = null;
+            // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
+            this.xtraTabControl1.TabIndex = 3;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1,
+            this.xtraTabPage2});
+            // 
+            // xtraTabPage1
+            // 
+            this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+            // 
+            // split1
+            // 
+            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+            this.split1.Horizontal = false;
+            this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Margin = new System.Windows.Forms.Padding(4);
+            this.split1.Name = "split1";
+            // 
+            // split1.Panel1
+            // 
+            this.split1.Panel1.Controls.Add(this.gcMain1);
+            this.split1.Panel1.Controls.Add(this.pageBar1);
+            this.split1.Panel1.Text = "Panel1";
+            // 
+            // split1.Panel2
+            // 
+            this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.split1.Size = new System.Drawing.Size(1408, 698);
+            this.split1.SplitterPosition = 0;
+            this.split1.TabIndex = 0;
+            // 
+            // gcMain1
+            // 
+            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain1.Location = new System.Drawing.Point(0, 0);
+            this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain1.Name = "gcMain1";
+            this.gcMain1.Size = new System.Drawing.Size(1408, 624);
+            this.gcMain1.TabIndex = 2;
+            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.ColumnPanelRowHeight = 61;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gv_createBy,
+            this.gv_createDate,
+            this.gridColumn6,
+            this.gridColumn1,
+            this.gridColumn2,
+            this.gridColumn7,
+            this.gridColumn8,
+            this.gridColumn3,
+            this.gridColumn4,
+            this.gridColumn5,
+            this.gridColumn10});
+            this.gridView1.DetailHeight = 428;
+            this.gridView1.GridControl = this.gcMain1;
+            this.gridView1.IndicatorWidth = 62;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gv_createBy
+            // 
+            this.gv_createBy.AppearanceCell.Options.UseFont = true;
+            this.gv_createBy.Caption = "寤虹珛鑰�";
+            this.gv_createBy.FieldName = "createBy";
+            this.gv_createBy.MinWidth = 62;
+            this.gv_createBy.Name = "gv_createBy";
+            this.gv_createBy.OptionsColumn.AllowEdit = false;
+            this.gv_createBy.Tag = "query_a.create_by";
+            this.gv_createBy.Visible = true;
+            this.gv_createBy.VisibleIndex = 1;
+            this.gv_createBy.Width = 100;
+            // 
+            // gv_createDate
+            // 
+            this.gv_createDate.AppearanceCell.Options.UseFont = true;
+            this.gv_createDate.Caption = "寤虹珛鏃堕棿";
+            this.gv_createDate.FieldName = "createDate";
+            this.gv_createDate.MinWidth = 225;
+            this.gv_createDate.Name = "gv_createDate";
+            this.gv_createDate.OptionsColumn.AllowEdit = false;
+            this.gv_createDate.Tag = "query_a.create_date";
+            this.gv_createDate.Visible = true;
+            this.gv_createDate.VisibleIndex = 2;
+            this.gv_createDate.Width = 286;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "瀹℃牳";
+            this.gridColumn6.FieldName = "checkStatus";
+            this.gridColumn6.MinWidth = 31;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Tag = "checkStatus";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 0;
+            this.gridColumn6.Width = 117;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn1.FieldName = "itemno";
+            this.gridColumn1.MinWidth = 30;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.OptionsColumn.AllowEdit = false;
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 3;
+            this.gridColumn1.Width = 94;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn2.FieldName = "itemName";
+            this.gridColumn2.MinWidth = 30;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 7;
+            this.gridColumn2.Width = 112;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn7.FieldName = "itemModel";
+            this.gridColumn7.MinWidth = 30;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 8;
+            this.gridColumn7.Width = 112;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "鍗曚环";
+            this.gridColumn8.FieldName = "salary";
+            this.gridColumn8.MinWidth = 30;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Tag = "salary";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 9;
+            this.gridColumn8.Width = 112;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "鐢熸晥鏃ユ湡";
+            this.gridColumn3.FieldName = "beginTime";
+            this.gridColumn3.MinWidth = 30;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.OptionsColumn.AllowEdit = false;
+            this.gridColumn3.Tag = "beginTime";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 4;
+            this.gridColumn3.Width = 94;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "澶辨晥鏃ユ湡";
+            this.gridColumn4.FieldName = "endTime";
+            this.gridColumn4.MinWidth = 30;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.OptionsColumn.AllowEdit = false;
+            this.gridColumn4.Tag = "endTime";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 5;
+            this.gridColumn4.Width = 94;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "璇存槑";
+            this.gridColumn5.FieldName = "remark";
+            this.gridColumn5.MinWidth = 30;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.OptionsColumn.AllowEdit = false;
+            this.gridColumn5.Tag = "remark";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 6;
+            this.gridColumn5.Width = 94;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "鐗╂枡Id";
+            this.gridColumn10.FieldName = "itemId";
+            this.gridColumn10.MinWidth = 30;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Tag = "itemId";
+            this.gridColumn10.Width = 112;
+            // 
+            // pageBar1
+            // 
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pageBar1.Location = new System.Drawing.Point(0, 624);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 7, 4, 7);
+            this.pageBar1.Name = "pageBar1";
+            this.pageBar1.RecordCount = 0;
+            this.pageBar1.Size = new System.Drawing.Size(1408, 59);
+            this.pageBar1.TabIndex = 4;
+            this.pageBar1.TotalPages = 0;
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Controls.Add(this.splitMx1);
+            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
+            this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+            // 
+            // splitMx1
+            // 
+            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitMx1.Horizontal = false;
+            this.splitMx1.Location = new System.Drawing.Point(0, 0);
+            this.splitMx1.Margin = new System.Windows.Forms.Padding(4);
+            this.splitMx1.Name = "splitMx1";
+            // 
+            // splitMx1.Panel1
+            // 
+            this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+            this.splitMx1.Panel1.Text = "Panel1";
+            // 
+            // splitMx1.Panel2
+            // 
+            this.splitMx1.Panel2.Text = "Panel2";
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx1.Size = new System.Drawing.Size(1408, 698);
+            this.splitMx1.SplitterPosition = 159;
+            this.splitMx1.TabIndex = 0;
+            // 
+            // layoutMx1
+            // 
+            this.layoutMx1.Controls.Add(this.lbGuid);
+            this.layoutMx1.Controls.Add(this.txt_createDate);
+            this.layoutMx1.Controls.Add(this.txt_createBy);
+            this.layoutMx1.Controls.Add(this.txt_checkBy);
+            this.layoutMx1.Controls.Add(this.txt_checkDate);
+            this.layoutMx1.Controls.Add(this.txt_checkStatus);
+            this.layoutMx1.Controls.Add(this.txt_Guid);
+            this.layoutMx1.Controls.Add(this.txt_BeginTime);
+            this.layoutMx1.Controls.Add(this.txt_EndTime);
+            this.layoutMx1.Controls.Add(this.txt_itemId);
+            this.layoutMx1.Controls.Add(this.txt_itemNo);
+            this.layoutMx1.Controls.Add(this.txt_itemModel);
+            this.layoutMx1.Controls.Add(this.txt_fSubsidiary);
+            this.layoutMx1.Controls.Add(this.txt_itemName);
+            this.layoutMx1.Controls.Add(this.txt_Remark);
+            this.layoutMx1.Controls.Add(this.txt_Salary);
+            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem9});
+            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
+            this.layoutMx1.Name = "layoutMx1";
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
+            this.layoutMx1.Root = this.Root;
+            this.layoutMx1.Size = new System.Drawing.Size(1408, 159);
+            this.layoutMx1.TabIndex = 0;
+            this.layoutMx1.Text = "layoutControl1";
+            // 
+            // lbGuid
+            // 
+            this.lbGuid.Location = new System.Drawing.Point(692, 131);
+            this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lbGuid.Name = "lbGuid";
+            this.lbGuid.Size = new System.Drawing.Size(334, 34);
+            this.lbGuid.TabIndex = 1;
+            this.lbGuid.Text = "lbGuid";
+            this.lbGuid.Visible = false;
+            // 
+            // txt_createDate
+            // 
+            this.txt_createDate.Location = new System.Drawing.Point(790, 81);
+            this.txt_createDate.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_createDate.Name = "txt_createDate";
+            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_createDate.Size = new System.Drawing.Size(259, 28);
+            this.txt_createDate.StyleController = this.layoutMx1;
+            this.txt_createDate.TabIndex = 231;
+            this.txt_createDate.Tag = "readonly";
+            // 
+            // txt_createBy
+            // 
+            this.txt_createBy.Location = new System.Drawing.Point(1137, 81);
+            this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_createBy.Name = "txt_createBy";
+            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+            this.txt_createBy.Size = new System.Drawing.Size(259, 28);
+            this.txt_createBy.StyleController = this.layoutMx1;
+            this.txt_createBy.TabIndex = 228;
+            this.txt_createBy.Tag = "readonly";
+            // 
+            // txt_checkBy
+            // 
+            this.txt_checkBy.Location = new System.Drawing.Point(96, 116);
+            this.txt_checkBy.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_checkBy.Name = "txt_checkBy";
+            this.txt_checkBy.Size = new System.Drawing.Size(259, 28);
+            this.txt_checkBy.StyleController = this.layoutMx1;
+            this.txt_checkBy.TabIndex = 247;
+            this.txt_checkBy.Tag = "readonly";
+            // 
+            // txt_checkDate
+            // 
+            this.txt_checkDate.Location = new System.Drawing.Point(443, 116);
+            this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_checkDate.Name = "txt_checkDate";
+            this.txt_checkDate.Size = new System.Drawing.Size(259, 28);
+            this.txt_checkDate.StyleController = this.layoutMx1;
+            this.txt_checkDate.TabIndex = 248;
+            this.txt_checkDate.Tag = "readonly";
+            // 
+            // txt_checkStatus
+            // 
+            this.txt_checkStatus.Location = new System.Drawing.Point(359, 81);
+            this.txt_checkStatus.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_checkStatus.Name = "txt_checkStatus";
+            this.txt_checkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
+            this.txt_checkStatus.Size = new System.Drawing.Size(343, 27);
+            this.txt_checkStatus.StyleController = this.layoutMx1;
+            this.txt_checkStatus.TabIndex = 249;
+            this.txt_checkStatus.Tag = "readonly";
+            // 
+            // txt_Guid
+            // 
+            this.txt_Guid.Location = new System.Drawing.Point(1137, 116);
+            this.txt_Guid.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_Guid.Name = "txt_Guid";
+            this.txt_Guid.Size = new System.Drawing.Size(259, 28);
+            this.txt_Guid.StyleController = this.layoutMx1;
+            this.txt_Guid.TabIndex = 250;
+            this.txt_Guid.Tag = "";
+            // 
+            // txt_BeginTime
+            // 
+            this.txt_BeginTime.EditValue = null;
+            this.txt_BeginTime.Location = new System.Drawing.Point(790, 46);
+            this.txt_BeginTime.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_BeginTime.Name = "txt_BeginTime";
+            this.txt_BeginTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_BeginTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_BeginTime.Properties.DisplayFormat.FormatString = "";
+            this.txt_BeginTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txt_BeginTime.Properties.EditFormat.FormatString = "";
+            this.txt_BeginTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txt_BeginTime.Properties.Mask.EditMask = "";
+            this.txt_BeginTime.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.None;
+            this.txt_BeginTime.Size = new System.Drawing.Size(259, 28);
+            this.txt_BeginTime.StyleController = this.layoutMx1;
+            this.txt_BeginTime.TabIndex = 250;
+            this.txt_BeginTime.Tag = "";
+            // 
+            // txt_EndTime
+            // 
+            this.txt_EndTime.EditValue = null;
+            this.txt_EndTime.Location = new System.Drawing.Point(1137, 46);
+            this.txt_EndTime.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_EndTime.Name = "txt_EndTime";
+            this.txt_EndTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_EndTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_EndTime.Properties.DisplayFormat.FormatString = "";
+            this.txt_EndTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txt_EndTime.Properties.EditFormat.FormatString = "";
+            this.txt_EndTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txt_EndTime.Properties.Mask.EditMask = "";
+            this.txt_EndTime.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.None;
+            this.txt_EndTime.Size = new System.Drawing.Size(259, 28);
+            this.txt_EndTime.StyleController = this.layoutMx1;
+            this.txt_EndTime.TabIndex = 250;
+            this.txt_EndTime.Tag = "";
+            // 
+            // txt_itemId
+            // 
+            this.txt_itemId.Location = new System.Drawing.Point(96, 12);
+            this.txt_itemId.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_itemId.Name = "txt_itemId";
+            this.txt_itemId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.txt_itemId.Size = new System.Drawing.Size(259, 28);
+            this.txt_itemId.StyleController = this.layoutMx1;
+            this.txt_itemId.TabIndex = 391;
+            // 
+            // txt_itemNo
+            // 
+            this.txt_itemNo.Location = new System.Drawing.Point(443, 12);
+            this.txt_itemNo.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_itemNo.Name = "txt_itemNo";
+            this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_itemNo.Size = new System.Drawing.Size(259, 28);
+            this.txt_itemNo.StyleController = this.layoutMx1;
+            this.txt_itemNo.TabIndex = 370;
+            this.txt_itemNo.Tag = "readOnly";
+            // 
+            // txt_itemModel
+            // 
+            this.txt_itemModel.Location = new System.Drawing.Point(1137, 12);
+            this.txt_itemModel.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_itemModel.Name = "txt_itemModel";
+            this.txt_itemModel.Size = new System.Drawing.Size(259, 28);
+            this.txt_itemModel.StyleController = this.layoutMx1;
+            this.txt_itemModel.TabIndex = 384;
+            this.txt_itemModel.Tag = "readOnly";
+            // 
+            // txt_fSubsidiary
+            // 
+            this.txt_fSubsidiary.Location = new System.Drawing.Point(96, 46);
+            this.txt_fSubsidiary.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_fSubsidiary.Name = "txt_fSubsidiary";
+            this.txt_fSubsidiary.Size = new System.Drawing.Size(259, 28);
+            this.txt_fSubsidiary.StyleController = this.layoutMx1;
+            this.txt_fSubsidiary.TabIndex = 393;
+            this.txt_fSubsidiary.Tag = "readOnly";
+            // 
+            // txt_itemName
+            // 
+            this.txt_itemName.Location = new System.Drawing.Point(790, 12);
+            this.txt_itemName.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_itemName.Name = "txt_itemName";
+            this.txt_itemName.Size = new System.Drawing.Size(259, 28);
+            this.txt_itemName.StyleController = this.layoutMx1;
+            this.txt_itemName.TabIndex = 392;
+            this.txt_itemName.Tag = "readOnly";
+            // 
+            // txt_Remark
+            // 
+            this.txt_Remark.Location = new System.Drawing.Point(443, 46);
+            this.txt_Remark.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_Remark.Name = "txt_Remark";
+            this.txt_Remark.Size = new System.Drawing.Size(259, 28);
+            this.txt_Remark.StyleController = this.layoutMx1;
+            this.txt_Remark.TabIndex = 250;
+            this.txt_Remark.Tag = "";
+            // 
+            // txt_Salary
+            // 
+            this.txt_Salary.Location = new System.Drawing.Point(96, 81);
+            this.txt_Salary.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_Salary.Name = "txt_Salary";
+            this.txt_Salary.Size = new System.Drawing.Size(259, 28);
+            this.txt_Salary.StyleController = this.layoutMx1;
+            this.txt_Salary.TabIndex = 393;
+            this.txt_Salary.Tag = "";
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.lbGuid;
+            this.layoutControlItem9.Location = new System.Drawing.Point(542, 96);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem9.Text = "lbGuid";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem9.TextVisible = false;
+            // 
+            // Root
+            // 
+            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.Root.GroupBordersVisible = false;
+            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem1,
+            this.layoutControlItem13,
+            this.layoutControlItem14,
+            this.layoutControlItem12,
+            this.layoutControlItem3,
+            this.layoutControlItem11,
+            this.layoutControlItem15,
+            this.layoutControlItem2,
+            this.layoutControlItem4,
+            this.layoutControlItem16,
+            this.layoutControlItem6,
+            this.layoutControlItem5,
+            this.layoutControlItem7,
+            this.layoutControlItem10,
+            this.layoutControlItem8});
+            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.Root.Name = "Root";
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
+            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4});
+            this.Root.Size = new System.Drawing.Size(1408, 159);
+            this.Root.TextVisible = false;
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txt_itemNo;
+            this.layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem1.CustomizationFormText = "鐗╂枡缂栫爜";
+            this.layoutControlItem1.Location = new System.Drawing.Point(347, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem1.Size = new System.Drawing.Size(347, 34);
+            this.layoutControlItem1.Text = "鐗╂枡缂栫爜";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_Guid;
+            this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem13.CustomizationFormText = "Guid";
+            this.layoutControlItem13.Location = new System.Drawing.Point(1041, 104);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem13.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem13.Text = "Guid";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
+            this.layoutControlItem13.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_itemId;
+            this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem14.CustomizationFormText = "閫夋嫨鐗╂枡";
+            this.layoutControlItem14.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.Size = new System.Drawing.Size(347, 34);
+            this.layoutControlItem14.Text = "閫夋嫨鐗╂枡";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // picCheckBox
+            // 
+            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+            this.picCheckBox.Location = new System.Drawing.Point(1285, 29);
+            this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
+            this.picCheckBox.Name = "picCheckBox";
+            this.picCheckBox.Size = new System.Drawing.Size(125, 61);
+            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.picCheckBox.TabIndex = 9;
+            this.picCheckBox.TabStop = false;
+            this.picCheckBox.Visible = false;
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_itemName;
+            this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem12.CustomizationFormText = "鐗╂枡鍚嶇О";
+            this.layoutControlItem12.Location = new System.Drawing.Point(694, 0);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem12.Size = new System.Drawing.Size(347, 34);
+            this.layoutControlItem12.Text = "鐗╂枡鍚嶇О";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_itemModel;
+            this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem3.CustomizationFormText = "鐗╂枡瑙勬牸";
+            this.layoutControlItem3.Location = new System.Drawing.Point(1041, 0);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem3.Size = new System.Drawing.Size(347, 34);
+            this.layoutControlItem3.Text = "鐗╂枡瑙勬牸";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txt_fSubsidiary;
+            this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem11.CustomizationFormText = "浣跨敤缁勭粐";
+            this.layoutControlItem11.Location = new System.Drawing.Point(0, 34);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem11.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem11.Text = "浣跨敤缁勭粐";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txt_Remark;
+            this.layoutControlItem15.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem15.CustomizationFormText = "璇存槑";
+            this.layoutControlItem15.Location = new System.Drawing.Point(347, 34);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem15.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem15.Text = "璁℃椂璇存槑";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_BeginTime;
+            this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem2.CustomizationFormText = "鐢熸晥鏃ユ湡";
+            this.layoutControlItem2.Location = new System.Drawing.Point(694, 34);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem2.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem2.Text = "鐢熸晥鏃ユ湡";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_EndTime;
+            this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem4.CustomizationFormText = "澶辨晥鏃ユ湡";
+            this.layoutControlItem4.Location = new System.Drawing.Point(1041, 34);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem4.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem4.Text = "澶辨晥鏃ユ湡";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem16
+            // 
+            this.layoutControlItem16.Control = this.txt_Salary;
+            this.layoutControlItem16.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem16.CustomizationFormText = "鎵ц鍗曚环";
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 69);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem16.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem16.Text = "鎵ц鍗曚环";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_createDate;
+            this.layoutControlItem6.Location = new System.Drawing.Point(694, 69);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem6.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem6.Text = "寤虹珛鏃堕棿";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txt_createBy;
+            this.layoutControlItem5.Location = new System.Drawing.Point(1041, 69);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem5.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem5.Text = "寤虹珛鑰�";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_checkBy;
+            this.layoutControlItem7.Location = new System.Drawing.Point(0, 104);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem7.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem7.Text = "瀹℃牳鑰�";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_checkStatus;
+            this.layoutControlItem10.Location = new System.Drawing.Point(347, 69);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem10.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem10.TextVisible = false;
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_checkDate;
+            this.layoutControlItem8.Location = new System.Drawing.Point(347, 104);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem8.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem8.Text = "瀹℃牳鏃堕棿";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // Frm_MesJJSalary
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1410, 834);
+            this.Controls.Add(this.picCheckBox);
+            this.Controls.Add(this.xtraTabControl1);
+            this.Controls.Add(this.toolBarMenu1);
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "Frm_MesJJSalary";
+            this.Text = "璁℃椂宸ヨ祫";
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.xtraTabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+            this.split1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+            this.split1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            this.xtraTabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+            this.splitMx1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+            this.splitMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+            this.layoutMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_BeginTime.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_BeginTime.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_EndTime.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_EndTime.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Salary.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+        #endregion
+        private UserControl.UcToolBarMenu toolBarMenu1;
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+        private DevExpress.XtraEditors.SplitContainerControl split1;
+        private DevExpress.XtraGrid.GridControl gcMain1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+        private System.Windows.Forms.Label lbGuid;
+        private DevExpress.XtraEditors.TextEdit txt_createDate;
+        private DevExpress.XtraEditors.TextEdit txt_createBy;
+        private DevExpress.XtraLayout.LayoutControl layoutMx1;
+        private DevExpress.XtraLayout.LayoutControlGroup Root;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraEditors.TextEdit txt_checkBy;
+        private DevExpress.XtraEditors.TextEdit txt_checkDate;
+        private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
+        private System.Windows.Forms.PictureBox picCheckBox;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraEditors.TextEdit txt_Guid;
+        private DevExpress.XtraEditors.DateEdit txt_BeginTime;
+        private DevExpress.XtraEditors.DateEdit txt_EndTime;
+        private DevExpress.XtraEditors.ButtonEdit txt_itemId;
+        private DevExpress.XtraEditors.TextEdit txt_itemNo;
+        private DevExpress.XtraEditors.TextEdit txt_fSubsidiary;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraEditors.TextEdit txt_itemName;
+        private DevExpress.XtraEditors.TextEdit txt_Remark;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraEditors.TextEdit txt_Salary;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private UserControls.Data.UcPageBar pageBar1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraEditors.TextEdit txt_itemModel;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs
new file mode 100644
index 0000000..cebb3ff
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs
@@ -0,0 +1,456 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.DevFrm.QC;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.JJGZ
+{
+    public partial class Frm_MesJJSalary : DevExpress.XtraEditors.XtraForm
+    {
+        string _webServiceName = "MesJjgzJjsalary/";
+        List<FilterEntity> _filterList = new List<FilterEntity>();
+
+        public Frm_MesJJSalary()
+        {
+            InitializeComponent();
+            this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
+            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            this.toolBarMenu1.getXmlConfig();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
+            {
+                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+            }, tips);
+            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+            {
+                getModel(value);
+            }, (value) =>
+            {
+                getPageList(this.pageBar1.CurrentPage);
+            }, lbGuid);
+            getPageList(1);
+            _setIno();
+            pageBar1.PagerEvent += PageBar1_PagerEvent;
+
+        }
+        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        {
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            await Task.Delay(100);
+            getPageList(1);
+        }
+
+        /// <summary>
+        /// 鍒嗛〉浜嬩欢
+        /// </summary>
+        /// <param name="curPage"></param>
+        /// <param name="pageSize"></param>
+        private void PageBar1_PagerEvent(int curPage, int pageSize)
+        {
+            getPageList(curPage);
+        }
+        /// <summary>
+        /// 鏌ヨ浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+        {
+            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+            gridView1.ActiveFilter.Clear();
+            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+            frm.UpdateParent += Frm_UpdateParent;
+            frm.ShowDialog();
+        }
+        /// <summary>
+        /// 鏌ヨ鍥炶皟
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+        {
+            _filterList = e.FilterList;
+            getPageList(1);
+        }
+        /// <summary>
+        ///     瀹℃牳浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+        {
+            _toolCk(1);
+        }
+
+        /// <summary>
+        ///     鍙嶅鏍�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+        {
+            _toolCk(0);
+        }
+        /// <summary>
+        /// 鍙栨秷浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+        {
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+        }
+
+        /// <summary>
+        /// 鍒犻櫎浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
+        {
+            string rowGuid = "", rowName = "";
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "guid");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+                return;
+            List<dynamic> lst = new List<dynamic>();
+            lst.Add(rowGuid);
+            var _obj = new
+            {
+                guid = rowGuid,
+                mxGuid = Guid.Empty.ToString(),
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    if (xtraTabControl1.SelectedTabPageIndex == 0)
+                    { }
+                    else
+                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+                    getPageList(this.pageBar1.CurrentPage);
+                }
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 鍒锋柊浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+        {
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+                getModel(lbGuid.Text.Trim());
+            else
+            {
+                //_filterList.Clear();
+                //if (gridView1.ActiveFilter.Count > 0)
+                //{
+                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                //    gridView1.ActiveFilter.Clear();
+                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                //}
+                //getPageList(1);
+                getPageList(this.pageBar1.CurrentPage);
+            }
+        }
+
+        /// <summary>
+        /// 鏂板浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
+        {
+            lbGuid.Text = "";
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
+            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
+
+        }
+        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+        {
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_Guid, gridView1);
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+
+                getModel(rowGuid);
+
+        }
+
+        /// <summary>
+        /// 淇濆瓨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.isSetBtn = false;
+
+            string itemId = txt_itemId.Text.Trim();//鐗╂枡Id
+            string beginTime = txt_BeginTime.Text.Trim();//鐢熸晥鏃ユ湡
+            string endTime = txt_EndTime.Text.Trim();//澶辨晥鏃ユ湡
+            string remark = txt_Remark.Text.Trim();//璁℃椂璇存槑
+            string salary = txt_Salary.Text.Trim();//鎵ц鍗曚环
+
+            if (string.IsNullOrWhiteSpace(txt_itemId.Text))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�");
+                txt_BeginTime.Focus();
+                return;
+            }
+            if (string.IsNullOrWhiteSpace(txt_BeginTime.Text))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐢熸晥鏃ユ湡锛�");
+                txt_BeginTime.Focus();
+                return;
+            }
+            if (string.IsNullOrWhiteSpace(txt_EndTime.Text))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶辨晥鏃ユ湡锛�");
+                txt_EndTime.Focus();
+                return;
+            }
+            if (string.IsNullOrWhiteSpace(txt_Salary.Text))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇疯緭鍏ユ墽琛屽崟浠凤紒");
+                txt_Salary.Focus();
+                return;
+            }
+
+
+            try
+            {
+                var _obj = new
+                {
+                    guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+                    beginTime = beginTime,
+                    endTime = endTime,
+                    remark = remark,
+                    itemId = itemId,
+                    salary = salary
+                };
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                if (_rtn.rtnCode > 0)
+                {
+                    lbGuid.Text = _rtn.rtnData.outGuid;
+                    toolBarMenu1.isSetBtn = true;
+                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
+                    toolBarMenu1.currentAction = "";
+                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+                }
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage)
+        {
+            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "", "", "", _sbSqlWhere.ToString());
+            var json = JsonConvert.SerializeObject(pgq);
+            try
+            {
+                var strReturn = UtilityHelper.HttpPost("",
+                    _webServiceName + "GetListPage", json);
+                var dd = UtilityHelper.ReturnToTablePage(strReturn);
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    gcMain1.BindingContext = new BindingContext();
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain1.DataSource = dt;
+                        gcMain1.ForceInitialize();
+                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
+                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="strGuid">涓婚敭</param>
+        /// <param name="isEdit">鏄惁鍙紪杈�</param>
+        /// <param name="tabIdx">閫夐」鍗″簭鍙�</param>
+        private void getModel(string strGuid)
+        {
+            bool isEdit = false;
+            if (toolBarMenu1.currentAction == "add") return;
+            if (toolBarMenu1.currentAction == "edit") isEdit = true;
+            if (string.IsNullOrEmpty(strGuid))
+            {
+                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            var _obj = new
+            {
+                guid = strGuid,//涓诲缓
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    dynamic dy = _rtn.rtnData;
+                    lbGuid.Text = strGuid;
+                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
+                   
+                }
+                else
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+
+        /// <summary>
+        /// 宸ュ叿鏉′簨浠�
+        /// </summary>
+        /// <param name="inFieldValue"></param>
+        private void _toolCk(int _inFieldValue)
+        {
+            string strMsg = "";
+            switch (_inFieldValue)
+            {
+                case 1:
+                    strMsg = "瀹℃牳";
+                    break;
+                case 0:
+                    strMsg = "鍙嶅鏍�";
+                    break;
+            }
+            ;
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "guid");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+                return;
+            var _obj = new
+            {
+                guid = rowGuid,
+                ckValue = _inFieldValue,
+                parameter = "MES_JJGZ_JJSALARY,check_Date,check_Status,check_user"
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
+                    if (xtraTabControl1.SelectedTabPageIndex == 1)
+                    {
+                        getModel(lbGuid.Text.Trim());
+                    }
+                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+                    gridView1.FocusedRowHandle = rowHandle;
+                    UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
+                }
+                else
+                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        private void _setIno()
+        {
+            txt_itemId.Click += (s, e) =>
+            {
+                var frm = new JyxmShow("");
+                frm.UpdateParent += (ss, ee) =>
+                {
+                    try
+                    {
+                        var lst = new List<dynamic>();
+                        lst = ee.DynamicList;
+                        txt_itemId.Text = lst[0].itemId;
+                        txt_itemModel.Text = lst[0].itemModel;
+                        txt_itemName.Text = lst[0].itemName;
+                        txt_itemNo.Text = lst[0].itemNo;
+                        txt_fSubsidiary.Text = lst[0].fSubsidiary;
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show(ex.Message);
+                    }
+                };
+                frm.ShowDialog();
+            };
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.resx b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.resx
new file mode 100644
index 0000000..5160e8b
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.resx
@@ -0,0 +1,123 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs
new file mode 100644
index 0000000..f15026e
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs
@@ -0,0 +1,889 @@
+锘縩amespace Gs.DevApp.DevFrm.JJGZ
+{
+    partial class Frm_MesJSSalary
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.pageBar1 = new UserControls.Data.UcPageBar();
+            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.lbGuid = new System.Windows.Forms.Label();
+            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_Remark = new DevExpress.XtraEditors.TextEdit();
+            this.txt_HourlySalary = new DevExpress.XtraEditors.TextEdit();
+            this.txt_Guid = new DevExpress.XtraEditors.TextEdit();
+            this.txt_BeginTime = new DevExpress.XtraEditors.DateEdit();
+            this.txt_EndTime = new DevExpress.XtraEditors.DateEdit();
+            this.txt_HourlyType = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.txt_SalaryType = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.xtraTabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+            this.split1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+            this.split1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            this.xtraTabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+            this.splitMx1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+            this.splitMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+            this.layoutMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_HourlySalary.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_BeginTime.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_BeginTime.Properties.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_EndTime.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_EndTime.Properties.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_HourlyType.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_SalaryType.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // toolBarMenu1
+            // 
+            this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
+            this.toolBarMenu1.defaultActions = null;
+            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.toolBarMenu1.guidKey = null;
+            this.toolBarMenu1.isSetBtn = false;
+            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
+            this.toolBarMenu1.Name = "toolBarMenu1";
+            this.toolBarMenu1.rptParameter = null;
+            this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+            this.toolBarMenu1.TabIndex = 0;
+            this.toolBarMenu1.xlsInService = null;
+            this.toolBarMenu1.xlsOutParameter = null;
+            // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
+            this.xtraTabControl1.TabIndex = 3;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1,
+            this.xtraTabPage2});
+            // 
+            // xtraTabPage1
+            // 
+            this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+            // 
+            // split1
+            // 
+            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+            this.split1.Horizontal = false;
+            this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Margin = new System.Windows.Forms.Padding(4);
+            this.split1.Name = "split1";
+            // 
+            // split1.Panel1
+            // 
+            this.split1.Panel1.Controls.Add(this.gcMain1);
+            this.split1.Panel1.Controls.Add(this.pageBar1);
+            this.split1.Panel1.Text = "Panel1";
+            // 
+            // split1.Panel2
+            // 
+            this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.split1.Size = new System.Drawing.Size(1408, 698);
+            this.split1.SplitterPosition = 0;
+            this.split1.TabIndex = 0;
+            // 
+            // gcMain1
+            // 
+            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain1.Location = new System.Drawing.Point(0, 0);
+            this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain1.Name = "gcMain1";
+            this.gcMain1.Size = new System.Drawing.Size(1408, 635);
+            this.gcMain1.TabIndex = 2;
+            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.ColumnPanelRowHeight = 61;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gv_createBy,
+            this.gv_createDate,
+            this.gridColumn6,
+            this.gridColumn1,
+            this.gridColumn2,
+            this.gridColumn3,
+            this.gridColumn4,
+            this.gridColumn5,
+            this.gridColumn7});
+            this.gridView1.DetailHeight = 428;
+            this.gridView1.GridControl = this.gcMain1;
+            this.gridView1.IndicatorWidth = 62;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gv_createBy
+            // 
+            this.gv_createBy.AppearanceCell.Options.UseFont = true;
+            this.gv_createBy.Caption = "寤虹珛鑰�";
+            this.gv_createBy.FieldName = "createBy";
+            this.gv_createBy.MinWidth = 62;
+            this.gv_createBy.Name = "gv_createBy";
+            this.gv_createBy.OptionsColumn.AllowEdit = false;
+            this.gv_createBy.Tag = "query_a.create_by";
+            this.gv_createBy.Visible = true;
+            this.gv_createBy.VisibleIndex = 1;
+            this.gv_createBy.Width = 100;
+            // 
+            // gv_createDate
+            // 
+            this.gv_createDate.AppearanceCell.Options.UseFont = true;
+            this.gv_createDate.Caption = "寤虹珛鏃堕棿";
+            this.gv_createDate.FieldName = "createDate";
+            this.gv_createDate.MinWidth = 225;
+            this.gv_createDate.Name = "gv_createDate";
+            this.gv_createDate.OptionsColumn.AllowEdit = false;
+            this.gv_createDate.Tag = "query_a.create_date";
+            this.gv_createDate.Visible = true;
+            this.gv_createDate.VisibleIndex = 2;
+            this.gv_createDate.Width = 286;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "瀹℃牳";
+            this.gridColumn6.FieldName = "checkStatus";
+            this.gridColumn6.MinWidth = 31;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 0;
+            this.gridColumn6.Width = 117;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "璁℃椂绫诲瀷";
+            this.gridColumn1.FieldName = "hourlyType";
+            this.gridColumn1.MinWidth = 30;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.OptionsColumn.AllowEdit = false;
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 3;
+            this.gridColumn1.Width = 94;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "璁℃椂宸ヨ祫";
+            this.gridColumn2.FieldName = "hourlySalary";
+            this.gridColumn2.MinWidth = 30;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.OptionsColumn.AllowEdit = false;
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 4;
+            this.gridColumn2.Width = 94;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "鐢熸晥鏃ユ湡";
+            this.gridColumn3.FieldName = "beginTime";
+            this.gridColumn3.MinWidth = 30;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.OptionsColumn.AllowEdit = false;
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 5;
+            this.gridColumn3.Width = 94;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "澶辨晥鏃ユ湡";
+            this.gridColumn4.FieldName = "endTime";
+            this.gridColumn4.MinWidth = 30;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.OptionsColumn.AllowEdit = false;
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 6;
+            this.gridColumn4.Width = 94;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "璁℃椂璇存槑";
+            this.gridColumn5.FieldName = "remark";
+            this.gridColumn5.MinWidth = 30;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.OptionsColumn.AllowEdit = false;
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 7;
+            this.gridColumn5.Width = 94;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "宸ヨ祫璁″叆";
+            this.gridColumn7.FieldName = "salaryType";
+            this.gridColumn7.MinWidth = 30;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.OptionsColumn.AllowEdit = false;
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 8;
+            this.gridColumn7.Width = 94;
+            // 
+            // pageBar1
+            // 
+            this.pageBar1.CurrentPage = 1;
+            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.pageBar1.Location = new System.Drawing.Point(0, 635);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+            this.pageBar1.Name = "pageBar1";
+            this.pageBar1.RecordCount = 0;
+            this.pageBar1.Size = new System.Drawing.Size(1408, 48);
+            this.pageBar1.TabIndex = 4;
+            this.pageBar1.TotalPages = 0;
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Controls.Add(this.splitMx1);
+            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
+            this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+            // 
+            // splitMx1
+            // 
+            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitMx1.Horizontal = false;
+            this.splitMx1.Location = new System.Drawing.Point(0, 0);
+            this.splitMx1.Margin = new System.Windows.Forms.Padding(4);
+            this.splitMx1.Name = "splitMx1";
+            // 
+            // splitMx1.Panel1
+            // 
+            this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+            this.splitMx1.Panel1.Text = "Panel1";
+            // 
+            // splitMx1.Panel2
+            // 
+            this.splitMx1.Panel2.Text = "Panel2";
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx1.Size = new System.Drawing.Size(1408, 698);
+            this.splitMx1.SplitterPosition = 159;
+            this.splitMx1.TabIndex = 0;
+            // 
+            // layoutMx1
+            // 
+            this.layoutMx1.Controls.Add(this.lbGuid);
+            this.layoutMx1.Controls.Add(this.txt_createDate);
+            this.layoutMx1.Controls.Add(this.txt_createBy);
+            this.layoutMx1.Controls.Add(this.txt_checkBy);
+            this.layoutMx1.Controls.Add(this.txt_checkDate);
+            this.layoutMx1.Controls.Add(this.txt_checkStatus);
+            this.layoutMx1.Controls.Add(this.txt_Remark);
+            this.layoutMx1.Controls.Add(this.txt_HourlySalary);
+            this.layoutMx1.Controls.Add(this.txt_Guid);
+            this.layoutMx1.Controls.Add(this.txt_BeginTime);
+            this.layoutMx1.Controls.Add(this.txt_EndTime);
+            this.layoutMx1.Controls.Add(this.txt_HourlyType);
+            this.layoutMx1.Controls.Add(this.txt_SalaryType);
+            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem9});
+            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
+            this.layoutMx1.Name = "layoutMx1";
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
+            this.layoutMx1.Root = this.Root;
+            this.layoutMx1.Size = new System.Drawing.Size(1408, 159);
+            this.layoutMx1.TabIndex = 0;
+            this.layoutMx1.Text = "layoutControl1";
+            // 
+            // lbGuid
+            // 
+            this.lbGuid.Location = new System.Drawing.Point(692, 131);
+            this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lbGuid.Name = "lbGuid";
+            this.lbGuid.Size = new System.Drawing.Size(334, 34);
+            this.lbGuid.TabIndex = 1;
+            this.lbGuid.Text = "lbGuid";
+            this.lbGuid.Visible = false;
+            // 
+            // txt_createDate
+            // 
+            this.txt_createDate.Location = new System.Drawing.Point(790, 81);
+            this.txt_createDate.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_createDate.Name = "txt_createDate";
+            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_createDate.Size = new System.Drawing.Size(259, 28);
+            this.txt_createDate.StyleController = this.layoutMx1;
+            this.txt_createDate.TabIndex = 231;
+            this.txt_createDate.Tag = "readonly";
+            // 
+            // txt_createBy
+            // 
+            this.txt_createBy.Location = new System.Drawing.Point(1137, 81);
+            this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_createBy.Name = "txt_createBy";
+            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+            this.txt_createBy.Size = new System.Drawing.Size(259, 28);
+            this.txt_createBy.StyleController = this.layoutMx1;
+            this.txt_createBy.TabIndex = 228;
+            this.txt_createBy.Tag = "readonly";
+            // 
+            // txt_checkBy
+            // 
+            this.txt_checkBy.Location = new System.Drawing.Point(443, 81);
+            this.txt_checkBy.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_checkBy.Name = "txt_checkBy";
+            this.txt_checkBy.Size = new System.Drawing.Size(259, 28);
+            this.txt_checkBy.StyleController = this.layoutMx1;
+            this.txt_checkBy.TabIndex = 247;
+            this.txt_checkBy.Tag = "readonly";
+            // 
+            // txt_checkDate
+            // 
+            this.txt_checkDate.Location = new System.Drawing.Point(96, 81);
+            this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_checkDate.Name = "txt_checkDate";
+            this.txt_checkDate.Size = new System.Drawing.Size(259, 28);
+            this.txt_checkDate.StyleController = this.layoutMx1;
+            this.txt_checkDate.TabIndex = 248;
+            this.txt_checkDate.Tag = "readonly";
+            // 
+            // txt_checkStatus
+            // 
+            this.txt_checkStatus.Location = new System.Drawing.Point(706, 46);
+            this.txt_checkStatus.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_checkStatus.Name = "txt_checkStatus";
+            this.txt_checkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
+            this.txt_checkStatus.Size = new System.Drawing.Size(343, 27);
+            this.txt_checkStatus.StyleController = this.layoutMx1;
+            this.txt_checkStatus.TabIndex = 249;
+            this.txt_checkStatus.Tag = "readonly";
+            // 
+            // txt_Remark
+            // 
+            this.txt_Remark.Location = new System.Drawing.Point(96, 46);
+            this.txt_Remark.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_Remark.Name = "txt_Remark";
+            this.txt_Remark.Size = new System.Drawing.Size(259, 28);
+            this.txt_Remark.StyleController = this.layoutMx1;
+            this.txt_Remark.TabIndex = 250;
+            this.txt_Remark.Tag = "";
+            // 
+            // txt_HourlySalary
+            // 
+            this.txt_HourlySalary.Location = new System.Drawing.Point(443, 12);
+            this.txt_HourlySalary.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_HourlySalary.Name = "txt_HourlySalary";
+            this.txt_HourlySalary.Size = new System.Drawing.Size(259, 28);
+            this.txt_HourlySalary.StyleController = this.layoutMx1;
+            this.txt_HourlySalary.TabIndex = 250;
+            this.txt_HourlySalary.Tag = "";
+            // 
+            // txt_Guid
+            // 
+            this.txt_Guid.Location = new System.Drawing.Point(790, 116);
+            this.txt_Guid.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_Guid.Name = "txt_Guid";
+            this.txt_Guid.Size = new System.Drawing.Size(259, 28);
+            this.txt_Guid.StyleController = this.layoutMx1;
+            this.txt_Guid.TabIndex = 250;
+            this.txt_Guid.Tag = "";
+            // 
+            // txt_BeginTime
+            // 
+            this.txt_BeginTime.EditValue = null;
+            this.txt_BeginTime.Location = new System.Drawing.Point(790, 12);
+            this.txt_BeginTime.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_BeginTime.Name = "txt_BeginTime";
+            this.txt_BeginTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_BeginTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_BeginTime.Properties.DisplayFormat.FormatString = "";
+            this.txt_BeginTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txt_BeginTime.Properties.EditFormat.FormatString = "";
+            this.txt_BeginTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txt_BeginTime.Properties.Mask.EditMask = "";
+            this.txt_BeginTime.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.None;
+            this.txt_BeginTime.Size = new System.Drawing.Size(259, 28);
+            this.txt_BeginTime.StyleController = this.layoutMx1;
+            this.txt_BeginTime.TabIndex = 250;
+            this.txt_BeginTime.Tag = "";
+            // 
+            // txt_EndTime
+            // 
+            this.txt_EndTime.EditValue = null;
+            this.txt_EndTime.Location = new System.Drawing.Point(1137, 12);
+            this.txt_EndTime.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_EndTime.Name = "txt_EndTime";
+            this.txt_EndTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_EndTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_EndTime.Properties.DisplayFormat.FormatString = "";
+            this.txt_EndTime.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txt_EndTime.Properties.EditFormat.FormatString = "";
+            this.txt_EndTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.txt_EndTime.Properties.Mask.EditMask = "";
+            this.txt_EndTime.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.None;
+            this.txt_EndTime.Size = new System.Drawing.Size(259, 28);
+            this.txt_EndTime.StyleController = this.layoutMx1;
+            this.txt_EndTime.TabIndex = 250;
+            this.txt_EndTime.Tag = "";
+            // 
+            // txt_HourlyType
+            // 
+            this.txt_HourlyType.Location = new System.Drawing.Point(96, 12);
+            this.txt_HourlyType.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_HourlyType.Name = "txt_HourlyType";
+            this.txt_HourlyType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_HourlyType.Size = new System.Drawing.Size(259, 28);
+            this.txt_HourlyType.StyleController = this.layoutMx1;
+            this.txt_HourlyType.TabIndex = 250;
+            this.txt_HourlyType.Tag = "";
+            // 
+            // txt_SalaryType
+            // 
+            this.txt_SalaryType.Location = new System.Drawing.Point(443, 46);
+            this.txt_SalaryType.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_SalaryType.Name = "txt_SalaryType";
+            this.txt_SalaryType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_SalaryType.Properties.Items.AddRange(new object[] {
+            "涓汉",
+            "浜х嚎"});
+            this.txt_SalaryType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.txt_SalaryType.Size = new System.Drawing.Size(259, 28);
+            this.txt_SalaryType.StyleController = this.layoutMx1;
+            this.txt_SalaryType.TabIndex = 250;
+            this.txt_SalaryType.Tag = "";
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.lbGuid;
+            this.layoutControlItem9.Location = new System.Drawing.Point(542, 96);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem9.Text = "lbGuid";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem9.TextVisible = false;
+            // 
+            // Root
+            // 
+            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.Root.GroupBordersVisible = false;
+            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem3,
+            this.layoutControlItem12,
+            this.layoutControlItem13,
+            this.layoutControlItem2,
+            this.layoutControlItem4,
+            this.layoutControlItem1,
+            this.layoutControlItem11,
+            this.layoutControlItem10,
+            this.layoutControlItem8,
+            this.layoutControlItem7,
+            this.layoutControlItem6,
+            this.layoutControlItem5});
+            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.Root.Name = "Root";
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
+            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4});
+            this.Root.Size = new System.Drawing.Size(1408, 159);
+            this.Root.TextVisible = false;
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_HourlySalary;
+            this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem3.CustomizationFormText = "璁℃椂宸ヨ祫";
+            this.layoutControlItem3.Location = new System.Drawing.Point(347, 0);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem3.Size = new System.Drawing.Size(347, 34);
+            this.layoutControlItem3.Text = "璁℃椂宸ヨ祫";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_HourlyType;
+            this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem12.CustomizationFormText = "璁℃椂绫诲瀷";
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.Size = new System.Drawing.Size(347, 34);
+            this.layoutControlItem12.Text = "璁℃椂绫诲瀷";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // picCheckBox
+            // 
+            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+            this.picCheckBox.Location = new System.Drawing.Point(1285, 29);
+            this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
+            this.picCheckBox.Name = "picCheckBox";
+            this.picCheckBox.Size = new System.Drawing.Size(125, 61);
+            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.picCheckBox.TabIndex = 9;
+            this.picCheckBox.TabStop = false;
+            this.picCheckBox.Visible = false;
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_Guid;
+            this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem13.CustomizationFormText = "Guid";
+            this.layoutControlItem13.Location = new System.Drawing.Point(694, 104);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem13.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem13.Text = "Guid";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
+            this.layoutControlItem13.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_BeginTime;
+            this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem2.CustomizationFormText = "鐢熸晥鏃ユ湡";
+            this.layoutControlItem2.Location = new System.Drawing.Point(694, 0);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem2.Size = new System.Drawing.Size(347, 34);
+            this.layoutControlItem2.Text = "鐢熸晥鏃ユ湡";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_EndTime;
+            this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem4.CustomizationFormText = "澶辨晥鏃ユ湡";
+            this.layoutControlItem4.Location = new System.Drawing.Point(1041, 0);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem4.Size = new System.Drawing.Size(347, 34);
+            this.layoutControlItem4.Text = "澶辨晥鏃ユ湡";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txt_Remark;
+            this.layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem1.CustomizationFormText = "璁℃椂璇存槑";
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 34);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem1.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem1.Text = "璁℃椂璇存槑";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txt_SalaryType;
+            this.layoutControlItem11.Location = new System.Drawing.Point(347, 34);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem11.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem11.Text = "宸ヨ祫璁″叆";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_checkStatus;
+            this.layoutControlItem10.Location = new System.Drawing.Point(694, 34);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem10.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem10.TextVisible = false;
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_checkDate;
+            this.layoutControlItem8.Location = new System.Drawing.Point(0, 69);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem8.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem8.Text = "瀹℃牳鏃堕棿";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_checkBy;
+            this.layoutControlItem7.Location = new System.Drawing.Point(347, 69);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem7.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem7.Text = "瀹℃牳鑰�";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_createDate;
+            this.layoutControlItem6.Location = new System.Drawing.Point(694, 69);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem6.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem6.Text = "寤虹珛鏃堕棿";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txt_createBy;
+            this.layoutControlItem5.Location = new System.Drawing.Point(1041, 69);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem5.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem5.Text = "寤虹珛鑰�";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // Frm_MesJSSalary
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1410, 834);
+            this.Controls.Add(this.picCheckBox);
+            this.Controls.Add(this.xtraTabControl1);
+            this.Controls.Add(this.toolBarMenu1);
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "Frm_MesJSSalary";
+            this.Text = "璁℃椂宸ヨ祫";
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.xtraTabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+            this.split1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+            this.split1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            this.xtraTabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+            this.splitMx1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+            this.splitMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+            this.layoutMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_HourlySalary.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_BeginTime.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_BeginTime.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_EndTime.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_EndTime.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_HourlyType.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_SalaryType.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+        #endregion
+        private UserControl.UcToolBarMenu toolBarMenu1;
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+        private DevExpress.XtraEditors.SplitContainerControl split1;
+        private DevExpress.XtraGrid.GridControl gcMain1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+        private UserControls.Data.UcPageBar pageBar1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+        private System.Windows.Forms.Label lbGuid;
+        private DevExpress.XtraEditors.TextEdit txt_createDate;
+        private DevExpress.XtraEditors.TextEdit txt_createBy;
+        private DevExpress.XtraLayout.LayoutControl layoutMx1;
+        private DevExpress.XtraLayout.LayoutControlGroup Root;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraEditors.TextEdit txt_checkBy;
+        private DevExpress.XtraEditors.TextEdit txt_checkDate;
+        private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
+        private System.Windows.Forms.PictureBox picCheckBox;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraEditors.TextEdit txt_Remark;
+        private DevExpress.XtraEditors.TextEdit txt_HourlySalary;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraEditors.TextEdit txt_Guid;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraEditors.DateEdit txt_BeginTime;
+        private DevExpress.XtraEditors.DateEdit txt_EndTime;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_HourlyType;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_SalaryType;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.cs
new file mode 100644
index 0000000..472916f
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.cs
@@ -0,0 +1,474 @@
+锘縰sing DevExpress.ClipboardSource.SpreadsheetML;
+using DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using System.Windows.Media.Animation;
+
+namespace Gs.DevApp.DevFrm.JJGZ
+{
+    public partial class Frm_MesJSSalary : DevExpress.XtraEditors.XtraForm
+    {
+        string _webServiceName = "MesJjgzJssalary/";
+        List<FilterEntity> _filterList = new List<FilterEntity>();
+
+        public Frm_MesJSSalary()
+        {
+            InitializeComponent();
+            this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
+            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            this.toolBarMenu1.getXmlConfig();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
+            {
+                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+            }, tips);
+            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+            {
+                getModel(value);
+            }, (value) =>
+            {
+                getPageList(this.pageBar1.CurrentPage);
+            }, lbGuid);
+            getPageList(1);
+            pageBar1.PagerEvent += PageBar1_PagerEvent;
+            GetTimeType();
+        }
+
+        /// <summary>
+        /// 鑾峰彇涓嬫媺妗嗘暟鎹�
+        /// </summary>
+        private void GetTimeType()
+        {
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetTimeType", "");
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    dynamic dy = _rtn.rtnData;
+                    JObject _job = JObject.Parse(strJson);
+                    JArray array = new JArray();
+                    foreach (var a in _job["rtnData"]["list"])
+                    {
+                        array.Add(a);
+                    }
+                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+
+                    foreach (DataRow row in dt.Rows)
+                    {
+                        this.txt_HourlyType.Properties.Items.Add(row["name"].ToString());
+                    }
+                }
+                else
+                {
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        {
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            await Task.Delay(100);
+            getPageList(1);
+        }
+
+        /// <summary>
+        /// 鍒嗛〉浜嬩欢
+        /// </summary>
+        /// <param name="curPage"></param>
+        /// <param name="pageSize"></param>
+        private void PageBar1_PagerEvent(int curPage, int pageSize)
+        {
+            getPageList(curPage);
+        }
+        /// <summary>
+        /// 鏌ヨ浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+        {
+            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+            gridView1.ActiveFilter.Clear();
+            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+            frm.UpdateParent += Frm_UpdateParent;
+            frm.ShowDialog();
+        }
+        /// <summary>
+        /// 鏌ヨ鍥炶皟
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+        {
+            _filterList = e.FilterList;
+            getPageList(1);
+        }
+        /// <summary>
+        ///     瀹℃牳浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+        {
+            _toolCk(1);
+        }
+
+        /// <summary>
+        ///     鍙嶅鏍�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+        {
+            _toolCk(0);
+        }
+        /// <summary>
+        /// 鍙栨秷浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+        {
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+        }
+
+        /// <summary>
+        /// 鍒犻櫎浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
+        {
+            string rowGuid = "", rowName = "";
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "guid");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+                return;
+            List<dynamic> lst = new List<dynamic>();
+            lst.Add(rowGuid);
+            var _obj = new
+            {
+                guid = rowGuid,
+                mxGuid = Guid.Empty.ToString(),
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    if (xtraTabControl1.SelectedTabPageIndex == 0)
+                    { }
+                    else
+                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+                    getPageList(this.pageBar1.CurrentPage);
+                }
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 鍒锋柊浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+        {
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+                getModel(lbGuid.Text.Trim());
+            else
+            {
+                //_filterList.Clear();
+                //if (gridView1.ActiveFilter.Count > 0)
+                //{
+                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                //    gridView1.ActiveFilter.Clear();
+                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                //}
+                //getPageList(1);
+                getPageList(this.pageBar1.CurrentPage);
+            }
+        }
+
+        /// <summary>
+        /// 鏂板浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
+        {
+            lbGuid.Text = "";
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
+            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
+            GetTimeType();
+            getPageList(this.pageBar1.CurrentPage);
+        }
+        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+        {
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_Guid, gridView1);
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+
+                getModel(rowGuid);
+            GetTimeType();
+            getPageList(this.pageBar1.CurrentPage);
+        }
+
+        /// <summary>
+        /// 淇濆瓨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.isSetBtn = false;
+            string hourlyType = txt_HourlyType.Text.Trim();//璁℃椂绫诲瀷
+            string hourlySalary = txt_HourlySalary.Text.Trim();//璁℃椂宸ヨ祫
+            string beginTime = txt_BeginTime.Text.Trim();//鐢熸晥鏃ユ湡
+            string endTime = txt_EndTime.Text.Trim();//澶辨晥鏃ユ湡
+            string remark = txt_Remark.Text.Trim();//璁℃椂璇存槑
+            string salaryType = txt_SalaryType.Text.Trim();//宸ヨ祫璁″叆
+            if (string.IsNullOrWhiteSpace( txt_HourlyType.Text))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璁℃椂绫诲瀷锛�");
+                txt_HourlyType.Focus();
+                return;
+            }
+            if (string.IsNullOrWhiteSpace(txt_HourlySalary.Text))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璁℃椂宸ヨ祫锛�");
+                txt_HourlySalary.Focus();
+                return;
+            }
+            if (string.IsNullOrWhiteSpace(txt_BeginTime.Text))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐢熸晥鏃ユ湡锛�");
+                txt_BeginTime.Focus();
+                return;
+            }
+            if (string.IsNullOrWhiteSpace(txt_EndTime.Text))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨澶辨晥鏃ユ湡锛�");
+                txt_EndTime.Focus();
+                return;
+            }
+            if (string.IsNullOrWhiteSpace(txt_SalaryType.Text))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨宸ヨ祫璁″叆锛�");
+                txt_SalaryType.Focus();
+                return;
+            }
+
+            try
+            {
+                var _obj = new
+                {
+                    guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+                    hourlyType = hourlyType,
+                    hourlySalary = hourlySalary,
+                    beginTime = beginTime,
+                    endTime = endTime,
+                    remark = remark,
+                    salaryType = salaryType
+                };
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                if (_rtn.rtnCode > 0)
+                {
+                    lbGuid.Text = _rtn.rtnData.outGuid;
+                    toolBarMenu1.isSetBtn = true;
+                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
+                    toolBarMenu1.currentAction = "";
+                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+                }
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage)
+        {
+            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "", "", "", _sbSqlWhere.ToString());
+            var json = JsonConvert.SerializeObject(pgq);
+            try
+            {
+                var strReturn = UtilityHelper.HttpPost("",
+                    _webServiceName + "GetListPage", json);
+                var dd = UtilityHelper.ReturnToTablePage(strReturn);
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    gcMain1.BindingContext = new BindingContext();
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain1.DataSource = dt;
+                        gcMain1.ForceInitialize();
+                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
+                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="strGuid">涓婚敭</param>
+        /// <param name="isEdit">鏄惁鍙紪杈�</param>
+        /// <param name="tabIdx">閫夐」鍗″簭鍙�</param>
+        private void getModel(string strGuid)
+        {
+            bool isEdit = false;
+            if (toolBarMenu1.currentAction == "add") return;
+            if (toolBarMenu1.currentAction == "edit") isEdit = true;
+            if (string.IsNullOrEmpty(strGuid))
+            {
+                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            var _obj = new
+            {
+                guid = strGuid,//涓诲缓
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    dynamic dy = _rtn.rtnData;
+                    lbGuid.Text = strGuid;
+                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
+                   
+                }
+                else
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+
+        /// <summary>
+        /// 宸ュ叿鏉′簨浠�
+        /// </summary>
+        /// <param name="inFieldValue"></param>
+        private void _toolCk(int _inFieldValue)
+        {
+            string strMsg = "";
+            switch (_inFieldValue)
+            {
+                case 1:
+                    strMsg = "瀹℃牳";
+                    break;
+                case 0:
+                    strMsg = "鍙嶅鏍�";
+                    break;
+            }
+            ;
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_SalaryType, gridView1, "guid");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+                return;
+            var _obj = new
+            {
+                guid = rowGuid,
+                ckValue = _inFieldValue,
+                parameter = "MES_JJGZ_JSSALARY,check_Date,check_Status,check_user"
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
+                    if (xtraTabControl1.SelectedTabPageIndex == 1)
+                    {
+                        getModel(lbGuid.Text.Trim());
+                    }
+                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+                    gridView1.FocusedRowHandle = rowHandle;
+                    UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
+                }
+                else
+                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.resx b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.resx
new file mode 100644
index 0000000..5160e8b
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.resx
@@ -0,0 +1,123 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.Designer.cs
new file mode 100644
index 0000000..abfd9d0
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.Designer.cs
@@ -0,0 +1,609 @@
+锘縩amespace Gs.DevApp.DevFrm.JJGZ
+{
+    partial class Frm_MesJjgzTimeType
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.lbGuid = new System.Windows.Forms.Label();
+            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_Name = new DevExpress.XtraEditors.TextEdit();
+            this.txt_Guid = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+            this.xtraTabControl1.SuspendLayout();
+            this.xtraTabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+            this.split1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+            this.split1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            this.xtraTabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+            this.splitMx1.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+            this.splitMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+            this.layoutMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Name.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // toolBarMenu1
+            // 
+            this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
+            this.toolBarMenu1.defaultActions = null;
+            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.toolBarMenu1.guidKey = null;
+            this.toolBarMenu1.isSetBtn = false;
+            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
+            this.toolBarMenu1.Name = "toolBarMenu1";
+            this.toolBarMenu1.rptParameter = null;
+            this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+            this.toolBarMenu1.TabIndex = 0;
+            this.toolBarMenu1.xlsInService = null;
+            this.toolBarMenu1.xlsOutParameter = null;
+            // 
+            // xtraTabControl1
+            // 
+            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabControl1.Name = "xtraTabControl1";
+            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+            this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
+            this.xtraTabControl1.TabIndex = 3;
+            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage1,
+            this.xtraTabPage2});
+            // 
+            // xtraTabPage1
+            // 
+            this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabPage1.Name = "xtraTabPage1";
+            this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+            // 
+            // split1
+            // 
+            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+            this.split1.Horizontal = false;
+            this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Margin = new System.Windows.Forms.Padding(4);
+            this.split1.Name = "split1";
+            // 
+            // split1.Panel1
+            // 
+            this.split1.Panel1.Controls.Add(this.gcMain1);
+            this.split1.Panel1.Text = "Panel1";
+            // 
+            // split1.Panel2
+            // 
+            this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.split1.Size = new System.Drawing.Size(1408, 698);
+            this.split1.SplitterPosition = 0;
+            this.split1.TabIndex = 0;
+            // 
+            // gcMain1
+            // 
+            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain1.Location = new System.Drawing.Point(0, 0);
+            this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain1.Name = "gcMain1";
+            this.gcMain1.Size = new System.Drawing.Size(1408, 683);
+            this.gcMain1.TabIndex = 2;
+            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.ColumnPanelRowHeight = 61;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gv_createBy,
+            this.gv_createDate,
+            this.gridColumn6,
+            this.gridColumn1});
+            this.gridView1.DetailHeight = 428;
+            this.gridView1.GridControl = this.gcMain1;
+            this.gridView1.IndicatorWidth = 62;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gv_createBy
+            // 
+            this.gv_createBy.AppearanceCell.Options.UseFont = true;
+            this.gv_createBy.Caption = "寤虹珛鑰�";
+            this.gv_createBy.FieldName = "createBy";
+            this.gv_createBy.MinWidth = 62;
+            this.gv_createBy.Name = "gv_createBy";
+            this.gv_createBy.OptionsColumn.AllowEdit = false;
+            this.gv_createBy.Tag = "query_a.create_by";
+            this.gv_createBy.Visible = true;
+            this.gv_createBy.VisibleIndex = 1;
+            this.gv_createBy.Width = 100;
+            // 
+            // gv_createDate
+            // 
+            this.gv_createDate.AppearanceCell.Options.UseFont = true;
+            this.gv_createDate.Caption = "寤虹珛鏃堕棿";
+            this.gv_createDate.FieldName = "createDate";
+            this.gv_createDate.MinWidth = 225;
+            this.gv_createDate.Name = "gv_createDate";
+            this.gv_createDate.OptionsColumn.AllowEdit = false;
+            this.gv_createDate.Tag = "query_a.create_date";
+            this.gv_createDate.Visible = true;
+            this.gv_createDate.VisibleIndex = 2;
+            this.gv_createDate.Width = 286;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "瀹℃牳";
+            this.gridColumn6.FieldName = "checkStatus";
+            this.gridColumn6.MinWidth = 31;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 0;
+            this.gridColumn6.Width = 117;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "璁℃椂绫诲瀷";
+            this.gridColumn1.FieldName = "name";
+            this.gridColumn1.MinWidth = 30;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.OptionsColumn.AllowEdit = false;
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 3;
+            this.gridColumn1.Width = 94;
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Controls.Add(this.splitMx1);
+            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
+            this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+            // 
+            // splitMx1
+            // 
+            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitMx1.Horizontal = false;
+            this.splitMx1.Location = new System.Drawing.Point(0, 0);
+            this.splitMx1.Margin = new System.Windows.Forms.Padding(4);
+            this.splitMx1.Name = "splitMx1";
+            // 
+            // splitMx1.Panel1
+            // 
+            this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+            this.splitMx1.Panel1.Text = "Panel1";
+            // 
+            // splitMx1.Panel2
+            // 
+            this.splitMx1.Panel2.Text = "Panel2";
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx1.Size = new System.Drawing.Size(1408, 698);
+            this.splitMx1.SplitterPosition = 159;
+            this.splitMx1.TabIndex = 0;
+            // 
+            // layoutMx1
+            // 
+            this.layoutMx1.Controls.Add(this.lbGuid);
+            this.layoutMx1.Controls.Add(this.txt_createDate);
+            this.layoutMx1.Controls.Add(this.txt_createBy);
+            this.layoutMx1.Controls.Add(this.txt_checkBy);
+            this.layoutMx1.Controls.Add(this.txt_checkDate);
+            this.layoutMx1.Controls.Add(this.txt_checkStatus);
+            this.layoutMx1.Controls.Add(this.txt_Name);
+            this.layoutMx1.Controls.Add(this.txt_Guid);
+            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem9});
+            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx1.Margin = new System.Windows.Forms.Padding(4);
+            this.layoutMx1.Name = "layoutMx1";
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
+            this.layoutMx1.Root = this.Root;
+            this.layoutMx1.Size = new System.Drawing.Size(1408, 159);
+            this.layoutMx1.TabIndex = 0;
+            this.layoutMx1.Text = "layoutControl1";
+            // 
+            // lbGuid
+            // 
+            this.lbGuid.Location = new System.Drawing.Point(692, 131);
+            this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lbGuid.Name = "lbGuid";
+            this.lbGuid.Size = new System.Drawing.Size(334, 34);
+            this.lbGuid.TabIndex = 1;
+            this.lbGuid.Text = "lbGuid";
+            this.lbGuid.Visible = false;
+            // 
+            // txt_createDate
+            // 
+            this.txt_createDate.Location = new System.Drawing.Point(790, 46);
+            this.txt_createDate.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_createDate.Name = "txt_createDate";
+            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_createDate.Size = new System.Drawing.Size(259, 28);
+            this.txt_createDate.StyleController = this.layoutMx1;
+            this.txt_createDate.TabIndex = 231;
+            this.txt_createDate.Tag = "readonly";
+            // 
+            // txt_createBy
+            // 
+            this.txt_createBy.Location = new System.Drawing.Point(790, 12);
+            this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_createBy.Name = "txt_createBy";
+            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+            this.txt_createBy.Size = new System.Drawing.Size(259, 28);
+            this.txt_createBy.StyleController = this.layoutMx1;
+            this.txt_createBy.TabIndex = 228;
+            this.txt_createBy.Tag = "readonly";
+            // 
+            // txt_checkBy
+            // 
+            this.txt_checkBy.Location = new System.Drawing.Point(1137, 12);
+            this.txt_checkBy.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_checkBy.Name = "txt_checkBy";
+            this.txt_checkBy.Size = new System.Drawing.Size(259, 28);
+            this.txt_checkBy.StyleController = this.layoutMx1;
+            this.txt_checkBy.TabIndex = 247;
+            this.txt_checkBy.Tag = "readonly";
+            // 
+            // txt_checkDate
+            // 
+            this.txt_checkDate.Location = new System.Drawing.Point(1137, 46);
+            this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_checkDate.Name = "txt_checkDate";
+            this.txt_checkDate.Size = new System.Drawing.Size(259, 28);
+            this.txt_checkDate.StyleController = this.layoutMx1;
+            this.txt_checkDate.TabIndex = 248;
+            this.txt_checkDate.Tag = "readonly";
+            // 
+            // txt_checkStatus
+            // 
+            this.txt_checkStatus.Location = new System.Drawing.Point(359, 12);
+            this.txt_checkStatus.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_checkStatus.Name = "txt_checkStatus";
+            this.txt_checkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
+            this.txt_checkStatus.Size = new System.Drawing.Size(343, 27);
+            this.txt_checkStatus.StyleController = this.layoutMx1;
+            this.txt_checkStatus.TabIndex = 249;
+            this.txt_checkStatus.Tag = "readonly";
+            // 
+            // txt_Name
+            // 
+            this.txt_Name.Location = new System.Drawing.Point(96, 12);
+            this.txt_Name.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_Name.Name = "txt_Name";
+            this.txt_Name.Size = new System.Drawing.Size(259, 28);
+            this.txt_Name.StyleController = this.layoutMx1;
+            this.txt_Name.TabIndex = 250;
+            this.txt_Name.Tag = "";
+            // 
+            // txt_Guid
+            // 
+            this.txt_Guid.Location = new System.Drawing.Point(443, 116);
+            this.txt_Guid.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_Guid.Name = "txt_Guid";
+            this.txt_Guid.Size = new System.Drawing.Size(259, 28);
+            this.txt_Guid.StyleController = this.layoutMx1;
+            this.txt_Guid.TabIndex = 250;
+            this.txt_Guid.Tag = "";
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.lbGuid;
+            this.layoutControlItem9.Location = new System.Drawing.Point(542, 96);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem9.Text = "lbGuid";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem9.TextVisible = false;
+            // 
+            // Root
+            // 
+            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.Root.GroupBordersVisible = false;
+            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem7,
+            this.layoutControlItem8,
+            this.layoutControlItem5,
+            this.layoutControlItem6,
+            this.layoutControlItem13,
+            this.layoutControlItem12,
+            this.layoutControlItem10});
+            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.Root.Name = "Root";
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
+            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4});
+            this.Root.Size = new System.Drawing.Size(1408, 159);
+            this.Root.TextVisible = false;
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_checkBy;
+            this.layoutControlItem7.Location = new System.Drawing.Point(1041, 0);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem7.Size = new System.Drawing.Size(347, 34);
+            this.layoutControlItem7.Text = "瀹℃牳鑰�";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_checkDate;
+            this.layoutControlItem8.Location = new System.Drawing.Point(1041, 34);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem8.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem8.Text = "瀹℃牳鏃堕棿";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txt_createBy;
+            this.layoutControlItem5.Location = new System.Drawing.Point(694, 0);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem5.Size = new System.Drawing.Size(347, 34);
+            this.layoutControlItem5.Text = "寤虹珛鑰�";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_createDate;
+            this.layoutControlItem6.Location = new System.Drawing.Point(694, 34);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem6.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem6.Text = "寤虹珛鏃堕棿";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_Guid;
+            this.layoutControlItem13.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem13.CustomizationFormText = "Guid";
+            this.layoutControlItem13.Location = new System.Drawing.Point(347, 104);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem13.Size = new System.Drawing.Size(347, 35);
+            this.layoutControlItem13.Text = "Guid";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);
+            this.layoutControlItem13.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_Name;
+            this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem12.CustomizationFormText = "璁℃椂绫诲瀷";
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.Size = new System.Drawing.Size(347, 34);
+            this.layoutControlItem12.Text = "璁℃椂绫诲瀷";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // picCheckBox
+            // 
+            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+            this.picCheckBox.Location = new System.Drawing.Point(1285, 29);
+            this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
+            this.picCheckBox.Name = "picCheckBox";
+            this.picCheckBox.Size = new System.Drawing.Size(125, 61);
+            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.picCheckBox.TabIndex = 9;
+            this.picCheckBox.TabStop = false;
+            this.picCheckBox.Visible = false;
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_checkStatus;
+            this.layoutControlItem10.Location = new System.Drawing.Point(347, 0);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem10.Size = new System.Drawing.Size(347, 34);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem10.TextVisible = false;
+            // 
+            // Frm_MesJjgzTimeType
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1410, 834);
+            this.Controls.Add(this.picCheckBox);
+            this.Controls.Add(this.xtraTabControl1);
+            this.Controls.Add(this.toolBarMenu1);
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "Frm_MesJjgzTimeType";
+            this.Text = "璁℃椂宸ヨ祫";
+            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+            this.xtraTabControl1.ResumeLayout(false);
+            this.xtraTabPage1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+            this.split1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+            this.split1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            this.xtraTabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+            this.splitMx1.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+            this.splitMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+            this.layoutMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Name.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+        #endregion
+        private UserControl.UcToolBarMenu toolBarMenu1;
+        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+        private DevExpress.XtraEditors.SplitContainerControl split1;
+        private DevExpress.XtraGrid.GridControl gcMain1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+        private System.Windows.Forms.Label lbGuid;
+        private DevExpress.XtraEditors.TextEdit txt_createDate;
+        private DevExpress.XtraEditors.TextEdit txt_createBy;
+        private DevExpress.XtraLayout.LayoutControl layoutMx1;
+        private DevExpress.XtraLayout.LayoutControlGroup Root;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraEditors.TextEdit txt_checkBy;
+        private DevExpress.XtraEditors.TextEdit txt_checkDate;
+        private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private System.Windows.Forms.PictureBox picCheckBox;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraEditors.TextEdit txt_Name;
+        private DevExpress.XtraEditors.TextEdit txt_Guid;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.cs
new file mode 100644
index 0000000..f6b9ed0
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.cs
@@ -0,0 +1,360 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.JJGZ
+{
+    public partial class Frm_MesJjgzTimeType : DevExpress.XtraEditors.XtraForm
+    {
+        string _webServiceName = "MesJjgzTimeType/";
+        List<FilterEntity> _filterList = new List<FilterEntity>();
+
+        public Frm_MesJjgzTimeType()
+        {
+            InitializeComponent();
+            this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+            this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+            this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
+            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            this.toolBarMenu1.getXmlConfig();
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
+            {
+                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+            }, tips);
+
+
+        }
+        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+        {
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            await Task.Delay(100);
+            getPageList();
+        }
+
+        /// <summary>
+        /// 鏌ヨ鍥炶皟
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+        {
+            _filterList = e.FilterList;
+            getPageList();
+        }
+        /// <summary>
+        ///     瀹℃牳浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+        {
+            _toolCk(1);
+        }
+
+        /// <summary>
+        ///     鍙嶅鏍�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+        {
+            _toolCk(0);
+        }
+        /// <summary>
+        /// 鍙栨秷浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+        {
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+        }
+
+        /// <summary>
+        /// 鍒犻櫎浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
+        {
+            string rowGuid = "", rowName = "";
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "guid");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
+                return;
+            List<dynamic> lst = new List<dynamic>();
+            lst.Add(rowGuid);
+            var _obj = new
+            {
+                guid = rowGuid,
+                mxGuid = Guid.Empty.ToString(),
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    if (xtraTabControl1.SelectedTabPageIndex == 0)
+                    { }
+                    else
+                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+                    getPageList();
+                }
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 鍒锋柊浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+        {
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+                getModel(lbGuid.Text.Trim());
+            else
+            {
+                //_filterList.Clear();
+                //if (gridView1.ActiveFilter.Count > 0)
+                //{
+                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                //    gridView1.ActiveFilter.Clear();
+                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                //}
+                //getPageList(1);
+                getPageList();
+            }
+        }
+
+        /// <summary>
+        /// 鏂板浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
+        {
+            lbGuid.Text = "";
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
+            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
+            getPageList();
+        }
+        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+        {
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_Guid, gridView1);
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+
+                getModel(rowGuid);
+            getPageList();
+        }
+
+        /// <summary>
+        /// 淇濆瓨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.isSetBtn = false;
+            string name = txt_Name.Text.Trim();//璁℃椂绫诲瀷
+            if (string.IsNullOrWhiteSpace( txt_Name.Text))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璁℃椂绫诲瀷锛�");
+                txt_Name.Focus();
+                return;
+            }
+
+            try
+            {
+                var _obj = new
+                {
+                    guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+                    name = name,
+                };
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                if (_rtn.rtnCode > 0)
+                {
+                    lbGuid.Text = _rtn.rtnData.outGuid;
+                    toolBarMenu1.isSetBtn = true;
+                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
+                    toolBarMenu1.currentAction = "";
+                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+                }
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList()
+        {
+            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            try
+            {
+                var strReturn = UtilityHelper.HttpPost("",
+                    _webServiceName + "GetListPage", "");
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strReturn);
+                if (_rtn.rtnCode > 0)
+                {
+                    dynamic dy = _rtn.rtnData;
+                    JObject _job = JObject.Parse(strReturn);
+                    JArray array = new JArray();
+                    foreach (var a in _job["rtnData"]["list"])
+                    {
+                        array.Add(a);
+                    }
+                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+                    gcMain1.DataSource = dt;
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="strGuid">涓婚敭</param>
+        /// <param name="isEdit">鏄惁鍙紪杈�</param>
+        /// <param name="tabIdx">閫夐」鍗″簭鍙�</param>
+        private void getModel(string strGuid)
+        {
+            bool isEdit = false;
+            if (toolBarMenu1.currentAction == "add") return;
+            if (toolBarMenu1.currentAction == "edit") isEdit = true;
+            if (string.IsNullOrEmpty(strGuid))
+            {
+                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            var _obj = new
+            {
+                guid = strGuid,//涓诲缓
+            };
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    dynamic dy = _rtn.rtnData;
+                    lbGuid.Text = strGuid;
+                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
+
+                }
+                else
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+
+        /// <summary>
+        /// 宸ュ叿鏉′簨浠�
+        /// </summary>
+        /// <param name="inFieldValue"></param>
+        private void _toolCk(int _inFieldValue)
+        {
+            string strMsg = "";
+            switch (_inFieldValue)
+            {
+                case 1:
+                    strMsg = "瀹℃牳";
+                    break;
+                case 0:
+                    strMsg = "鍙嶅鏍�";
+                    break;
+            }
+            ;
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Name, gridView1, "guid");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+                return;
+            var _obj = new
+            {
+                guid = rowGuid,
+                ckValue = _inFieldValue,
+                parameter = "MES_JJGZ_TIMETYPE,check_Date,check_Status,check_user"
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
+                    if (xtraTabControl1.SelectedTabPageIndex == 1)
+                    {
+                        getModel(lbGuid.Text.Trim());
+                    }
+                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+                    gridView1.FocusedRowHandle = rowHandle;
+                    UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkBy", "checkDate", picCheckBox, this, _inFieldValue.ToString());
+                }
+                else
+                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+            }
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.resx b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.resx
new file mode 100644
index 0000000..5160e8b
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.resx
@@ -0,0 +1,123 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs
new file mode 100644
index 0000000..ed6e4b2
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.Designer.cs
@@ -0,0 +1,136 @@
+锘縩amespace Gs.DevApp.DevFrm.Rpt
+{
+    partial class KQCX
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.dateEdit1 = new DevExpress.XtraEditors.DateEdit();
+            this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
+            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+            this.textEdit1 = new DevExpress.XtraEditors.SearchLookUpEdit();
+            this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+            ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // dateEdit1
+            // 
+            this.dateEdit1.EditValue = null;
+            this.dateEdit1.Location = new System.Drawing.Point(209, 99);
+            this.dateEdit1.Margin = new System.Windows.Forms.Padding(2);
+            this.dateEdit1.Name = "dateEdit1";
+            this.dateEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.dateEdit1.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.dateEdit1.Size = new System.Drawing.Size(386, 28);
+            this.dateEdit1.TabIndex = 1;
+            // 
+            // simpleButton1
+            // 
+            this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x161;
+            this.simpleButton1.Location = new System.Drawing.Point(247, 172);
+            this.simpleButton1.Margin = new System.Windows.Forms.Padding(2);
+            this.simpleButton1.Name = "simpleButton1";
+            this.simpleButton1.Size = new System.Drawing.Size(138, 44);
+            this.simpleButton1.TabIndex = 3;
+            this.simpleButton1.Text = "鏌ヨ";
+            this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
+            // 
+            // labelControl1
+            // 
+            this.labelControl1.Location = new System.Drawing.Point(65, 45);
+            this.labelControl1.Margin = new System.Windows.Forms.Padding(2);
+            this.labelControl1.Name = "labelControl1";
+            this.labelControl1.Size = new System.Drawing.Size(78, 22);
+            this.labelControl1.TabIndex = 4;
+            this.labelControl1.Text = "閫夋嫨浜х嚎:";
+            // 
+            // labelControl2
+            // 
+            this.labelControl2.Location = new System.Drawing.Point(65, 105);
+            this.labelControl2.Margin = new System.Windows.Forms.Padding(2);
+            this.labelControl2.Name = "labelControl2";
+            this.labelControl2.Size = new System.Drawing.Size(54, 22);
+            this.labelControl2.TabIndex = 5;
+            this.labelControl2.Text = "鏃ユ湡锛�";
+            // 
+            // textEdit1
+            // 
+            this.textEdit1.Location = new System.Drawing.Point(209, 45);
+            this.textEdit1.Name = "textEdit1";
+            this.textEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.textEdit1.Properties.NullText = "";
+            this.textEdit1.Properties.PopupView = this.searchLookUpEdit1View;
+            this.textEdit1.Size = new System.Drawing.Size(386, 28);
+            this.textEdit1.TabIndex = 6;
+            // 
+            // searchLookUpEdit1View
+            // 
+            this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
+            this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+            this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+            // 
+            // KQCX
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(646, 248);
+            this.Controls.Add(this.labelControl2);
+            this.Controls.Add(this.labelControl1);
+            this.Controls.Add(this.simpleButton1);
+            this.Controls.Add(this.dateEdit1);
+            this.Controls.Add(this.textEdit1);
+            this.Margin = new System.Windows.Forms.Padding(2);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "KQCX";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "娆犳枡琛ㄦ煡璇�";
+            ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dateEdit1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private DevExpress.XtraEditors.DateEdit dateEdit1;
+        private DevExpress.XtraEditors.SimpleButton simpleButton1;
+        private DevExpress.XtraEditors.LabelControl labelControl1;
+        private DevExpress.XtraEditors.LabelControl labelControl2;
+        private DevExpress.XtraEditors.SearchLookUpEdit textEdit1;
+        private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.cs
new file mode 100644
index 0000000..b1c11b6
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.cs
@@ -0,0 +1,85 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.Rpt
+{
+    public partial class KQCX : DevExpress.XtraEditors.XtraForm
+    {
+        string _webServiceName = "MesAttanCon/";
+        public KQCX()
+        {
+            InitializeComponent();
+            GetWORKSHOPLINE();
+        }
+
+        public KQCX(string lineNo,string date)
+        {
+            InitializeComponent();
+            GetWORKSHOPLINE();
+            textEdit1.EditValue = lineNo;
+            dateEdit1.EditValue = date;
+        }
+
+        /// <summary>
+        ///     閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+        /// </summary>
+        public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+        private void simpleButton1_Click(object sender, EventArgs e)
+        {
+            var list = new List<string>();
+            
+            list.Add(textEdit1.EditValue?.ToString() ?? "");
+            list.Add(dateEdit1.EditValue?.ToString() ?? "");
+            
+            UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = list }); Close();
+        }
+
+        /// <summary>
+        /// 鑾峰彇涓嬫媺妗嗘暟鎹�
+        /// </summary>
+        private void GetWORKSHOPLINE()
+        {
+            try
+            {
+                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetWORKSHOPLINE", "");
+                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                if (_rtn.rtnCode > 0)
+                {
+                    dynamic dy = _rtn.rtnData;
+                    JObject _job = JObject.Parse(strJson);
+                    JArray array = new JArray();
+                    foreach (var a in _job["rtnData"]["list"])
+                    {
+                        array.Add(a);
+                    }
+                    DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+
+                    this.textEdit1.Properties.ValueMember = "浜х嚎";
+                    this.textEdit1.Properties.DisplayMember = "浜х嚎";
+                    this.textEdit1.Properties.DataSource = dt;
+                }
+                else
+                {
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.resx b/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/KQCX.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs
new file mode 100644
index 0000000..1d1bd31
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.Designer.cs
@@ -0,0 +1,170 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+    partial class SelectSTAFF
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.gcMain = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+            this.panelControl1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // gcMain
+            // 
+            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain.Location = new System.Drawing.Point(0, 0);
+            this.gcMain.MainView = this.gridView1;
+            this.gcMain.Margin = new System.Windows.Forms.Padding(4);
+            this.gcMain.Name = "gcMain";
+            this.gcMain.Size = new System.Drawing.Size(1292, 662);
+            this.gcMain.TabIndex = 6;
+            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.ColumnPanelRowHeight = 61;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.colChkInt,
+            this.gridColumn1,
+            this.gridColumn2,
+            this.gridColumn3});
+            this.gridView1.DetailHeight = 428;
+            this.gridView1.GridControl = this.gcMain;
+            this.gridView1.IndicatorWidth = 62;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // colChkInt
+            // 
+            this.colChkInt.Caption = ".";
+            this.colChkInt.FieldName = "chkInt";
+            this.colChkInt.MinWidth = 31;
+            this.colChkInt.Name = "colChkInt";
+            this.colChkInt.Visible = true;
+            this.colChkInt.VisibleIndex = 0;
+            this.colChkInt.Width = 117;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "鍛樺伐Id";
+            this.gridColumn1.FieldName = "id";
+            this.gridColumn1.MinWidth = 30;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 1;
+            this.gridColumn1.Width = 94;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "鍛樺伐缂栧彿";
+            this.gridColumn2.FieldName = "staffNo";
+            this.gridColumn2.MinWidth = 30;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 2;
+            this.gridColumn2.Width = 94;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "鍛樺伐鍚嶇О";
+            this.gridColumn3.FieldName = "staffName";
+            this.gridColumn3.MinWidth = 30;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 3;
+            this.gridColumn3.Width = 94;
+            // 
+            // panelControl1
+            // 
+            this.panelControl1.Controls.Add(this.btnIn);
+            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panelControl1.Location = new System.Drawing.Point(0, 662);
+            this.panelControl1.Margin = new System.Windows.Forms.Padding(4);
+            this.panelControl1.Name = "panelControl1";
+            this.panelControl1.Size = new System.Drawing.Size(1292, 53);
+            this.panelControl1.TabIndex = 9;
+            // 
+            // btnIn
+            // 
+            this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
+            this.btnIn.Appearance.Options.UseBackColor = true;
+            this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
+            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
+            this.btnIn.Location = new System.Drawing.Point(1172, 2);
+            this.btnIn.Margin = new System.Windows.Forms.Padding(4);
+            this.btnIn.Name = "btnIn";
+            this.btnIn.Size = new System.Drawing.Size(118, 49);
+            this.btnIn.TabIndex = 4;
+            this.btnIn.Text = "纭畾瀵煎叆";
+            // 
+            // SelectSTAFF
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1292, 715);
+            this.Controls.Add(this.gcMain);
+            this.Controls.Add(this.panelControl1);
+            this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+            this.Margin = new System.Windows.Forms.Padding(4);
+            this.Name = "SelectSTAFF";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "鐢熶骇閫�鏂欑敵璇凤紝鍙樉绀哄彲閫�鏁伴噺澶т簬0鐨�";
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+            this.panelControl1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+        private DevExpress.XtraGrid.GridControl gcMain;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraEditors.PanelControl panelControl1;
+        private DevExpress.XtraEditors.SimpleButton btnIn;
+        private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.cs
new file mode 100644
index 0000000..6eb5909
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.cs
@@ -0,0 +1,89 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.UserControl
+{
+    public partial class SelectSTAFF : DevExpress.XtraEditors.XtraForm
+    {
+        private readonly string _webServiceName = "MesJjgzErrorJs/";
+        private string daaGuid = "";
+        public SelectSTAFF()
+        {
+            InitializeComponent();
+            this.gridView1.CustomDrawColumnHeader += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomDrawColumnHeader(s, e); };
+            this.gridView1.MouseUp += (s, e) => { Gs.DevApp.ToolBox.UtilityHelper.CustomMouseUp(s, e, gcMain, gridView1); };
+            this.colChkInt.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.colChkInt.OptionsFilter.AllowAutoFilter = false;
+            this.colChkInt.OptionsFilter.AllowFilter = false;
+            this.colChkInt.OptionsFilter.AllowInHeaderSearch = DevExpress.Utils.DefaultBoolean.False;
+            this.colChkInt.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+            this.colChkInt.VisibleIndex = 0;
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
+            getPageList(1);
+            btnIn.Click += (s, e) =>
+            {
+                gridView1.PostEditor();
+                gridView1.UpdateCurrentRow();
+                var list = new List<string>();
+                DataTable dt = this.gcMain.DataSource as DataTable;
+                {
+                    foreach (DataRow dr in dt.Rows)
+                    {
+                        string checkBox = dr["chkInt"].ToString();
+                        string _guid = dr["id"].ToString();
+                        if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
+                        {
+                            list.Add(_guid);
+                        }
+                    }
+                }
+                UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = list }); Close();
+
+            };
+        }
+
+        /// <summary>
+        ///     閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+        /// </summary>
+        public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+
+
+        /// <summary>
+        /// </summary>
+        /// <param name="curPage">绗嚑椤�</param>
+        /// <param name="pageSize">姣忛〉鍑犳潯</param>
+        private void getPageList(int curPage)
+        {
+            var _obj = new
+            {
+                currentPage = curPage,
+                everyPageSize = 999999,
+                sortName = "",
+                keyWhere = "",
+                daaGuid = daaGuid
+            };
+            var json = JsonConvert.SerializeObject(_obj);
+            try
+            {
+                var strReturn = UtilityHelper.HttpPost("",
+                    _webServiceName + "SelectPba", json);
+                var dd = UtilityHelper.ReturnToTablePage(strReturn);
+                var dt = dd.rtnData.list;
+                gcMain.BindingContext = new BindingContext();
+                gcMain.DataSource = dt;
+                gcMain.ForceInitialize();
+                gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.resx b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/SelectSTAFF.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs
new file mode 100644
index 0000000..bfc9d6e
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.Designer.cs
@@ -0,0 +1,89 @@
+锘縩amespace Gs.DevApp.DevFrm.Rpt
+{
+    partial class SetLB
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
+            this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
+            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // simpleButton1
+            // 
+            this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x161;
+            this.simpleButton1.Location = new System.Drawing.Point(224, 140);
+            this.simpleButton1.Margin = new System.Windows.Forms.Padding(2);
+            this.simpleButton1.Name = "simpleButton1";
+            this.simpleButton1.Size = new System.Drawing.Size(138, 44);
+            this.simpleButton1.TabIndex = 3;
+            this.simpleButton1.Text = "鏌ヨ";
+            this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
+            // 
+            // labelControl1
+            // 
+            this.labelControl1.Location = new System.Drawing.Point(65, 45);
+            this.labelControl1.Margin = new System.Windows.Forms.Padding(2);
+            this.labelControl1.Name = "labelControl1";
+            this.labelControl1.Size = new System.Drawing.Size(78, 22);
+            this.labelControl1.TabIndex = 4;
+            this.labelControl1.Text = "杩炵彮鏃堕棿:";
+            // 
+            // textEdit1
+            // 
+            this.textEdit1.Location = new System.Drawing.Point(209, 45);
+            this.textEdit1.Name = "textEdit1";
+            this.textEdit1.Size = new System.Drawing.Size(386, 28);
+            this.textEdit1.TabIndex = 6;
+            // 
+            // WorkTime
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(646, 248);
+            this.Controls.Add(this.labelControl1);
+            this.Controls.Add(this.simpleButton1);
+            this.Controls.Add(this.textEdit1);
+            this.Margin = new System.Windows.Forms.Padding(2);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "WorkTime";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "娆犳枡琛ㄦ煡璇�";
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private DevExpress.XtraEditors.SimpleButton simpleButton1;
+        private DevExpress.XtraEditors.LabelControl labelControl1;
+        private DevExpress.XtraEditors.TextEdit textEdit1;
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.cs
new file mode 100644
index 0000000..aa12d3a
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.cs
@@ -0,0 +1,40 @@
+锘縰sing DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.Rpt
+{
+    public partial class SetLB : DevExpress.XtraEditors.XtraForm
+    {
+        string _webServiceName = "MesAttanCon/";
+        public SetLB()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        ///     閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+        /// </summary>
+        public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+        private void simpleButton1_Click(object sender, EventArgs e)
+        {
+            var list = new List<string>();
+            
+            list.Add(textEdit1.EditValue?.ToString() ?? "");
+            
+            UpdateParent?.Invoke(this, new UpdateParentEventArgs { StringList = list }); Close();
+        }
+    }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.resx b/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/SetLB.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index dbd6769..ac3e49c 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -410,6 +410,54 @@
     <Compile Include="DevFrm\IPQC\Frm_XunJianDetect01.Designer.cs">
       <DependentUpon>Frm_XunJianDetect01.cs</DependentUpon>
     </Compile>
+    <Compile Include="DevFrm\JJGZ\Frm_MesAttanCon.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\JJGZ\Frm_MesAttanCon.Designer.cs">
+      <DependentUpon>Frm_MesAttanCon.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\JJGZ\Frm_MESJJERRORJS.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\JJGZ\Frm_MESJJERRORJS.Designer.cs">
+      <DependentUpon>Frm_MESJJERRORJS.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\JJGZ\Frm_MesJJSalary.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\JJGZ\Frm_MesJJSalary.Designer.cs">
+      <DependentUpon>Frm_MesJJSalary.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\JJGZ\Frm_MesJSSalary.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\JJGZ\Frm_MesJSSalary.Designer.cs">
+      <DependentUpon>Frm_MesJSSalary.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\JJGZ\Frm_MesTimeType.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\JJGZ\Frm_MesTimeType.Designer.cs">
+      <DependentUpon>Frm_MesTimeType.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\JJGZ\KQCX.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\JJGZ\KQCX.Designer.cs">
+      <DependentUpon>KQCX.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\JJGZ\SelectSTAFF.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\JJGZ\SelectSTAFF.Designer.cs">
+      <DependentUpon>SelectSTAFF.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\JJGZ\SetLB.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\JJGZ\SetLB.Designer.cs">
+      <DependentUpon>SetLB.cs</DependentUpon>
+    </Compile>
     <Compile Include="DevFrm\PDA\Frm_AreaBind.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1564,6 +1612,30 @@
     <EmbeddedResource Include="DevFrm\IPQC\Frm_XunJianDetect01Show.resx">
       <DependentUpon>Frm_XunJianDetect01Show.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesAttanCon.resx">
+      <DependentUpon>Frm_MesAttanCon.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\JJGZ\Frm_MESJJERRORJS.resx">
+      <DependentUpon>Frm_MESJJERRORJS.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesJJSalary.resx">
+      <DependentUpon>Frm_MesJJSalary.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesJSSalary.resx">
+      <DependentUpon>Frm_MesJSSalary.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\JJGZ\Frm_MesTimeType.resx">
+      <DependentUpon>Frm_MesTimeType.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\JJGZ\KQCX.resx">
+      <DependentUpon>KQCX.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\JJGZ\SelectSTAFF.resx">
+      <DependentUpon>SelectSTAFF.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="DevFrm\JJGZ\SetLB.resx">
+      <DependentUpon>SetLB.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\PDA\Frm_AreaBind.resx">
       <DependentUpon>Frm_AreaBind.cs</DependentUpon>
     </EmbeddedResource>

--
Gitblit v1.9.3