From 07c98b01b357c37a75353370bc95430e814543f3 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 08 一月 2025 16:24:09 +0800
Subject: [PATCH] 细节

---
 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs |  676 +++++++++++++++++++++++---------------------------------
 1 files changed, 276 insertions(+), 400 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
index a0413df..7f37d6d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
@@ -29,29 +29,22 @@
         /// </summary>
         private void InitializeComponent()
         {
+            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();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_WwPc));
             this.gvMx1rwdGuid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1pcGuid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1departId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1daa013 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1pcTime = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1scheduleOrder = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1miCn = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1pcSh = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1pcId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1wgUser = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1wgTime = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1daa018 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1blUser = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1blTime = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1blState = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1mesEndProd = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
             this.gvMx1mesStartProd = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1daa011 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
+            this.gvMx1daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa014 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1unit = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1daa011 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa001 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1eid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1erpid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -59,10 +52,14 @@
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.lb_departId = new DevExpress.XtraEditors.LabelControl();
-            this.txt_departId = new DevExpress.XtraEditors.TextEdit();
-            this.gv_departId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_wwDd = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMxRemark = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.lb_shState = new DevExpress.XtraEditors.LabelControl();
             this.gv_shState = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_shTime = new DevExpress.XtraEditors.LabelControl();
@@ -76,7 +73,6 @@
             this.lb_hNo = new DevExpress.XtraEditors.LabelControl();
             this.txt_hNo = new DevExpress.XtraEditors.TextEdit();
             this.gv_hNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_id = 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();
@@ -86,15 +82,19 @@
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
             this.txt_shState = new DevExpress.XtraEditors.CheckEdit();
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
-            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_departId.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_shTime.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_shBy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_hNo.Properties)).BeginInit();
@@ -115,345 +115,194 @@
             // 
             this.gvMx1rwdGuid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1rwdGuid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1rwdGuid.Caption = "浠诲姟鍗曠殑guid ";
+            this.gvMx1rwdGuid.Caption = "浠诲姟鍗曠殑guid";
             this.gvMx1rwdGuid.FieldName = "rwdGuid";
             this.gvMx1rwdGuid.MinWidth = 50;
             this.gvMx1rwdGuid.Name = "gvMx1rwdGuid";
+            this.gvMx1rwdGuid.OptionsColumn.AllowEdit = false;
             this.gvMx1rwdGuid.Tag = "query_a.rwdGuid";
-            this.gvMx1rwdGuid.Visible = true;
-            this.gvMx1rwdGuid.VisibleIndex = 25;
             this.gvMx1rwdGuid.Width = 94;
             // 
             // gvMx1pcGuid
             // 
             this.gvMx1pcGuid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1pcGuid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1pcGuid.Caption = "鎺掍骇guid ";
+            this.gvMx1pcGuid.Caption = "鎺掍骇guid";
             this.gvMx1pcGuid.FieldName = "pcGuid";
             this.gvMx1pcGuid.MinWidth = 50;
             this.gvMx1pcGuid.Name = "gvMx1pcGuid";
+            this.gvMx1pcGuid.OptionsColumn.AllowEdit = false;
             this.gvMx1pcGuid.Tag = "query_a.pcGuid";
-            this.gvMx1pcGuid.Visible = true;
-            this.gvMx1pcGuid.VisibleIndex = 24;
             this.gvMx1pcGuid.Width = 94;
