From 122819b5dd643d82a730e549f99bd56fe90eed21 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 28 十一月 2024 12:30:25 +0800
Subject: [PATCH] 车间

---
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs |  866 +++++++++++++++++++++++++++------------------------------
 1 files changed, 407 insertions(+), 459 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
index a0051f6..e8c281f 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
@@ -47,69 +47,64 @@
             this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.lb_checkStatus = new DevExpress.XtraEditors.LabelControl();
-            this.gv_checkStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_checkBy = new DevExpress.XtraEditors.LabelControl();
-            this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
-            this.gv_checkBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_checkDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
-            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_isStatus = new DevExpress.XtraEditors.LabelControl();
-            this.gv_isStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_createDate = new DevExpress.XtraEditors.LabelControl();
-            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
-            this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
-            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
-            this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_remark = new DevExpress.XtraEditors.LabelControl();
-            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
-            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_name = new DevExpress.XtraEditors.LabelControl();
-            this.txt_name = new DevExpress.XtraEditors.TextEdit();
-            this.gv_name = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_workshopNo = new DevExpress.XtraEditors.LabelControl();
-            this.txt_workshopNo = new DevExpress.XtraEditors.TextEdit();
-            this.gv_workshopNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
-            this.gcMain = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMain = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_departmentid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_departmentcode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_departmentname = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_depextr4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_fmanager = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_parentId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.panel1 = new System.Windows.Forms.Panel();
             this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
-            this.txt_isStatus = new System.Windows.Forms.CheckBox();
+            this.lb_checkStatus = new DevExpress.XtraEditors.LabelControl();
+            this.lb_checkBy = new DevExpress.XtraEditors.LabelControl();
+            this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
+            this.lb_checkDate = new DevExpress.XtraEditors.LabelControl();
+            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
+            this.lb_remark = new DevExpress.XtraEditors.LabelControl();
+            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
+            this.lb_departmentname = new DevExpress.XtraEditors.LabelControl();
+            this.txt_departmentname = new DevExpress.XtraEditors.TextEdit();
+            this.lb_departmentcode = new DevExpress.XtraEditors.LabelControl();
+            this.txt_departmentcode = new DevExpress.XtraEditors.TextEdit();
+            this.lb_departmentid = new DevExpress.XtraEditors.LabelControl();
+            this.txt_departmentid = new DevExpress.XtraEditors.TextEdit();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_workshopNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             this.xtraTabPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_departmentname.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_departmentcode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_departmentid.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.SuspendLayout();
             // 
@@ -196,7 +191,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1279, 424);
+            this.tabMxPage1.Size = new System.Drawing.Size(1279, 450);
             this.tabMxPage1.Text = "浜х嚎鍒楄〃";
             // 
             // gcMx1
@@ -208,7 +203,7 @@
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit1,
             this.repositoryItemCheckEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1279, 424);
