1

lu

2024-12-01 ff561fb64775f0f3dbf5a4bf91e4c61bcc887080

1

 DevApp/Gs.DevApp/App.config

@@ -28,8 +28,8 @@
        </assemblyBinding>
    </runtime>
    <appSettings>
         <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
         <add key="WebApiUrl" value="http://192.168.1.145:81/" /> 
         <add key="WebApiUrl" value="http://localhost:5263/" />
         <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> 
        <add key="LogPath" value="logs" />
        <add key="ProductName" value="广深科技 G-MES V2.0" />
        <add key="PageSize" value="50" />

 DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs

@@ -270,7 +270,7 @@
                tlMenu.ParentFieldName = "upGuid";
                tlMenu.Tag = "name";
                tlMenu.EndUpdate();
                // this.tlMenu.ExpandAll();
                this.tlMenu.CollapseAll();
                tlMenu.OptionsView.CheckBoxStyle =
                    DefaultNodeCheckBoxStyle.Default;
            }

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.Designer.cs

@@ -29,9 +29,16 @@
        /// </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();
            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.daaGuid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2xh = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -137,6 +144,7 @@
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -163,7 +171,7 @@
            // 
            this.tabMxPage2.Controls.Add(this.gcMx1);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1124, 381);
            this.tabMxPage2.Size = new System.Drawing.Size(1124, 388);
            this.tabMxPage2.Text = "合并工单列表";
            // 
            // gcMx1
@@ -172,7 +180,9 @@
            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, 381);
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1124, 388);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -180,6 +190,7 @@
            // gvMx1
            // 
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gvMxDel,
            this.gvMx2guid,
            this.daaGuid,
            this.gvMx2xh,
@@ -199,10 +210,30 @@
            this.gvMx2daa014});
            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;
            // 
            // gvMxDel
            // 
            this.gvMxDel.Caption = "移出";
            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
            this.gvMxDel.MinWidth = 25;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 0;
            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);
            // 
            // gvMx2guid
            // 
@@ -212,9 +243,10 @@
            this.gvMx2guid.FieldName = "guid";
            this.gvMx2guid.MinWidth = 50;
            this.gvMx2guid.Name = "gvMx2guid";
            this.gvMx2guid.OptionsColumn.ReadOnly = true;
            this.gvMx2guid.Tag = "query_a.guid";
            this.gvMx2guid.Visible = true;
            this.gvMx2guid.VisibleIndex = 0;
            this.gvMx2guid.VisibleIndex = 1;
            this.gvMx2guid.Width = 94;
            // 
            // daaGuid
@@ -223,8 +255,9 @@
            this.daaGuid.FieldName = "daaGuid";
            this.daaGuid.MinWidth = 25;
            this.daaGuid.Name = "daaGuid";
            this.daaGuid.OptionsColumn.ReadOnly = true;
            this.daaGuid.Visible = true;
            this.daaGuid.VisibleIndex = 1;
            this.daaGuid.VisibleIndex = 2;
            this.daaGuid.Width = 94;
            // 
            // gvMx2xh
@@ -235,9 +268,10 @@
            this.gvMx2xh.FieldName = "xh";
            this.gvMx2xh.MinWidth = 50;
            this.gvMx2xh.Name = "gvMx2xh";
            this.gvMx2xh.OptionsColumn.ReadOnly = true;
            this.gvMx2xh.Tag = "query_a.xh";
            this.gvMx2xh.Visible = true;
            this.gvMx2xh.VisibleIndex = 2;
            this.gvMx2xh.VisibleIndex = 3;
            this.gvMx2xh.Width = 94;
            // 
            // gvMx2womdaahbNo