-            // 
-            // gvMx1departId
-            // 
-            this.gvMx1departId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1departId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1departId.Caption = "棰嗘枡閮ㄩ棬id ";
-            this.gvMx1departId.FieldName = "departId";
-            this.gvMx1departId.MinWidth = 50;
-            this.gvMx1departId.Name = "gvMx1departId";
-            this.gvMx1departId.Tag = "query_a.depart_id";
-            this.gvMx1departId.Visible = true;
-            this.gvMx1departId.VisibleIndex = 23;
-            this.gvMx1departId.Width = 94;
-            // 
-            // gvMx1daa013
-            // 
-            this.gvMx1daa013.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1daa013.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa013.Caption = "daa013 ";
-            this.gvMx1daa013.FieldName = "daa013";
-            this.gvMx1daa013.MinWidth = 50;
-            this.gvMx1daa013.Name = "gvMx1daa013";
-            this.gvMx1daa013.Tag = "query_a.daa013";
-            this.gvMx1daa013.Visible = true;
-            this.gvMx1daa013.VisibleIndex = 22;
-            this.gvMx1daa013.Width = 94;
-            // 
-            // gvMx1pcTime
-            // 
-            this.gvMx1pcTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1pcTime.AppearanceCell.Options.UseFont = true;
-            this.gvMx1pcTime.Caption = "鎺掍骇鏃堕棿 ";
-            this.gvMx1pcTime.FieldName = "pcTime";
-            this.gvMx1pcTime.MinWidth = 50;
-            this.gvMx1pcTime.Name = "gvMx1pcTime";
-            this.gvMx1pcTime.Tag = "query_a.pc_time";
-            this.gvMx1pcTime.Visible = true;
-            this.gvMx1pcTime.VisibleIndex = 21;
-            this.gvMx1pcTime.Width = 94;
-            // 
-            // gvMx1scheduleOrder
-            // 
-            this.gvMx1scheduleOrder.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1scheduleOrder.AppearanceCell.Options.UseFont = true;
-            this.gvMx1scheduleOrder.Caption = "搴忓彿 ";
-            this.gvMx1scheduleOrder.FieldName = "scheduleOrder";
-            this.gvMx1scheduleOrder.MinWidth = 50;
-            this.gvMx1scheduleOrder.Name = "gvMx1scheduleOrder";
-            this.gvMx1scheduleOrder.Tag = "query_a.schedule_order";
-            this.gvMx1scheduleOrder.Visible = true;
-            this.gvMx1scheduleOrder.VisibleIndex = 20;
-            this.gvMx1scheduleOrder.Width = 94;
-            // 
-            // gvMx1miCn
-            // 
-            this.gvMx1miCn.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1miCn.AppearanceCell.Options.UseFont = true;
-            this.gvMx1miCn.Caption = "鍒嗛挓浜ц兘 ";
-            this.gvMx1miCn.FieldName = "miCn";
-            this.gvMx1miCn.MinWidth = 50;
-            this.gvMx1miCn.Name = "gvMx1miCn";
-            this.gvMx1miCn.Tag = "query_a.mi_cn";
-            this.gvMx1miCn.Visible = true;
-            this.gvMx1miCn.VisibleIndex = 19;
-            this.gvMx1miCn.Width = 94;
-            // 
-            // gvMx1pcSh
-            // 
-            this.gvMx1pcSh.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1pcSh.AppearanceCell.Options.UseFont = true;
-            this.gvMx1pcSh.Caption = "鎺掍骇瀹℃牳 ";
-            this.gvMx1pcSh.FieldName = "pcSh";
-            this.gvMx1pcSh.MinWidth = 50;
-            this.gvMx1pcSh.Name = "gvMx1pcSh";
-            this.gvMx1pcSh.Tag = "query_a.pc_sh";
-            this.gvMx1pcSh.Visible = true;
-            this.gvMx1pcSh.VisibleIndex = 18;
-            this.gvMx1pcSh.Width = 94;
-            // 
-            // gvMx1pcId
-            // 
-            this.gvMx1pcId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1pcId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1pcId.Caption = "鎺掍骇id ";
-            this.gvMx1pcId.FieldName = "pcId";
-            this.gvMx1pcId.MinWidth = 50;
-            this.gvMx1pcId.Name = "gvMx1pcId";
-            this.gvMx1pcId.Tag = "query_a.pc_id";
-            this.gvMx1pcId.Visible = true;
-            this.gvMx1pcId.VisibleIndex = 17;
-            this.gvMx1pcId.Width = 94;
-            // 
-            // gvMx1wgUser
-            // 
-            this.gvMx1wgUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1wgUser.AppearanceCell.Options.UseFont = true;
-            this.gvMx1wgUser.Caption = "瀹屽伐浜� ";
-            this.gvMx1wgUser.FieldName = "wgUser";
-            this.gvMx1wgUser.MinWidth = 50;
-            this.gvMx1wgUser.Name = "gvMx1wgUser";
-            this.gvMx1wgUser.Tag = "query_a.wg_user";
-            this.gvMx1wgUser.Visible = true;
-            this.gvMx1wgUser.VisibleIndex = 16;
-            this.gvMx1wgUser.Width = 94;
-            // 
-            // gvMx1wgTime
-            // 
-            this.gvMx1wgTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1wgTime.AppearanceCell.Options.UseFont = true;
-            this.gvMx1wgTime.Caption = "瀹屽伐鏃堕棿 ";
-            this.gvMx1wgTime.FieldName = "wgTime";
-            this.gvMx1wgTime.MinWidth = 50;
-            this.gvMx1wgTime.Name = "gvMx1wgTime";
-            this.gvMx1wgTime.Tag = "query_a.wg_time";
-            this.gvMx1wgTime.Visible = true;
-            this.gvMx1wgTime.VisibleIndex = 15;
-            this.gvMx1wgTime.Width = 94;
-            // 
-            // gvMx1daa018
-            // 
-            this.gvMx1daa018.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1daa018.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa018.Caption = "宸ュ崟鐘舵�� ";
-            this.gvMx1daa018.FieldName = "daa018";
-            this.gvMx1daa018.MinWidth = 50;
-            this.gvMx1daa018.Name = "gvMx1daa018";
-            this.gvMx1daa018.Tag = "query_a.daa018";
-            this.gvMx1daa018.Visible = true;
-            this.gvMx1daa018.VisibleIndex = 14;
-            this.gvMx1daa018.Width = 94;
-            // 
-            // gvMx1blUser
-            // 
-            this.gvMx1blUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1blUser.AppearanceCell.Options.UseFont = true;
-            this.gvMx1blUser.Caption = "澶囨枡浜� ";
-            this.gvMx1blUser.FieldName = "blUser";
-            this.gvMx1blUser.MinWidth = 50;
-            this.gvMx1blUser.Name = "gvMx1blUser";
-            this.gvMx1blUser.Tag = "query_a.bl_user";
-            this.gvMx1blUser.Visible = true;
-            this.gvMx1blUser.VisibleIndex = 13;
-            this.gvMx1blUser.Width = 94;
-            // 
-            // gvMx1blTime
-            // 
-            this.gvMx1blTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1blTime.AppearanceCell.Options.UseFont = true;
-            this.gvMx1blTime.Caption = "澶囨枡鏃堕棿 ";
-            this.gvMx1blTime.FieldName = "blTime";
-            this.gvMx1blTime.MinWidth = 50;
-            this.gvMx1blTime.Name = "gvMx1blTime";
-            this.gvMx1blTime.Tag = "query_a.bl_time";
-            this.gvMx1blTime.Visible = true;
-            this.gvMx1blTime.VisibleIndex = 12;
-            this.gvMx1blTime.Width = 94;
-            // 
-            // gvMx1blState
-            // 
-            this.gvMx1blState.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1blState.AppearanceCell.Options.UseFont = true;
-            this.gvMx1blState.Caption = "澶囨枡鐘舵�� ";
-            this.gvMx1blState.FieldName = "blState";
-            this.gvMx1blState.MinWidth = 50;
-            this.gvMx1blState.Name = "gvMx1blState";
-            this.gvMx1blState.Tag = "query_a.bl_state";
-            this.gvMx1blState.Visible = true;
-            this.gvMx1blState.VisibleIndex = 11;
-            this.gvMx1blState.Width = 94;
             // 
             // gvMx1mesEndProd
             // 
             this.gvMx1mesEndProd.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1mesEndProd.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1mesEndProd.AppearanceCell.Options.UseFont = true;