+            this.gcMx1.Size = new System.Drawing.Size(1279, 450);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -269,293 +264,9 @@
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
-            // lb_checkStatus
-            // 
-            this.lb_checkStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_checkStatus.Appearance.Options.UseFont = true;
-            this.lb_checkStatus.Location = new System.Drawing.Point(979, 53);
-            this.lb_checkStatus.Name = "lb_checkStatus";
-            this.lb_checkStatus.Size = new System.Drawing.Size(68, 21);
-            this.lb_checkStatus.TabIndex = 243;
-            this.lb_checkStatus.Text = "瀹℃牳鐘舵��";
-            // 
-            // gv_checkStatus
-            // 
-            this.gv_checkStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_checkStatus.AppearanceCell.Options.UseFont = true;
-            this.gv_checkStatus.Caption = "瀹℃牳";
-            this.gv_checkStatus.FieldName = "checkStatus";
-            this.gv_checkStatus.MinWidth = 50;
-            this.gv_checkStatus.Name = "gv_checkStatus";
-            this.gv_checkStatus.OptionsColumn.AllowEdit = false;
-            this.gv_checkStatus.Tag = "query_a.check_status";
-            this.gv_checkStatus.Visible = true;
-            this.gv_checkStatus.VisibleIndex = 8;
-            this.gv_checkStatus.Width = 94;
-            // 
-            // lb_checkBy
-            // 
-            this.lb_checkBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_checkBy.Appearance.Options.UseFont = true;
-            this.lb_checkBy.Location = new System.Drawing.Point(754, 18);
-            this.lb_checkBy.Name = "lb_checkBy";
-            this.lb_checkBy.Size = new System.Drawing.Size(51, 21);
-            this.lb_checkBy.TabIndex = 240;
-            this.lb_checkBy.Text = "瀹℃牳浜�";
-            // 
-            // txt_checkBy
-            // 
-            this.txt_checkBy.Enabled = false;
-            this.txt_checkBy.Location = new System.Drawing.Point(823, 14);
-            this.txt_checkBy.Name = "txt_checkBy";
-            this.txt_checkBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_checkBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkBy.Size = new System.Drawing.Size(150, 28);
-            this.txt_checkBy.TabIndex = 240;
-            // 
-            // gv_checkBy
-            // 
-            this.gv_checkBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_checkBy.AppearanceCell.Options.UseFont = true;
-            this.gv_checkBy.Caption = "瀹℃牳浜�";
-            this.gv_checkBy.FieldName = "checkBy";
-            this.gv_checkBy.MinWidth = 50;
-            this.gv_checkBy.Name = "gv_checkBy";
-            this.gv_checkBy.OptionsColumn.AllowEdit = false;
-            this.gv_checkBy.Tag = "query_a.check_by";
-            this.gv_checkBy.Visible = true;
-            this.gv_checkBy.VisibleIndex = 10;
-            this.gv_checkBy.Width = 94;
-            // 
-            // lb_checkDate
-            // 
-            this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_checkDate.Appearance.Options.UseFont = true;
-            this.lb_checkDate.Location = new System.Drawing.Point(737, 53);
-            this.lb_checkDate.Name = "lb_checkDate";
-            this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
-            this.lb_checkDate.TabIndex = 235;
-            this.lb_checkDate.Text = "瀹℃牳鏃堕棿";
-            // 
-            // txt_checkDate
-            // 
-            this.txt_checkDate.Enabled = false;
-            this.txt_checkDate.Location = new System.Drawing.Point(823, 49);
-            this.txt_checkDate.Name = "txt_checkDate";
-            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_checkDate.TabIndex = 235;
-            // 
-            // gv_checkDate
-            // 
-            this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_checkDate.AppearanceCell.Options.UseFont = true;
-            this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
-            this.gv_checkDate.FieldName = "checkDate";
-            this.gv_checkDate.MinWidth = 50;
-            this.gv_checkDate.Name = "gv_checkDate";
-            this.gv_checkDate.OptionsColumn.AllowEdit = false;
-            this.gv_checkDate.Tag = "query_a.check_date";
-            this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 9;
-            this.gv_checkDate.Width = 94;
-            // 
-            // lb_isStatus
-            // 
-            this.lb_isStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_isStatus.Appearance.Options.UseFont = true;
-            this.lb_isStatus.Location = new System.Drawing.Point(3, 53);
-            this.lb_isStatus.Name = "lb_isStatus";
-            this.lb_isStatus.Size = new System.Drawing.Size(73, 21);
-            this.lb_isStatus.TabIndex = 231;
-            this.lb_isStatus.Text = "杞﹂棿鐘舵�� ";
-            // 
-            // gv_isStatus
-            // 
-            this.gv_isStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_isStatus.AppearanceCell.Options.UseFont = true;
-            this.gv_isStatus.Caption = "鐘舵��";
-            this.gv_isStatus.FieldName = "isStatus";
-            this.gv_isStatus.MinWidth = 50;
-            this.gv_isStatus.Name = "gv_isStatus";
-            this.gv_isStatus.OptionsColumn.AllowEdit = false;
-            this.gv_isStatus.Tag = "query_a.is_status";
-            this.gv_isStatus.UnboundDataType = typeof(bool);
-            this.gv_isStatus.Visible = true;
-            this.gv_isStatus.VisibleIndex = 7;
-            this.gv_isStatus.Width = 94;
-            // 
-            // lb_createDate
-            // 
-            this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_createDate.Appearance.Options.UseFont = true;
-            this.lb_createDate.Location = new System.Drawing.Point(500, 53);
-            this.lb_createDate.Name = "lb_createDate";
-            this.lb_createDate.Size = new System.Drawing.Size(73, 21);
-            this.lb_createDate.TabIndex = 222;
-            this.lb_createDate.Text = "寤虹珛鏃堕棿 ";
-            // 
-            // txt_createDate
-            // 
-            this.txt_createDate.Enabled = false;
-            this.txt_createDate.Location = new System.Drawing.Point(580, 49);
-            this.txt_createDate.Name = "txt_createDate";
-            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_createDate.TabIndex = 222;
-            // 
-            // gv_createDate
-            // 
-            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_createDate.AppearanceCell.Options.UseFont = true;
-            this.gv_createDate.Caption = "寤虹珛鏃堕棿";
-            this.gv_createDate.FieldName = "createDate";
-            this.gv_createDate.MinWidth = 50;
-            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 = 6;
-            this.gv_createDate.Width = 94;
-            // 
-            // lb_createBy
-            // 
-            this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_createBy.Appearance.Options.UseFont = true;
-            this.lb_createBy.Location = new System.Drawing.Point(517, 19);
-            this.lb_createBy.Name = "lb_createBy";
-            this.lb_createBy.Size = new System.Drawing.Size(56, 21);
-            this.lb_createBy.TabIndex = 219;
-            this.lb_createBy.Text = "寤虹珛鑰� ";
-            // 
-            // txt_createBy
-            // 
-            this.txt_createBy.Enabled = false;
-            this.txt_createBy.Location = new System.Drawing.Point(579, 15);
-            this.txt_createBy.Name = "txt_createBy";
-            this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(150, 28);
-            this.txt_createBy.TabIndex = 219;
-            // 
-            // gv_createBy
-            // 
-            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_createBy.AppearanceCell.Options.UseFont = true;
-            this.gv_createBy.Caption = "寤虹珛鑰�";
-            this.gv_createBy.FieldName = "createBy";
-            this.gv_createBy.MinWidth = 50;
-            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 = 5;
-            this.gv_createBy.Width = 94;
-            // 
-            // lb_remark
-            // 
-            this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_remark.Appearance.Options.UseFont = true;
-            this.lb_remark.Location = new System.Drawing.Point(285, 53);
-            this.lb_remark.Name = "lb_remark";
-            this.lb_remark.Size = new System.Drawing.Size(39, 21);
-            this.lb_remark.TabIndex = 217;
-            this.lb_remark.Text = "澶囨敞 ";
-            // 
-            // txt_remark
-            // 
-            this.txt_remark.Location = new System.Drawing.Point(330, 49);
-            this.txt_remark.Name = "txt_remark";
-            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(150, 28);
-            this.txt_remark.TabIndex = 217;
-            // 
-            // gv_remark
-            // 
-            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_remark.AppearanceCell.Options.UseFont = true;
-            this.gv_remark.Caption = "澶囨敞";
-            this.gv_remark.FieldName = "remark";
-            this.gv_remark.MinWidth = 50;
-            this.gv_remark.Name = "gv_remark";
-            this.gv_remark.OptionsColumn.AllowEdit = false;
-            this.gv_remark.Tag = "query_a.remark";
-            this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 4;
-            this.gv_remark.Width = 94;
-            // 
-            // lb_name
-            // 
-            this.lb_name.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_name.Appearance.Options.UseFont = true;
-            this.lb_name.Location = new System.Drawing.Point(251, 20);
-            this.lb_name.Name = "lb_name";
-            this.lb_name.Size = new System.Drawing.Size(73, 21);
-            this.lb_name.TabIndex = 216;
-            this.lb_name.Text = "杞﹂棿鍚嶇О ";
-            // 
-            // txt_name
-            // 
-            this.txt_name.Location = new System.Drawing.Point(330, 16);
-            this.txt_name.Name = "txt_name";
-            this.txt_name.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_name.Properties.Appearance.Options.UseFont = true;
-            this.txt_name.Size = new System.Drawing.Size(150, 28);
-            this.txt_name.TabIndex = 216;
-            // 
-            // gv_name
-            // 
-            this.gv_name.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_name.AppearanceCell.Options.UseFont = true;
-            this.gv_name.Caption = "杞﹂棿鍚嶇О";
-            this.gv_name.FieldName = "name";
-            this.gv_name.MinWidth = 50;
-            this.gv_name.Name = "gv_name";
-            this.gv_name.OptionsColumn.AllowEdit = false;
-            this.gv_name.Tag = "query_a.name";
-            this.gv_name.Visible = true;
-            this.gv_name.VisibleIndex = 3;
-            this.gv_name.Width = 94;
-            // 
-            // lb_workshopNo
-            // 
-            this.lb_workshopNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_workshopNo.Appearance.Options.UseFont = true;
-            this.lb_workshopNo.Location = new System.Drawing.Point(3, 20);
-            this.lb_workshopNo.Name = "lb_workshopNo";
-            this.lb_workshopNo.Size = new System.Drawing.Size(73, 21);
-            this.lb_workshopNo.TabIndex = 211;
-            this.lb_workshopNo.Text = "杞﹂棿缂栧彿 ";
-            // 
-            // txt_workshopNo
-            // 
-            this.txt_workshopNo.Location = new System.Drawing.Point(80, 16);
-            this.txt_workshopNo.Name = "txt_workshopNo";
-            this.txt_workshopNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_workshopNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_workshopNo.Size = new System.Drawing.Size(150, 28);
-            this.txt_workshopNo.TabIndex = 211;
-            // 
-            // gv_workshopNo
-            // 
-            this.gv_workshopNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_workshopNo.AppearanceCell.Options.UseFont = true;
-            this.gv_workshopNo.Caption = "杞﹂棿缂栧彿";
-            this.gv_workshopNo.FieldName = "workshopNo";
-            this.gv_workshopNo.MinWidth = 50;
-            this.gv_workshopNo.Name = "gv_workshopNo";
-            this.gv_workshopNo.OptionsColumn.AllowEdit = false;
-            this.gv_workshopNo.Tag = "query_a.workshop_no";
-            this.gv_workshopNo.Visible = true;
-            this.gv_workshopNo.VisibleIndex = 2;
-            this.gv_workshopNo.Width = 94;
-            // 
             // toolBarMenu1
             // 
