1

lu

2024-11-12 65679ff053b2b842cf37cfcb5b17cf0cf3b5a9b9

1

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs

@@ -34,6 +34,11 @@
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            this.gvMx2aql1Id = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2aql00065 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2aql00040 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -59,6 +64,8 @@
            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gvMxDel2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -74,7 +81,7 @@
            this.gvMx1flevelIi = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1flevelIii = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.lb_isenabled = new DevExpress.XtraEditors.LabelControl();
            this.gv_isenabled = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -129,6 +136,7 @@
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -161,7 +169,7 @@
            // 
            this.gvMx2aql1Id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx2aql1Id.AppearanceCell.Options.UseFont = true;
            this.gvMx2aql1Id.Caption = "AQL抽样基准ID ";
            this.gvMx2aql1Id.Caption = "AQL抽样基准ID";
            this.gvMx2aql1Id.FieldName = "aql1Id";
            this.gvMx2aql1Id.MinWidth = 50;
            this.gvMx2aql1Id.Name = "gvMx2aql1Id";
@@ -266,7 +274,13 @@
            "K",
            "L",
            "M",
            "N"});
            "N",
            "O",
            "P",
            "Q",
            "R",
            "S",
            "T"});
            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
            // 
            // gvMx2memo
@@ -463,7 +477,8 @@
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemComboBox1});
            this.repositoryItemComboBox1,
            this.repositoryItemButtonEdit2});
            this.gcMx2.Size = new System.Drawing.Size(1124, 384);
            this.gcMx2.TabIndex = 0;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -492,13 +507,35 @@
            this.gvMx2aql0400,
            this.gvMx2aql0650,
            this.gvMx2aql1000,
            this.gvMx2memo});
            this.gvMx2memo,
            this.gvMxDel2});
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
            this.gvMx2.OptionsView.ShowGroupPanel = false;
            // 
            // gvMxDel2
            // 
            this.gvMxDel2.Caption = "移除";
            this.gvMxDel2.ColumnEdit = this.repositoryItemButtonEdit2;
            this.gvMxDel2.MinWidth = 50;
            this.gvMxDel2.Name = "gvMxDel2";
            this.gvMxDel2.Visible = true;
            this.gvMxDel2.VisibleIndex = 19;
            this.gvMxDel2.Width = 94;
            // 
            // repositoryItemButtonEdit2
            // 
            this.repositoryItemButtonEdit2.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit2.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.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
            // 
            // tabMxPage1
            // 
@@ -535,7 +572,7 @@
            this.gvMx1flevelIi,
            this.gvMx1flevelIii,
            this.gvMx1memo,
            this.gridColumn1});
            this.gvMxDel});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -695,23 +732,23 @@
            this.gvMx1memo.VisibleIndex = 9;
            this.gvMx1memo.Width = 99;
            // 
            // gridColumn1
            // gvMxDel
            // 
            this.gridColumn1.Caption = "移出";
            this.gridColumn1.ColumnEdit = this.repositoryItemButtonEdit1;
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 10;
            this.gridColumn1.Width = 50;
            this.gvMxDel.Caption = "移出";
            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
            this.gvMxDel.MinWidth = 50;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 10;
            this.gvMxDel.Width = 50;
            // 
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.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)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移除", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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);
@@ -1124,7 +1161,7 @@
            // 
            // toolBarMenu1
            // 
            this.toolBarMenu1.chkParameter = "MES_QM_CHECKITEM,FONE_CHECKDATE,FONE_CHECKED,FONE_CHECKOR,chk_mes_CHECKITEM";
            this.toolBarMenu1.chkParameter = "MES_QM_AQL1,FONE_CHECKDATE,FONE_CHECKED,FONE_CHECKOR,chk_mesQmAql1";
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
@@ -1310,6 +1347,7 @@
            this.tabMxPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
@@ -1445,7 +1483,9 @@
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelIii;
        private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel2;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
    }
}

 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs

@@ -492,5 +492,44 @@
                }
            }
        }

        private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
            gvMx2.CloseEditor();
            gvMx2.UpdateCurrentRow();
            var rowhandle = gvMx2.FocusedRowHandle;
            if (rowhandle < 0)
                return;
            if (e.Button.Index == 0)
            {
                var dr = gvMx2.GetDataRow(rowhandle);
                var mxGuid = dr["guid"].ToString();
                if (!MsgHelper.AskQuestion("你选择了1条数据，确定删除吗？"))
                    return;
                if (string.IsNullOrEmpty(mxGuid))
                {
                    gvMx1.DeleteRow(rowhandle);
                    return;
                }
                var strJson = "";
                var lst = new List<string>();
                lst.Add(mxGuid);
                try
                {
                    strJson = UtilityHelper.HttpPost("",
                        _webServiceName + "DeleteModelMx2",
                        JsonConvert.SerializeObject(lst));
                    var _rtn =
                        UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);

                    MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示：" + ex.Message);
                }
            }
        }
    }
}

 DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs

@@ -285,7 +285,7 @@
            if (gridViews != null)
                foreach (var gv in gridViews) {
                    foreach (GridColumn colmn in gv.Columns) {
                        if (colmn.Name == "gvMxDel")
                        if (colmn.Name.ToString().Contains("gvMxDel"))
                        {
                            colmn.Visible = !isEdt;
                            break;
@@ -518,7 +518,17 @@
            isEdt = !isEdt;
            if (gridViews != null)
                foreach (var gv in gridViews)
                {
                    foreach (GridColumn colmn in gv.Columns)
                    {
                        if (colmn.Name.ToString().Contains("gvMxDel"))
                        {
                            colmn.Visible = !isEdt;
                            break;
                        }
                    }
                    gv.OptionsBehavior.Editable = !isEdt;
                }
            foreach (Control ctrl in controls)
            {
                //多行文本
@@ -635,7 +645,17 @@
            isEdt = !isEdt;
            if (gridViews != null)
                foreach (var gv in gridViews)
                {
                    foreach (GridColumn colmn in gv.Columns)
                    {
                        if (colmn.Name.ToString().Contains("gvMxDel"))
                        {
                            colmn.Visible = !isEdt;
                            break;
                        }
                    }
                    gv.OptionsBehavior.Editable = !isEdt;
                }
            foreach (Control ctrl in controls)
            {
                //文本