-            this.gvMx1mesEndProd.Caption = "棰勮瀹屽伐鏃堕棿 ";
+            this.gvMx1mesEndProd.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx1mesEndProd.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx1mesEndProd.AppearanceHeader.Options.UseForeColor = true;
+            this.gvMx1mesEndProd.Caption = "棰勮瀹屽伐鏃堕棿";
+            this.gvMx1mesEndProd.ColumnEdit = this.repositoryItemDateEdit2;
             this.gvMx1mesEndProd.FieldName = "mesEndProd";
-            this.gvMx1mesEndProd.MinWidth = 50;
+            this.gvMx1mesEndProd.MinWidth = 180;
             this.gvMx1mesEndProd.Name = "gvMx1mesEndProd";
-            this.gvMx1mesEndProd.Tag = "query_a.mes_end_prod";
+            this.gvMx1mesEndProd.Tag = "edit";
             this.gvMx1mesEndProd.Visible = true;
-            this.gvMx1mesEndProd.VisibleIndex = 10;
-            this.gvMx1mesEndProd.Width = 94;
+            this.gvMx1mesEndProd.VisibleIndex = 11;
+            this.gvMx1mesEndProd.Width = 180;
+            // 
+            // repositoryItemDateEdit2
+            // 
+            this.repositoryItemDateEdit2.AutoHeight = false;
+            this.repositoryItemDateEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemDateEdit2.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemDateEdit2.Name = "repositoryItemDateEdit2";
             // 
             // gvMx1mesStartProd
             // 
             this.gvMx1mesStartProd.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1mesStartProd.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1mesStartProd.AppearanceCell.Options.UseFont = true;
-            this.gvMx1mesStartProd.Caption = "棰勮寮�宸ユ椂闂� ";
+            this.gvMx1mesStartProd.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx1mesStartProd.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx1mesStartProd.AppearanceHeader.Options.UseForeColor = true;
+            this.gvMx1mesStartProd.Caption = "棰勮寮�宸ユ椂闂�";
+            this.gvMx1mesStartProd.ColumnEdit = this.repositoryItemDateEdit1;
             this.gvMx1mesStartProd.FieldName = "mesStartProd";
-            this.gvMx1mesStartProd.MinWidth = 50;
+            this.gvMx1mesStartProd.MinWidth = 180;
             this.gvMx1mesStartProd.Name = "gvMx1mesStartProd";
-            this.gvMx1mesStartProd.Tag = "query_a.mes_start_prod";
+            this.gvMx1mesStartProd.Tag = "edit";
             this.gvMx1mesStartProd.Visible = true;
-            this.gvMx1mesStartProd.VisibleIndex = 9;
-            this.gvMx1mesStartProd.Width = 94;
+            this.gvMx1mesStartProd.VisibleIndex = 10;
+            this.gvMx1mesStartProd.Width = 180;
             // 
-            // gvMx1daa011
+            // repositoryItemDateEdit1
             // 