-            this.toolBarMenu1.chkParameter = "MES_WORKSHOP,check_date,check_status,check_by";
+            this.toolBarMenu1.chkParameter = "SYS_DEPARTMENT,check_date,check_status,check_by";
             this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
@@ -566,41 +277,6 @@
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = "xlsOut_workline{}";
-            // 
-            // gcMain
-            // 
-            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gcMain.Location = new System.Drawing.Point(0, 0);
-            this.gcMain.MainView = this.gridView1;
-            this.gcMain.Name = "gcMain";
-            this.gcMain.Size = new System.Drawing.Size(1281, 531);
-            this.gcMain.TabIndex = 1;
-            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gridView1});
-            // 
-            // gridView1
-            // 
-            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gridView1.Appearance.Row.Options.UseFont = true;
-            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn1,
-            this.gridColumn2,
-            this.gv_workshopNo,
-            this.gv_name,
-            this.gv_remark,
-            this.gv_createBy,
-            this.gv_createDate,
-            this.gv_isStatus,
-            this.gv_checkStatus,
-            this.gv_checkDate,
-            this.gv_checkBy});
-            this.gridView1.GridControl = this.gcMain;
-            this.gridView1.IndicatorWidth = 50;
-            this.gridView1.Name = "gridView1";
-            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
-            this.gridView1.OptionsView.ShowAutoFilterRow = true;
-            this.gridView1.OptionsView.ShowGroupPanel = false;
             // 
             // xtraTabControl1
             // 