@@ -248,9 +282,10 @@
            this.gvMx2womdaahbNo.FieldName = "womdaahbNo";
            this.gvMx2womdaahbNo.MinWidth = 50;
            this.gvMx2womdaahbNo.Name = "gvMx2womdaahbNo";
            this.gvMx2womdaahbNo.OptionsColumn.ReadOnly = true;
            this.gvMx2womdaahbNo.Tag = "query_a.womdaahb_no";
            this.gvMx2womdaahbNo.Visible = true;
            this.gvMx2womdaahbNo.VisibleIndex = 3;
            this.gvMx2womdaahbNo.VisibleIndex = 4;
            this.gvMx2womdaahbNo.Width = 94;
            // 
            // gvMx2pbomNo
@@ -261,9 +296,10 @@
            this.gvMx2pbomNo.FieldName = "pbomNo";
            this.gvMx2pbomNo.MinWidth = 50;
            this.gvMx2pbomNo.Name = "gvMx2pbomNo";
            this.gvMx2pbomNo.OptionsColumn.ReadOnly = true;
            this.gvMx2pbomNo.Tag = "query_a.pbom_no";
            this.gvMx2pbomNo.Visible = true;
            this.gvMx2pbomNo.VisibleIndex = 4;
            this.gvMx2pbomNo.VisibleIndex = 5;
            this.gvMx2pbomNo.Width = 94;
            // 
            // gvMx2itemId
@@ -274,9 +310,10 @@
            this.gvMx2itemId.FieldName = "itemId";
            this.gvMx2itemId.MinWidth = 50;
            this.gvMx2itemId.Name = "gvMx2itemId";
            this.gvMx2itemId.OptionsColumn.ReadOnly = true;
            this.gvMx2itemId.Tag = "query_a.item_id";
            this.gvMx2itemId.Visible = true;
            this.gvMx2itemId.VisibleIndex = 5;
            this.gvMx2itemId.VisibleIndex = 6;
            this.gvMx2itemId.Width = 94;
            // 
            // gvMx2daa002
@@ -287,9 +324,10 @@
            this.gvMx2daa002.FieldName = "daa002";
            this.gvMx2daa002.MinWidth = 50;
            this.gvMx2daa002.Name = "gvMx2daa002";
            this.gvMx2daa002.OptionsColumn.ReadOnly = true;
            this.gvMx2daa002.Tag = "query_a.daa002";
            this.gvMx2daa002.Visible = true;
            this.gvMx2daa002.VisibleIndex = 6;
            this.gvMx2daa002.VisibleIndex = 7;
            this.gvMx2daa002.Width = 94;
            // 
            // gvMx2daa003
@@ -300,9 +338,10 @@
            this.gvMx2daa003.FieldName = "daa003";
            this.gvMx2daa003.MinWidth = 50;
            this.gvMx2daa003.Name = "gvMx2daa003";
            this.gvMx2daa003.OptionsColumn.ReadOnly = true;
            this.gvMx2daa003.Tag = "query_a.daa003";
            this.gvMx2daa003.Visible = true;
            this.gvMx2daa003.VisibleIndex = 7;
            this.gvMx2daa003.VisibleIndex = 8;
            this.gvMx2daa003.Width = 94;
            // 
            // gvMx2daa004
@@ -313,9 +352,10 @@
            this.gvMx2daa004.FieldName = "daa004";
            this.gvMx2daa004.MinWidth = 50;
            this.gvMx2daa004.Name = "gvMx2daa004";
            this.gvMx2daa004.OptionsColumn.ReadOnly = true;
            this.gvMx2daa004.Tag = "query_a.daa004";
            this.gvMx2daa004.Visible = true;
            this.gvMx2daa004.VisibleIndex = 8;
            this.gvMx2daa004.VisibleIndex = 9;
            this.gvMx2daa004.Width = 94;
            // 
            // gvMx2daa008
@@ -326,9 +366,10 @@
            this.gvMx2daa008.FieldName = "daa008";
            this.gvMx2daa008.MinWidth = 50;
            this.gvMx2daa008.Name = "gvMx2daa008";
            this.gvMx2daa008.OptionsColumn.ReadOnly = true;
            this.gvMx2daa008.Tag = "query_a.daa008";
            this.gvMx2daa008.Visible = true;
            this.gvMx2daa008.VisibleIndex = 9;
            this.gvMx2daa008.VisibleIndex = 10;
            this.gvMx2daa008.Width = 94;
            // 
            // gvMx2daa005