-            this.gvMx1daa011.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1daa011.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa011.Caption = "鐢熶骇鏁� ";
-            this.gvMx1daa011.FieldName = "daa011";
-            this.gvMx1daa011.MinWidth = 50;
-            this.gvMx1daa011.Name = "gvMx1daa011";
-            this.gvMx1daa011.Tag = "query_a.daa011";
-            this.gvMx1daa011.Visible = true;
-            this.gvMx1daa011.VisibleIndex = 8;
-            this.gvMx1daa011.Width = 94;
+            this.repositoryItemDateEdit1.AutoHeight = false;
+            this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1";
+            // 
+            // gvMx1daa008
+            // 
+            this.gvMx1daa008.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1daa008.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx1daa008.AppearanceCell.Options.UseFont = true;
+            this.gvMx1daa008.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx1daa008.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx1daa008.AppearanceHeader.Options.UseForeColor = true;
+            this.gvMx1daa008.Caption = "鏈鎺掍骇鏁�";
+            this.gvMx1daa008.FieldName = "daa008";
+            this.gvMx1daa008.MinWidth = 50;
+            this.gvMx1daa008.Name = "gvMx1daa008";
+            this.gvMx1daa008.Tag = "yz_quantity_0_edit";
+            this.gvMx1daa008.Visible = true;
+            this.gvMx1daa008.VisibleIndex = 9;
+            this.gvMx1daa008.Width = 94;
             // 
             // gvMx1daa014
             // 
             this.gvMx1daa014.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1daa014.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa014.Caption = "濮斿璁㈠崟鍙� ";
+            this.gvMx1daa014.Caption = "濮斿璁㈠崟鍙�";
             this.gvMx1daa014.FieldName = "daa014";
-            this.gvMx1daa014.MinWidth = 50;
+            this.gvMx1daa014.MinWidth = 100;
             this.gvMx1daa014.Name = "gvMx1daa014";
+            this.gvMx1daa014.OptionsColumn.AllowEdit = false;
             this.gvMx1daa014.Tag = "query_a.daa014";
             this.gvMx1daa014.Visible = true;
-            this.gvMx1daa014.VisibleIndex = 7;
-            this.gvMx1daa014.Width = 94;
+            this.gvMx1daa014.VisibleIndex = 1;
+            this.gvMx1daa014.Width = 100;
             // 
             // gvMx1unit
             // 
             this.gvMx1unit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1unit.AppearanceCell.Options.UseFont = true;
-            this.gvMx1unit.Caption = "鍗曚綅id ";
-            this.gvMx1unit.FieldName = "unit";
+            this.gvMx1unit.Caption = "鍗曚綅";
+            this.gvMx1unit.FieldName = "dwName";
             this.gvMx1unit.MinWidth = 50;
             this.gvMx1unit.Name = "gvMx1unit";
+            this.gvMx1unit.OptionsColumn.AllowEdit = false;
             this.gvMx1unit.Tag = "query_a.unit";
             this.gvMx1unit.Visible = true;
-            this.gvMx1unit.VisibleIndex = 6;
+            this.gvMx1unit.VisibleIndex = 8;
             this.gvMx1unit.Width = 94;
             // 
-            // gvMx1daa008
+            // gvMx1daa011
             // 
-            this.gvMx1daa008.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1daa008.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa008.Caption = "宸ュ崟鏁伴噺 ";
-            this.gvMx1daa008.FieldName = "daa008";
-            this.gvMx1daa008.MinWidth = 50;
-            this.gvMx1daa008.Name = "gvMx1daa008";
-            this.gvMx1daa008.Tag = "query_a.daa008";
-            this.gvMx1daa008.Visible = true;
-            this.gvMx1daa008.VisibleIndex = 5;
-            this.gvMx1daa008.Width = 94;
-            // 
-            // gvMx1daa003
-            // 
-            this.gvMx1daa003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1daa003.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa003.Caption = "鐗╂枡id ";
-            this.gvMx1daa003.FieldName = "daa003";
-            this.gvMx1daa003.MinWidth = 50;
-            this.gvMx1daa003.Name = "gvMx1daa003";
-            this.gvMx1daa003.Tag = "query_a.daa003";
-            this.gvMx1daa003.Visible = true;
-            this.gvMx1daa003.VisibleIndex = 4;
-            this.gvMx1daa003.Width = 94;
+            this.gvMx1daa011.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1daa011.AppearanceCell.Options.UseFont = true;
+            this.gvMx1daa011.Caption = "宸ュ崟鏁伴噺";
+            this.gvMx1daa011.FieldName = "rwdSum";
+            this.gvMx1daa011.MinWidth = 50;
+            this.gvMx1daa011.Name = "gvMx1daa011";
+            this.gvMx1daa011.OptionsColumn.AllowEdit = false;
+            this.gvMx1daa011.Tag = "query_a.daa008";
+            this.gvMx1daa011.Visible = true;
+            this.gvMx1daa011.VisibleIndex = 5;
+            this.gvMx1daa011.Width = 94;
             // 
             // gvMx1daa001
             // 
             this.gvMx1daa001.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1daa001.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa001.Caption = "宸ュ崟鍙� ";
+            this.gvMx1daa001.Caption = "宸ュ崟鍙�";
             this.gvMx1daa001.FieldName = "daa001";