@@ -621,6 +297,196 @@
             this.xtraTabPage1.Name = "xtraTabPage1";
             this.xtraTabPage1.Size = new System.Drawing.Size(1281, 570);
             this.xtraTabPage1.Text = "鏁版嵁鏌ヨ";
+            // 
+            // gcMain
+            // 
+            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gcMain.Location = new System.Drawing.Point(0, 0);
+            this.gcMain.MainView = this.gridView1;
+            this.gcMain.Name = "gcMain";
+            this.gcMain.Size = new System.Drawing.Size(1281, 531);
+            this.gcMain.TabIndex = 4;
+            this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gv_factory,
+            this.gv_departmentid,
+            this.gv_departmentcode,
+            this.gv_departmentname,
+            this.gridColumn3,
+            this.gridColumn2,
+            this.gridColumn1,
+            this.gv_depextr4,
+            this.gv_fmanager,
+            this.gv_remark,
+            this.gv_parentId});
+            this.gridView1.GridControl = this.gcMain;
+            this.gridView1.IndicatorWidth = 50;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsCustomization.AllowFilter = false;
+            this.gridView1.OptionsFilter.AllowAutoFilterConditionChange = DevExpress.Utils.DefaultBoolean.False;
+            this.gridView1.OptionsFilter.AllowFilterEditor = false;
+            this.gridView1.OptionsFilter.ShowCustomFunctions = DevExpress.Utils.DefaultBoolean.False;
+            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.gridView1.OptionsView.ShowAutoFilterRow = true;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gv_factory
+            // 
+            this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_factory.AppearanceCell.Options.UseFont = true;
+            this.gv_factory.Caption = "浣跨敤缁勭粐";
+            this.gv_factory.FieldName = "fSubsidiary";
+            this.gv_factory.MinWidth = 250;
+            this.gv_factory.Name = "gv_factory";
+            this.gv_factory.OptionsColumn.AllowEdit = false;
+            this.gv_factory.OptionsFilter.AllowFilterModeChanging = DevExpress.Utils.DefaultBoolean.False;
+            this.gv_factory.OptionsFilter.ImmediateUpdateAutoFilter = false;
+            this.gv_factory.Tag = "org.fnamber";
+            this.gv_factory.Visible = true;
+            this.gv_factory.VisibleIndex = 0;
+            this.gv_factory.Width = 250;
+            // 
+            // gv_departmentid
+            // 
+            this.gv_departmentid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_departmentid.AppearanceCell.Options.UseFont = true;
+            this.gv_departmentid.Caption = "閮ㄩ棬ID";
+            this.gv_departmentid.FieldName = "departmentid";
+            this.gv_departmentid.MinWidth = 50;
+            this.gv_departmentid.Name = "gv_departmentid";
+            this.gv_departmentid.OptionsColumn.AllowEdit = false;
+            this.gv_departmentid.OptionsFilter.ImmediateUpdateAutoFilter = false;
+            this.gv_departmentid.Tag = "query_a.departmentid";
+            this.gv_departmentid.Visible = true;
+            this.gv_departmentid.VisibleIndex = 1;
+            this.gv_departmentid.Width = 94;
+            // 
+            // gv_departmentcode
+            // 
+            this.gv_departmentcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_departmentcode.AppearanceCell.Options.UseFont = true;
+            this.gv_departmentcode.Caption = "閮ㄩ棬缂栧彿";
+            this.gv_departmentcode.FieldName = "departmentcode";
+            this.gv_departmentcode.MinWidth = 80;
+            this.gv_departmentcode.Name = "gv_departmentcode";
+            this.gv_departmentcode.OptionsColumn.AllowEdit = false;
+            this.gv_departmentcode.OptionsFilter.ImmediateUpdateAutoFilter = false;
+            this.gv_departmentcode.Tag = "query_a.departmentcode";
+            this.gv_departmentcode.Visible = true;
+            this.gv_departmentcode.VisibleIndex = 2;
+            this.gv_departmentcode.Width = 94;
+            // 
+            // gv_departmentname
+            // 
+            this.gv_departmentname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_departmentname.AppearanceCell.Options.UseFont = true;
+            this.gv_departmentname.Caption = "閮ㄩ棬鍚嶇О";
+            this.gv_departmentname.FieldName = "departmentname";
+            this.gv_departmentname.MinWidth = 150;
+            this.gv_departmentname.Name = "gv_departmentname";
+            this.gv_departmentname.OptionsColumn.AllowEdit = false;
+            this.gv_departmentname.OptionsFilter.ImmediateUpdateAutoFilter = false;
+            this.gv_departmentname.Tag = "query_a.departmentname";
+            this.gv_departmentname.Visible = true;
+            this.gv_departmentname.VisibleIndex = 3;
+            this.gv_departmentname.Width = 150;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "瀹℃牳鐘舵��";
+            this.gridColumn3.FieldName = "checkStatus";
+            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 4;
+            this.gridColumn3.Width = 94;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "瀹℃牳浜�";
+            this.gridColumn2.FieldName = "checkBy";
+            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 5;
+            this.gridColumn2.Width = 94;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "瀹℃牳鏃ユ湡";
+            this.gridColumn1.FieldName = "checkDate";
+            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 6;
+            this.gridColumn1.Width = 94;
+            // 
+            // gv_depextr4
+            // 
+            this.gv_depextr4.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_depextr4.AppearanceCell.Options.UseFont = true;
+            this.gv_depextr4.Caption = "A鍚敤B绂佺敤";
+            this.gv_depextr4.FieldName = "depextr4";
+            this.gv_depextr4.MinWidth = 50;
+            this.gv_depextr4.Name = "gv_depextr4";
+            this.gv_depextr4.OptionsColumn.AllowEdit = false;
+            this.gv_depextr4.OptionsFilter.ImmediateUpdateAutoFilter = false;
+            this.gv_depextr4.Tag = "query_a.depextr4";
+            this.gv_depextr4.Visible = true;
+            this.gv_depextr4.VisibleIndex = 7;
+            this.gv_depextr4.Width = 94;
+            // 
+            // gv_fmanager
+            // 
+            this.gv_fmanager.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_fmanager.AppearanceCell.Options.UseFont = true;
+            this.gv_fmanager.Caption = "閮ㄩ棬缁忕悊";
+            this.gv_fmanager.FieldName = "fmanager";
+            this.gv_fmanager.MinWidth = 50;
+            this.gv_fmanager.Name = "gv_fmanager";
+            this.gv_fmanager.OptionsColumn.AllowEdit = false;
+            this.gv_fmanager.OptionsFilter.ImmediateUpdateAutoFilter = false;
+            this.gv_fmanager.Tag = "query_a.fmanager";
+            this.gv_fmanager.Visible = true;
+            this.gv_fmanager.VisibleIndex = 8;
+            this.gv_fmanager.Width = 94;
+            // 
+            // gv_remark
+            // 
+            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_remark.AppearanceCell.Options.UseFont = true;
+            this.gv_remark.Caption = "澶囨敞";
+            this.gv_remark.FieldName = "remark";
+            this.gv_remark.MinWidth = 50;
+            this.gv_remark.Name = "gv_remark";
+            this.gv_remark.OptionsColumn.AllowEdit = false;
+            this.gv_remark.OptionsFilter.ImmediateUpdateAutoFilter = false;
+            this.gv_remark.Tag = "query_a.remark";
+            this.gv_remark.Visible = true;
+            this.gv_remark.VisibleIndex = 9;
+            this.gv_remark.Width = 94;
+            // 
+            // gv_parentId
+            // 
+            this.gv_parentId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gv_parentId.AppearanceCell.Options.UseFont = true;
+            this.gv_parentId.Caption = "涓婄骇閮ㄩ棬";
+            this.gv_parentId.FieldName = "fParentID";
+            this.gv_parentId.MinWidth = 150;
+            this.gv_parentId.Name = "gv_parentId";
+            this.gv_parentId.OptionsColumn.AllowEdit = false;
+            this.gv_parentId.OptionsFilter.ImmediateUpdateAutoFilter = false;
+            this.gv_parentId.Tag = "query_c.Departmentname";
+            this.gv_parentId.Visible = true;
+            this.gv_parentId.VisibleIndex = 10;
+            this.gv_parentId.Width = 150;
             // 
             // pageBar1
             // 