@@ -339,9 +380,10 @@
            this.gvMx2daa005.FieldName = "daa005";
            this.gvMx2daa005.MinWidth = 50;
            this.gvMx2daa005.Name = "gvMx2daa005";
            this.gvMx2daa005.OptionsColumn.ReadOnly = true;
            this.gvMx2daa005.Tag = "query_a.daa005";
            this.gvMx2daa005.Visible = true;
            this.gvMx2daa005.VisibleIndex = 10;
            this.gvMx2daa005.VisibleIndex = 11;
            this.gvMx2daa005.Width = 94;
            // 
            // gvMx2daa006
@@ -352,9 +394,10 @@
            this.gvMx2daa006.FieldName = "daa006";
            this.gvMx2daa006.MinWidth = 50;
            this.gvMx2daa006.Name = "gvMx2daa006";
            this.gvMx2daa006.OptionsColumn.ReadOnly = true;
            this.gvMx2daa006.Tag = "query_a.daa006";
            this.gvMx2daa006.Visible = true;
            this.gvMx2daa006.VisibleIndex = 11;
            this.gvMx2daa006.VisibleIndex = 12;
            this.gvMx2daa006.Width = 94;
            // 
            // gvMx2daa007
@@ -365,9 +408,10 @@
            this.gvMx2daa007.FieldName = "daa007";
            this.gvMx2daa007.MinWidth = 50;
            this.gvMx2daa007.Name = "gvMx2daa007";
            this.gvMx2daa007.OptionsColumn.ReadOnly = true;
            this.gvMx2daa007.Tag = "query_a.daa007";
            this.gvMx2daa007.Visible = true;
            this.gvMx2daa007.VisibleIndex = 12;
            this.gvMx2daa007.VisibleIndex = 13;
            this.gvMx2daa007.Width = 94;
            // 
            // gvMx2daa015
@@ -378,22 +422,27 @@
            this.gvMx2daa015.FieldName = "daa015";
            this.gvMx2daa015.MinWidth = 50;
            this.gvMx2daa015.Name = "gvMx2daa015";
            this.gvMx2daa015.OptionsColumn.ReadOnly = true;
            this.gvMx2daa015.Tag = "query_a.daa015";
            this.gvMx2daa015.Visible = true;
            this.gvMx2daa015.VisibleIndex = 13;
            this.gvMx2daa015.VisibleIndex = 14;
            this.gvMx2daa015.Width = 94;
            // 
            // gvMx2daa009
            // 
            this.gvMx2daa009.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx2daa009.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gvMx2daa009.AppearanceCell.Options.UseFont = true;
            this.gvMx2daa009.AppearanceCell.Options.UseForeColor = true;
            this.gvMx2daa009.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gvMx2daa009.AppearanceHeader.Options.UseForeColor = true;
            this.gvMx2daa009.Caption = "备注 ";
            this.gvMx2daa009.FieldName = "daa009";
            this.gvMx2daa009.MinWidth = 50;
            this.gvMx2daa009.Name = "gvMx2daa009";
            this.gvMx2daa009.Tag = "query_a.daa009";
            this.gvMx2daa009.Visible = true;
            this.gvMx2daa009.VisibleIndex = 14;
            this.gvMx2daa009.VisibleIndex = 15;
            this.gvMx2daa009.Width = 94;
            // 
            // gvMx2daa024
@@ -404,9 +453,10 @@
            this.gvMx2daa024.FieldName = "daa024";
            this.gvMx2daa024.MinWidth = 50;
            this.gvMx2daa024.Name = "gvMx2daa024";
            this.gvMx2daa024.OptionsColumn.ReadOnly = true;
            this.gvMx2daa024.Tag = "query_a.daa024";
            this.gvMx2daa024.Visible = true;
            this.gvMx2daa024.VisibleIndex = 15;
            this.gvMx2daa024.VisibleIndex = 16;
            this.gvMx2daa024.Width = 94;
            // 
            // gvMx2daa014