-            this.gvMx1daa001.MinWidth = 50;
+            this.gvMx1daa001.MinWidth = 100;
             this.gvMx1daa001.Name = "gvMx1daa001";
+            this.gvMx1daa001.OptionsColumn.AllowEdit = false;
             this.gvMx1daa001.Tag = "query_a.daa001";
             this.gvMx1daa001.Visible = true;
-            this.gvMx1daa001.VisibleIndex = 3;
-            this.gvMx1daa001.Width = 94;
+            this.gvMx1daa001.VisibleIndex = 0;
+            this.gvMx1daa001.Width = 100;
             // 
             // gvMx1eid
             // 
             this.gvMx1eid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1eid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1eid.Caption = "eid ";
+            this.gvMx1eid.Caption = "eid";
             this.gvMx1eid.FieldName = "eid";
             this.gvMx1eid.MinWidth = 50;
             this.gvMx1eid.Name = "gvMx1eid";
+            this.gvMx1eid.OptionsColumn.AllowEdit = false;
             this.gvMx1eid.Tag = "query_a.eid";
-            this.gvMx1eid.Visible = true;
-            this.gvMx1eid.VisibleIndex = 2;
             this.gvMx1eid.Width = 94;
             // 
             // gvMx1erpid
             // 
             this.gvMx1erpid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1erpid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1erpid.Caption = "erpid ";
+            this.gvMx1erpid.Caption = "erpid";
             this.gvMx1erpid.FieldName = "erpid";
             this.gvMx1erpid.MinWidth = 50;
             this.gvMx1erpid.Name = "gvMx1erpid";
+            this.gvMx1erpid.OptionsColumn.AllowEdit = false;
             this.gvMx1erpid.Tag = "query_a.erpid";
-            this.gvMx1erpid.Visible = true;
-            this.gvMx1erpid.VisibleIndex = 1;
             this.gvMx1erpid.Width = 94;
             // 
             // gvMx1id
             // 
             this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1id.AppearanceCell.Options.UseFont = true;
-            this.gvMx1id.Caption = "id ";
+            this.gvMx1id.Caption = "id";
             this.gvMx1id.FieldName = "id";
             this.gvMx1id.MinWidth = 50;
             this.gvMx1id.Name = "gvMx1id";
+            this.gvMx1id.OptionsColumn.AllowEdit = false;
             this.gvMx1id.Tag = "query_a.id";
-            this.gvMx1id.Visible = true;
-            this.gvMx1id.VisibleIndex = 0;
             this.gvMx1id.Width = 94;
             // 
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 414);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 441);
             this.tabMxPage1.Text = "濮斿浠诲姟鍗曟槑缁�";
             // 
             // gcMx1
@@ -462,99 +311,141 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1124, 414);
+            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit1,
+            this.repositoryItemDateEdit1,
+            this.repositoryItemDateEdit2});
+            this.gcMx1.Size = new System.Drawing.Size(1124, 441);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
             // 
             // gvMx1
             // 
+            this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMx1.ColumnPanelRowHeight = 50;
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvMx1id,
             this.gvMx1erpid,
             this.gvMx1eid,
             this.gvMx1daa001,
-            this.gvMx1daa003,
-            this.gvMx1daa008,
-            this.gvMx1unit,
             this.gvMx1daa014,
+            this.gridColumn2,
+            this.gridColumn3,
+            this.gridColumn1,
             this.gvMx1daa011,
+            this.gridColumn5,
+            this.gridColumn4,
+            this.gvMx1unit,
+            this.gvMx1daa008,
             this.gvMx1mesStartProd,
             this.gvMx1mesEndProd,
-            this.gvMx1blState,
-            this.gvMx1blTime,
-            this.gvMx1blUser,
-            this.gvMx1daa018,
-            this.gvMx1wgTime,
-            this.gvMx1wgUser,
-            this.gvMx1pcId,
-            this.gvMx1pcSh,
-            this.gvMx1miCn,
-            this.gvMx1scheduleOrder,
-            this.gvMx1pcTime,
-            this.gvMx1daa013,
-            this.gvMx1departId,
+            this.gvMxRemark,
             this.gvMx1pcGuid,
-            this.gvMx1rwdGuid});
+            this.gvMx1rwdGuid,
+            this.gvMxDel});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
-            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
             this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
             this.gvMx1.OptionsView.ShowGroupPanel = false;
             // 
-            // lb_departId
+            // gridColumn2
             // 
-            this.lb_departId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_departId.Appearance.Options.UseFont = true;
-            this.lb_departId.Location = new System.Drawing.Point(12, 54);
-            this.lb_departId.Name = "lb_departId";
-            this.lb_departId.Size = new System.Drawing.Size(68, 21);
-            this.lb_departId.TabIndex = 228;
-            this.lb_departId.Text = "棰嗘枡閮ㄩ棬";
+            this.gridColumn2.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn2.FieldName = "wlbm";
+            this.gridColumn2.MinWidth = 50;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 2;
+            this.gridColumn2.Width = 94;
             // 
-            // txt_departId
+            // gridColumn3
             // 