@@ -647,10 +513,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 114);
+            this.tabMx.Location = new System.Drawing.Point(0, 88);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1281, 456);
+            this.tabMx.Size = new System.Drawing.Size(1281, 482);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -659,68 +525,185 @@
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
             this.panel1.Controls.Add(this.txt_checkStatus);
-            this.panel1.Controls.Add(this.txt_isStatus);
-            this.panel1.Controls.Add(this.labelControl11);
-            this.panel1.Controls.Add(this.lbGuid);
             this.panel1.Controls.Add(this.lb_checkStatus);
             this.panel1.Controls.Add(this.lb_checkBy);
             this.panel1.Controls.Add(this.txt_checkBy);
             this.panel1.Controls.Add(this.lb_checkDate);
             this.panel1.Controls.Add(this.txt_checkDate);
-            this.panel1.Controls.Add(this.lb_isStatus);
-            this.panel1.Controls.Add(this.lb_createDate);
-            this.panel1.Controls.Add(this.txt_createDate);
-            this.panel1.Controls.Add(this.lb_createBy);
-            this.panel1.Controls.Add(this.txt_createBy);
+            this.panel1.Controls.Add(this.labelControl11);
+            this.panel1.Controls.Add(this.lbGuid);
             this.panel1.Controls.Add(this.lb_remark);
             this.panel1.Controls.Add(this.txt_remark);