@@ -417,9 +467,10 @@
            this.gvMx2daa014.FieldName = "daa014";
            this.gvMx2daa014.MinWidth = 50;
            this.gvMx2daa014.Name = "gvMx2daa014";
            this.gvMx2daa014.OptionsColumn.ReadOnly = true;
            this.gvMx2daa014.Tag = "query_a.daa014";
            this.gvMx2daa014.Visible = true;
            this.gvMx2daa014.VisibleIndex = 16;
            this.gvMx2daa014.VisibleIndex = 17;
            this.gvMx2daa014.Width = 94;
            // 
            // tabMxPage1
@@ -944,7 +995,7 @@
            // 
            this.lb_freezeFlag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_freezeFlag.Appearance.Options.UseFont = true;
            this.lb_freezeFlag.Location = new System.Drawing.Point(450, 89);
            this.lb_freezeFlag.Location = new System.Drawing.Point(689, 84);
            this.lb_freezeFlag.Name = "lb_freezeFlag";
            this.lb_freezeFlag.Size = new System.Drawing.Size(68, 21);
            this.lb_freezeFlag.TabIndex = 298;
@@ -996,7 +1047,7 @@
            // 
            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(620, 16);
            this.lb_createBy.Location = new System.Drawing.Point(314, 13);
            this.lb_createBy.Name = "lb_createBy";
            this.lb_createBy.Size = new System.Drawing.Size(51, 21);
            this.lb_createBy.TabIndex = 280;
@@ -1004,11 +1055,12 @@
            // 
            // txt_createBy
            // 
            this.txt_createBy.Location = new System.Drawing.Point(680, 12);
            this.txt_createBy.Enabled = false;
            this.txt_createBy.Location = new System.Drawing.Point(368, 9);
            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(170, 28);
            this.txt_createBy.Size = new System.Drawing.Size(178, 28);
            this.txt_createBy.TabIndex = 280;
            // 
            // gv_createBy
@@ -1043,7 +1095,7 @@
            // 
            this.lb_checkUser.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_checkUser.Appearance.Options.UseFont = true;
            this.lb_checkUser.Location = new System.Drawing.Point(342, 16);
            this.lb_checkUser.Location = new System.Drawing.Point(582, 13);
            this.lb_checkUser.Name = "lb_checkUser";
            this.lb_checkUser.Size = new System.Drawing.Size(56, 21);
            this.lb_checkUser.TabIndex = 262;
@@ -1051,7 +1103,8 @@
            // 
            // txt_checkUser
            // 
            this.txt_checkUser.Location = new System.Drawing.Point(404, 12);
            this.txt_checkUser.Enabled = false;
            this.txt_checkUser.Location = new System.Drawing.Point(643, 9);
            this.txt_checkUser.Name = "txt_checkUser";
            this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
@@ -1076,7 +1129,7 @@
            // 
            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(325, 54);
            this.lb_checkDate.Location = new System.Drawing.Point(565, 49);
            this.lb_checkDate.Name = "lb_checkDate";
            this.lb_checkDate.Size = new System.Drawing.Size(73, 21);
            this.lb_checkDate.TabIndex = 258;
@@ -1084,7 +1137,8 @@
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Location = new System.Drawing.Point(404, 50);
            this.txt_checkDate.Enabled = false;
            this.txt_checkDate.Location = new System.Drawing.Point(643, 45);
            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;
@@ -1109,7 +1163,7 @@
            // 
            this.lb_fstatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_fstatus.Appearance.Options.UseFont = true;
            this.lb_fstatus.Location = new System.Drawing.Point(342, 89);
            this.lb_fstatus.Location = new System.Drawing.Point(582, 84);
            this.lb_fstatus.Name = "lb_fstatus";
            this.lb_fstatus.Size = new System.Drawing.Size(56, 21);
            this.lb_fstatus.TabIndex = 252;