-            this.txt_departId.Location = new System.Drawing.Point(86, 50);
-            this.txt_departId.Name = "txt_departId";
-            this.txt_departId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_departId.Properties.Appearance.Options.UseFont = true;
-            this.txt_departId.Size = new System.Drawing.Size(150, 28);
-            this.txt_departId.TabIndex = 228;
+            this.gridColumn3.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn3.FieldName = "wlmc";
+            this.gridColumn3.MinWidth = 100;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 3;
+            this.gridColumn3.Width = 100;
             // 
-            // gv_departId
+            // gridColumn1
             // 
-            this.gv_departId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_departId.AppearanceCell.Options.UseFont = true;
-            this.gv_departId.Caption = "棰嗘枡閮ㄩ棬id ";
-            this.gv_departId.FieldName = "departId";
-            this.gv_departId.MinWidth = 50;
-            this.gv_departId.Name = "gv_departId";
-            this.gv_departId.OptionsColumn.AllowEdit = false;
-            this.gv_departId.Tag = "query_a.depart_id";
-            this.gv_departId.Visible = true;
-            this.gv_departId.VisibleIndex = 8;
-            this.gv_departId.Width = 94;
+            this.gridColumn1.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn1.FieldName = "wlgg";
+            this.gridColumn1.MinWidth = 100;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 4;
+            this.gridColumn1.Width = 100;
             // 
-            // gv_wwDd
+            // gridColumn5
             // 
-            this.gv_wwDd.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_wwDd.AppearanceCell.Options.UseFont = true;
-            this.gv_wwDd.Caption = "濮斿璁㈠崟 ";
-            this.gv_wwDd.FieldName = "wwDd";
-            this.gv_wwDd.MinWidth = 50;
-            this.gv_wwDd.Name = "gv_wwDd";
-            this.gv_wwDd.OptionsColumn.AllowEdit = false;
-            this.gv_wwDd.Tag = "query_a.ww_dd";
-            this.gv_wwDd.Visible = true;
-            this.gv_wwDd.VisibleIndex = 7;
-            this.gv_wwDd.Width = 94;
+            this.gridColumn5.Caption = "宸叉帓浜ф暟閲�";
+            this.gridColumn5.FieldName = "ypSum";
+            this.gridColumn5.MinWidth = 50;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 6;
+            this.gridColumn5.Width = 94;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+            this.gridColumn4.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn4.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+            this.gridColumn4.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn4.Caption = "鏈帓浜ч噺";
+            this.gridColumn4.FieldName = "wpSum";
+            this.gridColumn4.MinWidth = 50;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 7;
+            this.gridColumn4.Width = 94;
+            // 
+            // gvMxRemark
+            // 
+            this.gvMxRemark.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gvMxRemark.AppearanceCell.Options.UseForeColor = true;
+            this.gvMxRemark.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gvMxRemark.AppearanceHeader.Options.UseForeColor = true;
+            this.gvMxRemark.Caption = "澶囨敞";
+            this.gvMxRemark.FieldName = "remark";
+            this.gvMxRemark.MinWidth = 100;
+            this.gvMxRemark.Name = "gvMxRemark";
+            this.gvMxRemark.Tag = "edit";
+            this.gvMxRemark.Visible = true;
+            this.gvMxRemark.VisibleIndex = 12;
+            this.gvMxRemark.Width = 100;
+            // 
+            // gvMxDel
+            // 
+            this.gvMxDel.Caption = "绉诲嚭";
+            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gvMxDel.MinWidth = 25;
+            this.gvMxDel.Name = "gvMxDel";
+            this.gvMxDel.Visible = true;
+            this.gvMxDel.VisibleIndex = 13;
+            this.gvMxDel.Width = 94;
+            // 
+            // 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);
             // 
             // lb_shState
             // 
             this.lb_shState.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_shState.Appearance.Options.UseFont = true;
-            this.lb_shState.Location = new System.Drawing.Point(245, 88);
+            this.lb_shState.Location = new System.Drawing.Point(494, 59);
             this.lb_shState.Name = "lb_shState";
             this.lb_shState.Size = new System.Drawing.Size(68, 21);
             this.lb_shState.TabIndex = 222;
@@ -565,20 +456,21 @@
             this.gv_shState.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_shState.AppearanceCell.Options.UseFont = true;
             this.gv_shState.Caption = "瀹℃牳鐘舵�� ";
-            this.gv_shState.FieldName = "shState";
+            this.gv_shState.FieldName = "shChk";
+            this.gv_shState.MaxWidth = 50;
             this.gv_shState.MinWidth = 50;
             this.gv_shState.Name = "gv_shState";
             this.gv_shState.OptionsColumn.AllowEdit = false;
             this.gv_shState.Tag = "query_a.sh_state";
             this.gv_shState.Visible = true;
-            this.gv_shState.VisibleIndex = 6;
-            this.gv_shState.Width = 94;
+            this.gv_shState.VisibleIndex = 0;
+            this.gv_shState.Width = 50;
             // 
             // lb_shTime
             // 
             this.lb_shTime.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_shTime.Appearance.Options.UseFont = true;