-            this.panel1.Controls.Add(this.lb_name);
-            this.panel1.Controls.Add(this.txt_name);
-            this.panel1.Controls.Add(this.lb_workshopNo);
-            this.panel1.Controls.Add(this.txt_workshopNo);
+            this.panel1.Controls.Add(this.lb_departmentname);
+            this.panel1.Controls.Add(this.txt_departmentname);
+            this.panel1.Controls.Add(this.lb_departmentcode);
+            this.panel1.Controls.Add(this.txt_departmentcode);
+            this.panel1.Controls.Add(this.lb_departmentid);
+            this.panel1.Controls.Add(this.txt_departmentid);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1281, 114);
+            this.panel1.Size = new System.Drawing.Size(1281, 88);
             this.panel1.TabIndex = 1;
             // 
             // txt_checkStatus
             // 
             this.txt_checkStatus.Enabled = false;
-            this.txt_checkStatus.Location = new System.Drawing.Point(1053, 49);
+            this.txt_checkStatus.Location = new System.Drawing.Point(845, 56);
             this.txt_checkStatus.Name = "txt_checkStatus";
             this.txt_checkStatus.Properties.Caption = "";
             this.txt_checkStatus.Size = new System.Drawing.Size(94, 24);
-            this.txt_checkStatus.TabIndex = 245;
+            this.txt_checkStatus.TabIndex = 321;
             // 
-            // txt_isStatus
+            // lb_checkStatus
             // 
-            this.txt_isStatus.AutoSize = true;
-            this.txt_isStatus.Location = new System.Drawing.Point(80, 55);
-            this.txt_isStatus.Name = "txt_isStatus";
-            this.txt_isStatus.Size = new System.Drawing.Size(18, 17);
-            this.txt_isStatus.TabIndex = 244;
-            this.txt_isStatus.UseVisualStyleBackColor = true;
+            this.lb_checkStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_checkStatus.Appearance.Options.UseFont = true;
+            this.lb_checkStatus.Location = new System.Drawing.Point(771, 58);
+            this.lb_checkStatus.Name = "lb_checkStatus";
+            this.lb_checkStatus.Size = new System.Drawing.Size(68, 21);
+            this.lb_checkStatus.TabIndex = 320;
+            this.lb_checkStatus.Text = "瀹℃牳鐘舵��";
+            // 
+            // lb_checkBy
+            // 
+            this.lb_checkBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_checkBy.Appearance.Options.UseFont = true;
+            this.lb_checkBy.Location = new System.Drawing.Point(546, 19);
+            this.lb_checkBy.Name = "lb_checkBy";
+            this.lb_checkBy.Size = new System.Drawing.Size(51, 21);
+            this.lb_checkBy.TabIndex = 318;
+            this.lb_checkBy.Text = "瀹℃牳浜�";
+            // 
+            // txt_checkBy
+            // 
+            this.txt_checkBy.Enabled = false;
+            this.txt_checkBy.Location = new System.Drawing.Point(615, 15);
+            this.txt_checkBy.Name = "txt_checkBy";
+            this.txt_checkBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_checkBy.Properties.Appearance.Options.UseFont = true;
+            this.txt_checkBy.Size = new System.Drawing.Size(150, 28);
+            this.txt_checkBy.TabIndex = 319;
+            // 
+            // lb_checkDate
+            // 
+            this.lb_checkDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_checkDate.Appearance.Options.UseFont = true;
+            this.lb_checkDate.Location = new System.Drawing.Point(529, 58);
+            this.lb_checkDate.Name = "lb_checkDate";
+            this.lb_checkDate.Size = new System.Drawing.Size(68, 21);
+            this.lb_checkDate.TabIndex = 316;
+            this.lb_checkDate.Text = "瀹℃牳鏃堕棿";
+            // 
+            // txt_checkDate
+            // 
+            this.txt_checkDate.Enabled = false;
+            this.txt_checkDate.Location = new System.Drawing.Point(615, 54);
+            this.txt_checkDate.Name = "txt_checkDate";
+            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_checkDate.Size = new System.Drawing.Size(150, 28);
+            this.txt_checkDate.TabIndex = 317;
             // 
             // labelControl11
             // 