@@ -1133,7 +1187,7 @@
            // 
            this.lb_daahb015.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_daahb015.Appearance.Options.UseFont = true;
            this.lb_daahb015.Location = new System.Drawing.Point(12, 93);
            this.lb_daahb015.Location = new System.Drawing.Point(12, 84);
            this.lb_daahb015.Name = "lb_daahb015";
            this.lb_daahb015.Size = new System.Drawing.Size(68, 21);
            this.lb_daahb015.TabIndex = 247;
@@ -1157,7 +1211,7 @@
            // 
            this.lb_daahb013.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_daahb013.Appearance.Options.UseFont = true;
            this.lb_daahb013.Location = new System.Drawing.Point(12, 58);
            this.lb_daahb013.Location = new System.Drawing.Point(12, 49);
            this.lb_daahb013.Name = "lb_daahb013";
            this.lb_daahb013.Size = new System.Drawing.Size(68, 21);
            this.lb_daahb013.TabIndex = 243;
@@ -1181,7 +1235,7 @@
            // 
            this.lb_daahb009.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_daahb009.Appearance.Options.UseFont = true;
            this.lb_daahb009.Location = new System.Drawing.Point(632, 93);
            this.lb_daahb009.Location = new System.Drawing.Point(326, 84);
            this.lb_daahb009.Name = "lb_daahb009";
            this.lb_daahb009.Size = new System.Drawing.Size(39, 21);
            this.lb_daahb009.TabIndex = 240;
@@ -1189,11 +1243,11 @@
            // 
            // txt_daahb009
            // 
            this.txt_daahb009.Location = new System.Drawing.Point(680, 89);
            this.txt_daahb009.Location = new System.Drawing.Point(368, 80);
            this.txt_daahb009.Name = "txt_daahb009";
            this.txt_daahb009.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_daahb009.Properties.Appearance.Options.UseFont = true;
            this.txt_daahb009.Size = new System.Drawing.Size(172, 28);
            this.txt_daahb009.Size = new System.Drawing.Size(180, 28);
            this.txt_daahb009.TabIndex = 240;
            // 
            // gv_daahb009
@@ -1214,7 +1268,7 @@
            // 
            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(603, 54);
            this.lb_createDate.Location = new System.Drawing.Point(297, 49);
            this.lb_createDate.Name = "lb_createDate";
            this.lb_createDate.Size = new System.Drawing.Size(68, 21);
            this.lb_createDate.TabIndex = 228;
@@ -1222,11 +1276,12 @@
            // 
            // txt_createDate
            // 
            this.txt_createDate.Location = new System.Drawing.Point(680, 50);
            this.txt_createDate.Enabled = false;
            this.txt_createDate.Location = new System.Drawing.Point(368, 45);
            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(170, 28);
            this.txt_createDate.Size = new System.Drawing.Size(178, 28);
            this.txt_createDate.TabIndex = 228;
            // 
            // gv_createDate
@@ -1247,15 +1302,16 @@
            // 
            this.lb_womdaahbNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.lb_womdaahbNo.Appearance.Options.UseFont = true;
            this.lb_womdaahbNo.Location = new System.Drawing.Point(41, 20);
            this.lb_womdaahbNo.Location = new System.Drawing.Point(46, 13);
            this.lb_womdaahbNo.Name = "lb_womdaahbNo";
            this.lb_womdaahbNo.Size = new System.Drawing.Size(39, 21);
            this.lb_womdaahbNo.Size = new System.Drawing.Size(34, 21);
            this.lb_womdaahbNo.TabIndex = 213;
            this.lb_womdaahbNo.Text = "单号 ";
            this.lb_womdaahbNo.Text = "单号";
            // 
            // txt_womdaahbNo
            // 
            this.txt_womdaahbNo.Location = new System.Drawing.Point(89, 16);
            this.txt_womdaahbNo.Enabled = false;
            this.txt_womdaahbNo.Location = new System.Drawing.Point(89, 9);
            this.txt_womdaahbNo.Name = "txt_womdaahbNo";
            this.txt_womdaahbNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_womdaahbNo.Properties.Appearance.Options.UseFont = true;