-            this.lb_shTime.Location = new System.Drawing.Point(245, 54);
+            this.lb_shTime.Location = new System.Drawing.Point(245, 59);
             this.lb_shTime.Name = "lb_shTime";
             this.lb_shTime.Size = new System.Drawing.Size(68, 21);
             this.lb_shTime.TabIndex = 219;
@@ -586,12 +478,13 @@
             // 
             // txt_shTime
             // 
-            this.txt_shTime.Location = new System.Drawing.Point(322, 50);
+            this.txt_shTime.Location = new System.Drawing.Point(322, 55);
             this.txt_shTime.Name = "txt_shTime";
             this.txt_shTime.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_shTime.Properties.Appearance.Options.UseFont = true;
             this.txt_shTime.Size = new System.Drawing.Size(150, 28);
             this.txt_shTime.TabIndex = 219;
+            this.txt_shTime.Tag = "readonly";
             // 
             // gv_shTime
             // 
@@ -599,13 +492,13 @@
             this.gv_shTime.AppearanceCell.Options.UseFont = true;
             this.gv_shTime.Caption = "瀹℃牳鏃堕棿 ";
             this.gv_shTime.FieldName = "shTime";
-            this.gv_shTime.MinWidth = 50;
+            this.gv_shTime.MinWidth = 180;
             this.gv_shTime.Name = "gv_shTime";
             this.gv_shTime.OptionsColumn.AllowEdit = false;
             this.gv_shTime.Tag = "query_a.sh_time";
             this.gv_shTime.Visible = true;
             this.gv_shTime.VisibleIndex = 5;
-            this.gv_shTime.Width = 94;
+            this.gv_shTime.Width = 180;
             // 
             // lb_shBy
             // 
@@ -625,6 +518,7 @@
             this.txt_shBy.Properties.Appearance.Options.UseFont = true;
             this.txt_shBy.Size = new System.Drawing.Size(150, 28);
             this.txt_shBy.TabIndex = 217;
+            this.txt_shBy.Tag = "readonly";
             // 
             // gv_shBy
             // 
@@ -632,13 +526,13 @@
             this.gv_shBy.AppearanceCell.Options.UseFont = true;
             this.gv_shBy.Caption = "瀹℃牳浜� ";
             this.gv_shBy.FieldName = "shBy";
-            this.gv_shBy.MinWidth = 50;
+            this.gv_shBy.MinWidth = 100;
             this.gv_shBy.Name = "gv_shBy";
             this.gv_shBy.OptionsColumn.AllowEdit = false;
             this.gv_shBy.Tag = "query_a.sh_by";
             this.gv_shBy.Visible = true;
             this.gv_shBy.VisibleIndex = 4;
-            this.gv_shBy.Width = 94;
+            this.gv_shBy.Width = 100;
             // 
             // gv_createBy
             // 
@@ -646,13 +540,13 @@
             this.gv_createBy.AppearanceCell.Options.UseFont = true;
             this.gv_createBy.Caption = "鍒涘缓浜� ";
             this.gv_createBy.FieldName = "createBy";
-            this.gv_createBy.MinWidth = 50;
+            this.gv_createBy.MinWidth = 100;
             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 = 3;
-            this.gv_createBy.Width = 94;
+            this.gv_createBy.VisibleIndex = 2;
+            this.gv_createBy.Width = 100;
             // 
             // gv_createTime
             // 
@@ -660,13 +554,13 @@
             this.gv_createTime.AppearanceCell.Options.UseFont = true;
             this.gv_createTime.Caption = "鍒涘缓鏃堕棿 ";
             this.gv_createTime.FieldName = "createTime";
-            this.gv_createTime.MinWidth = 50;
+            this.gv_createTime.MinWidth = 180;
             this.gv_createTime.Name = "gv_createTime";
             this.gv_createTime.OptionsColumn.AllowEdit = false;
             this.gv_createTime.Tag = "query_a.create_time";
             this.gv_createTime.Visible = true;
-            this.gv_createTime.VisibleIndex = 2;
-            this.gv_createTime.Width = 94;
+            this.gv_createTime.VisibleIndex = 3;
+            this.gv_createTime.Width = 180;
             // 
             // lb_hNo
             // 
@@ -686,6 +580,7 @@
             this.txt_hNo.Properties.Appearance.Options.UseFont = true;
             this.txt_hNo.Size = new System.Drawing.Size(150, 28);
             this.txt_hNo.TabIndex = 211;
+            this.txt_hNo.Tag = "readonly";
             // 
             // gv_hNo
             // 
@@ -693,27 +588,13 @@
             this.gv_hNo.AppearanceCell.Options.UseFont = true;
             this.gv_hNo.Caption = "鎺掍骇缂栧彿 ";
             this.gv_hNo.FieldName = "hNo";