-            this.labelControl11.Location = new System.Drawing.Point(37, 83);
+            this.labelControl11.Location = new System.Drawing.Point(857, 19);
             this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl11.Name = "labelControl11";
             this.labelControl11.Size = new System.Drawing.Size(45, 18);
-            this.labelControl11.TabIndex = 130;
+            this.labelControl11.TabIndex = 293;
             this.labelControl11.Text = "涓婚敭锛�";
             this.labelControl11.Visible = false;
             // 
             // lbGuid
             // 
             this.lbGuid.AutoSize = true;
-            this.lbGuid.Location = new System.Drawing.Point(88, 83);
+            this.lbGuid.Location = new System.Drawing.Point(908, 19);
             this.lbGuid.Name = "lbGuid";
             this.lbGuid.Size = new System.Drawing.Size(0, 21);
-            this.lbGuid.TabIndex = 1;
+            this.lbGuid.TabIndex = 292;
             this.lbGuid.Visible = false;
+            // 
+            // lb_remark
+            // 
+            this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_remark.Appearance.Options.UseFont = true;
+            this.lb_remark.Location = new System.Drawing.Point(315, 58);
+            this.lb_remark.Name = "lb_remark";
+            this.lb_remark.Size = new System.Drawing.Size(39, 21);
+            this.lb_remark.TabIndex = 315;
+            this.lb_remark.Text = "澶囨敞 ";
+            // 
+            // txt_remark
+            // 
+            this.txt_remark.Enabled = false;
+            this.txt_remark.Location = new System.Drawing.Point(360, 54);
+            this.txt_remark.Name = "txt_remark";
+            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_remark.Properties.Appearance.Options.UseFont = true;
+            this.txt_remark.Size = new System.Drawing.Size(150, 28);
+            this.txt_remark.TabIndex = 314;
+            // 
+            // lb_departmentname
+            // 
+            this.lb_departmentname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_departmentname.Appearance.Options.UseFont = true;
+            this.lb_departmentname.Location = new System.Drawing.Point(39, 57);
+            this.lb_departmentname.Name = "lb_departmentname";
+            this.lb_departmentname.Size = new System.Drawing.Size(73, 21);
+            this.lb_departmentname.TabIndex = 299;
+            this.lb_departmentname.Text = "閮ㄩ棬鍚嶇О ";
+            // 
+            // txt_departmentname
+            // 
+            this.txt_departmentname.Enabled = false;
+            this.txt_departmentname.Location = new System.Drawing.Point(118, 53);
+            this.txt_departmentname.Name = "txt_departmentname";
+            this.txt_departmentname.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_departmentname.Properties.Appearance.Options.UseFont = true;
+            this.txt_departmentname.Size = new System.Drawing.Size(150, 28);
+            this.txt_departmentname.TabIndex = 298;
+            // 
+            // lb_departmentcode
+            // 
+            this.lb_departmentcode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_departmentcode.Appearance.Options.UseFont = true;
+            this.lb_departmentcode.Location = new System.Drawing.Point(281, 19);
+            this.lb_departmentcode.Name = "lb_departmentcode";
+            this.lb_departmentcode.Size = new System.Drawing.Size(73, 21);
+            this.lb_departmentcode.TabIndex = 297;
+            this.lb_departmentcode.Text = "閮ㄩ棬缂栧彿 ";
+            // 
+            // txt_departmentcode
+            // 
+            this.txt_departmentcode.Enabled = false;
+            this.txt_departmentcode.Location = new System.Drawing.Point(360, 15);
+            this.txt_departmentcode.Name = "txt_departmentcode";
+            this.txt_departmentcode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_departmentcode.Properties.Appearance.Options.UseFont = true;
+            this.txt_departmentcode.Size = new System.Drawing.Size(150, 28);
+            this.txt_departmentcode.TabIndex = 296;
+            // 
+            // lb_departmentid
+            // 
+            this.lb_departmentid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.lb_departmentid.Appearance.Options.UseFont = true;
+            this.lb_departmentid.Location = new System.Drawing.Point(55, 19);
+            this.lb_departmentid.Name = "lb_departmentid";
+            this.lb_departmentid.Size = new System.Drawing.Size(57, 21);
+            this.lb_departmentid.TabIndex = 294;
+            this.lb_departmentid.Text = "閮ㄩ棬ID ";
+            // 
+            // txt_departmentid
+            // 
+            this.txt_departmentid.Enabled = false;
+            this.txt_departmentid.Location = new System.Drawing.Point(118, 15);
+            this.txt_departmentid.Name = "txt_departmentid";
+            this.txt_departmentid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_departmentid.Properties.Appearance.Options.UseFont = true;
+            this.txt_departmentid.Size = new System.Drawing.Size(150, 28);
+            this.txt_departmentid.TabIndex = 295;
             // 
             // picCheckBox
             // 