@@ -1403,10 +1459,10 @@
            // tabMx
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabMx.Location = new System.Drawing.Point(0, 157);
            this.tabMx.Location = new System.Drawing.Point(0, 150);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage2;
            this.tabMx.Size = new System.Drawing.Size(1126, 413);
            this.tabMx.Size = new System.Drawing.Size(1126, 420);
            this.tabMx.TabIndex = 2;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage2,
@@ -1442,13 +1498,13 @@
            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, 157);
            this.panel1.Size = new System.Drawing.Size(1126, 150);
            this.panel1.TabIndex = 1;
            // 
            // btnSelect
            // 
            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            this.btnSelect.Location = new System.Drawing.Point(12, 123);
            this.btnSelect.Location = new System.Drawing.Point(12, 116);
            this.btnSelect.Name = "btnSelect";
            this.btnSelect.Size = new System.Drawing.Size(94, 29);
            this.btnSelect.TabIndex = 457;
@@ -1457,7 +1513,7 @@
            // txt_daahb015
            // 
            this.txt_daahb015.IsReadly = false;
            this.txt_daahb015.Location = new System.Drawing.Point(89, 89);
            this.txt_daahb015.Location = new System.Drawing.Point(89, 80);
            this.txt_daahb015.Name = "txt_daahb015";
            this.txt_daahb015.Size = new System.Drawing.Size(188, 28);
            this.txt_daahb015.TabIndex = 302;
@@ -1465,14 +1521,14 @@
            // txt_daahb013
            // 
            this.txt_daahb013.IsReadly = false;
            this.txt_daahb013.Location = new System.Drawing.Point(89, 54);
            this.txt_daahb013.Location = new System.Drawing.Point(89, 45);
            this.txt_daahb013.Name = "txt_daahb013";
            this.txt_daahb013.Size = new System.Drawing.Size(188, 28);
            this.txt_daahb013.TabIndex = 301;
            // 
            // txt_freezeFlag
            // 
            this.txt_freezeFlag.Location = new System.Drawing.Point(522, 87);
            this.txt_freezeFlag.Location = new System.Drawing.Point(782, 82);
            this.txt_freezeFlag.Name = "txt_freezeFlag";
            this.txt_freezeFlag.Properties.Caption = "";
            this.txt_freezeFlag.Size = new System.Drawing.Size(44, 24);
@@ -1480,7 +1536,8 @@
            // 
            // txt_fstatus
            // 
            this.txt_fstatus.Location = new System.Drawing.Point(404, 87);
            this.txt_fstatus.Enabled = false;
            this.txt_fstatus.Location = new System.Drawing.Point(643, 82);
            this.txt_fstatus.Name = "txt_fstatus";
            this.txt_fstatus.Properties.Caption = "";
            this.txt_fstatus.Size = new System.Drawing.Size(40, 24);
@@ -1488,20 +1545,22 @@
            // 
            // labelControl11
            // 
            this.labelControl11.Location = new System.Drawing.Point(896, 89);
            this.labelControl11.Location = new System.Drawing.Point(946, 42);
            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.Text = "主键：";
            this.labelControl11.Visible = false;
            // 
            // lbGuid
            // 
            this.lbGuid.AutoSize = true;
            this.lbGuid.Location = new System.Drawing.Point(947, 89);
            this.lbGuid.Location = new System.Drawing.Point(997, 42);
            this.lbGuid.Name = "lbGuid";
            this.lbGuid.Size = new System.Drawing.Size(0, 21);
            this.lbGuid.TabIndex = 1;
            this.lbGuid.Visible = false;
            // 
            // Frm_MesWomdaahb
            // 
@@ -1514,6 +1573,7 @@
            this.tabMxPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