-            this.gv_hNo.MinWidth = 50;
+            this.gv_hNo.MinWidth = 150;
             this.gv_hNo.Name = "gv_hNo";
             this.gv_hNo.OptionsColumn.AllowEdit = false;
             this.gv_hNo.Tag = "query_a.hNo";
             this.gv_hNo.Visible = true;
             this.gv_hNo.VisibleIndex = 1;
-            this.gv_hNo.Width = 94;
-            // 
-            // gv_id
-            // 
-            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_id.AppearanceCell.Options.UseFont = true;
-            this.gv_id.Caption = "id ";
-            this.gv_id.FieldName = "id";
-            this.gv_id.MinWidth = 50;
-            this.gv_id.Name = "gv_id";
-            this.gv_id.OptionsColumn.AllowEdit = false;
-            this.gv_id.Tag = "query_a.id";
-            this.gv_id.Visible = true;
-            this.gv_id.VisibleIndex = 0;
-            this.gv_id.Width = 94;
+            this.gv_hNo.Width = 150;
             // 
             // toolBarMenu1
             // 
@@ -744,18 +625,18 @@
             // 
             // gridView1
             // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gv_id,
-            this.gv_hNo,
-            this.gv_createTime,
-            this.gv_createBy,
-            this.gv_shBy,
-            this.gv_shTime,
             this.gv_shState,
-            this.gv_wwDd,
-            this.gv_departId});
+            this.gv_hNo,
+            this.gv_createBy,
+            this.gv_createTime,
+            this.gv_shBy,
+            this.gv_shTime});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -807,10 +688,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 124);
+            this.tabMx.Location = new System.Drawing.Point(0, 97);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 446);
+            this.tabMx.Size = new System.Drawing.Size(1126, 473);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -822,8 +703,6 @@
             this.panel1.Controls.Add(this.txt_shState);
             this.panel1.Controls.Add(this.labelControl11);
             this.panel1.Controls.Add(this.lbGuid);
-            this.panel1.Controls.Add(this.lb_departId);
-            this.panel1.Controls.Add(this.txt_departId);
             this.panel1.Controls.Add(this.lb_shState);
             this.panel1.Controls.Add(this.lb_shTime);
             this.panel1.Controls.Add(this.txt_shTime);
@@ -835,12 +714,22 @@
             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(1126, 124);
+            this.panel1.Size = new System.Drawing.Size(1126, 97);
             this.panel1.TabIndex = 1;
+            // 
+            // btnSelect
+            // 
+            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+            this.btnSelect.Location = new System.Drawing.Point(86, 55);
+            this.btnSelect.Name = "btnSelect";
+            this.btnSelect.Size = new System.Drawing.Size(128, 29);
+            this.btnSelect.TabIndex = 457;
+            this.btnSelect.Text = "閫夊彇濮斿浠诲姟鍗�";
             // 
             // txt_shState
             // 
-            this.txt_shState.Location = new System.Drawing.Point(319, 86);
+            this.txt_shState.Enabled = false;
+            this.txt_shState.Location = new System.Drawing.Point(568, 57);
             this.txt_shState.Name = "txt_shState";
             this.txt_shState.Properties.Caption = "";
             this.txt_shState.Size = new System.Drawing.Size(94, 24);
@@ -876,15 +765,6 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // btnSelect
-            // 
-            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
-            this.btnSelect.Location = new System.Drawing.Point(12, 84);
-            this.btnSelect.Name = "btnSelect";
-            this.btnSelect.Size = new System.Drawing.Size(128, 29);
-            this.btnSelect.TabIndex = 457;
-            this.btnSelect.Text = "閫夊彇鐢熸垚鎶曟枡鍗�";
-            // 
             // Frm_WwPc
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -894,10 +774,15 @@
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_WwPc";
+            this.Text = "鎺掍骇";
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_departId.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_shTime.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_shBy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_hNo.Properties)).EndInit();
@@ -932,26 +817,12 @@
         //BQCreateConrolObejct
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1rwdGuid;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1pcGuid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1departId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa013;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1pcTime;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1scheduleOrder;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1miCn;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1pcSh;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1pcId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1wgUser;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1wgTime;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa018;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1blUser;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1blTime;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1blState;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1mesEndProd;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1mesStartProd;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa011;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa008;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa014;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1unit;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa008;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa003;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa011;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa001;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1eid;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1erpid;
@@ -959,10 +830,6 @@
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
         private DevExpress.XtraGrid.GridControl gcMx1;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-        private DevExpress.XtraEditors.LabelControl lb_departId;
-        private DevExpress.XtraEditors.TextEdit txt_departId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_departId;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_wwDd;
 
         private DevExpress.XtraEditors.LabelControl lb_shState;
         private DevExpress.XtraGrid.Columns.GridColumn gv_shState;
@@ -980,9 +847,18 @@
         private DevExpress.XtraEditors.LabelControl lb_hNo;
         private DevExpress.XtraEditors.TextEdit txt_hNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_hNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
         private System.Windows.Forms.PictureBox picCheckBox;
         private DevExpress.XtraEditors.CheckEdit txt_shState;
         private DevExpress.XtraEditors.SimpleButton btnSelect;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMxRemark;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+        private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit2;
+        private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3