@@ -732,28 +715,6 @@
             this.picCheckBox.TabIndex = 5;
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
-            // 
-            // gridColumn1
-            // 
-            this.gridColumn1.Caption = "浣跨敤缁勭粐";
-            this.gridColumn1.FieldName = "fSubsidiary";
-            this.gridColumn1.MinWidth = 25;
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.Tag = "org.fnamber";
-            this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 1;
-            this.gridColumn1.Width = 94;
-            // 
-            // gridColumn2
-            // 
-            this.gridColumn2.Caption = "杞﹂棿ID";
-            this.gridColumn2.FieldName = "workid";
-            this.gridColumn2.MinWidth = 25;
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.Tag = "query_a.workid";
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 0;
-            this.gridColumn2.Width = 94;
             // 
             // Frm_MesWorkshop
             // 
@@ -769,39 +730,34 @@
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_workshopNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).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.gcMain)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             this.xtraTabPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_departmentname.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_departmentcode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_departmentid.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             this.ResumeLayout(false);
 
         }
         #endregion
         private UserControl.UcToolBarMenu toolBarMenu1;
-        private DevExpress.XtraGrid.GridControl gcMain;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
         private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
         private UserControls.Data.UcPageBar pageBar1;
         private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.LabelControl labelControl11;
         private DevExpress.XtraTab.XtraTabControl tabMx;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1createDate;
@@ -812,47 +768,39 @@
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
         private DevExpress.XtraGrid.GridControl gcMx1;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-        private DevExpress.XtraEditors.LabelControl lb_checkStatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_checkStatus;
-
-        private DevExpress.XtraEditors.LabelControl lb_checkBy;
-        private DevExpress.XtraEditors.TextEdit txt_checkBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_checkBy;
-
-        private DevExpress.XtraEditors.LabelControl lb_checkDate;
-        private DevExpress.XtraEditors.TextEdit txt_checkDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_isStatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_isStatus;
-
-        private DevExpress.XtraEditors.LabelControl lb_createDate;
-        private DevExpress.XtraEditors.TextEdit txt_createDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
-
-        private DevExpress.XtraEditors.LabelControl lb_createBy;
-        private DevExpress.XtraEditors.TextEdit txt_createBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
-
-        private DevExpress.XtraEditors.LabelControl lb_remark;
-        private DevExpress.XtraEditors.TextEdit txt_remark;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
-
-        private DevExpress.XtraEditors.LabelControl lb_name;
-        private DevExpress.XtraEditors.TextEdit txt_name;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_name;
-
-        private DevExpress.XtraEditors.LabelControl lb_workshopNo;
-        private DevExpress.XtraEditors.TextEdit txt_workshopNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_workshopNo;
-        private System.Windows.Forms.CheckBox txt_isStatus;
         private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1isStatus;
         private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
-        private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
         private System.Windows.Forms.PictureBox picCheckBox;
+        private DevExpress.XtraGrid.GridControl gcMain;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_factory;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_departmentid;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_departmentcode;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_departmentname;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_depextr4;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_fmanager;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
+        private DevExpress.XtraGrid.Columns.GridColumn gv_parentId;
+        private DevExpress.XtraEditors.LabelControl labelControl11;
+        private System.Windows.Forms.Label lbGuid;
+        private DevExpress.XtraEditors.LabelControl lb_remark;
+        private DevExpress.XtraEditors.TextEdit txt_remark;
+        private DevExpress.XtraEditors.LabelControl lb_departmentname;
+        private DevExpress.XtraEditors.TextEdit txt_departmentname;
+        private DevExpress.XtraEditors.LabelControl lb_departmentcode;
+        private DevExpress.XtraEditors.TextEdit txt_departmentcode;
+        private DevExpress.XtraEditors.LabelControl lb_departmentid;
+        private DevExpress.XtraEditors.TextEdit txt_departmentid;
+        private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
+        private DevExpress.XtraEditors.LabelControl lb_checkStatus;
+        private DevExpress.XtraEditors.LabelControl lb_checkBy;
+        private DevExpress.XtraEditors.TextEdit txt_checkBy;
+        private DevExpress.XtraEditors.LabelControl lb_checkDate;
+        private DevExpress.XtraEditors.TextEdit txt_checkDate;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3