@@ -1654,5 +1714,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lot;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1mtono;
        private DevExpress.XtraGrid.Columns.GridColumn daaGuid;
        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
    }
}

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesWomdaahb.cs

@@ -26,6 +26,8 @@
            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
@@ -151,6 +153,100 @@
        {
            UtilityHelper.JumpToTab(xtraTabControl1, 0);
        }
        /// <summary>
        ///     审核事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private async void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_womdaahbNo, gridView1, "womdaahbNo");
            //toolBarMenu1.guidKey = rowGuid;
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定审核吗？"))
                return;
            UcLoading _loading = new UcLoading();
            var _obj = new
            {
                guid = rowGuid,
            };
            try
            {
                var strJson = await UtilityHelper.HttpPostAsync("",
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                        getModel(lbGuid.Text.Trim(), false, 999);
                    else
                        getPageList(1);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
            }
            _loading.Stop();
        }

        /// <summary>
        ///     反审核
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private async void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_womdaahbNo, gridView1, "womdaahbNo");
            // toolBarMenu1.guidKey = rowGuid;
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                return;
            }
            //MsgHelper.Warning(rowGuid);
            UcLoading _loading = new UcLoading();
            var _obj = new
            {
                guid = rowGuid,
            };
            try
            {
                var strJson = await UtilityHelper.HttpPostAsync("",
                    _webServiceName + "DeApprove",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                        getModel(lbGuid.Text.Trim(), false, 999);
                    else
                        getPageList(1);
                }
                else
                {
                    MsgHelper.Warning(_rtn.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
            }
            _loading.Stop();
        }

        /// <summary>
        /// 删除事件
@@ -160,7 +256,7 @@
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_womdaahbNo, gridView1, "womdaahbNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
@@ -168,12 +264,14 @@
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？"))
                return;
            List<dynamic> lst = new List<dynamic>();
            lst.Add(rowGuid);
            var _obj = lst;
            var _obj = new
            {
                guid = rowGuid,
                mxGuid = Guid.Empty.ToString(),
            };
            try
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModel", JsonConvert.SerializeObject(_obj));
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "DeleteModelOrMx", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
@@ -217,7 +315,7 @@
        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_womdaahbNo, gridView1, "womdaahbNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
@@ -297,7 +395,7 @@
                        //Yjkgsj = (row["mesStartProd"].ToString()),//预计开工时间
                        //Jhrs = row["planPersonnel"].ToString(),//计划人数
                        //Hxsj = row["changeLinetime"].ToString(),//换线时间
                        //Bz = row["daa009"].ToString(),//备注
                         Bz = row["daa009"].ToString(),//备注
                        //Blsj = row["prepareTime"].ToString(),//预计备料时间
                        //Pcsl = row["daa008"].ToString()//排产数量
                    });
@@ -413,5 +511,45 @@
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
            }
        }

        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            var rowhandle = gvMx1.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                var dr = gvMx1.GetDataRow(rowhandle);
                var mxGuid = dr["guid"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据，确定删除吗？"))
                    return;
                if (string.IsNullOrEmpty(mxGuid))
                {
                    gvMx1.DeleteRow(rowhandle);
                    return;
                }
                var _obj = new
                {
                    guid = lbGuid.Text.Trim(),
                    mxGuid = mxGuid,
                };
                try
                {
                    var strJson = UtilityHelper.HttpPost("",
                        _webServiceName + "DeleteModelOrMx",
                        JsonConvert.SerializeObject(_obj));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0)
                    {
                        if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
                    }
                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示：" + ex.Message);
                }
            }
        }
    }
}

 DevApp/Gs.DevApp/UserControl/UcLoading.cs

@@ -43,7 +43,7 @@
        {

            lblCaption.Text = "友情提示：";
            lblMessage.Text = "请稍候，努力加载中......";
            lblMessage.Text = "请稍候，拼命加载中......";
            lblContent.Text = "已加载 " + progressShow.EditValue.ToString() + "/100";
            
            progressShow.PerformStep();