lu
2024-12-26 9d089462537e61340b2d3a3d4515d34e07b0d0cb
细节检查
已修改8个文件
302 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs 156 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Entity/PageQueryModel.cs 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCheckDt.Designer.cs 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
@@ -29,11 +29,11 @@
        /// </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();
            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.gvMx1lookupName = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -88,7 +88,7 @@
            this.gvMx1lookupName.FieldName = "lookupName";
            this.gvMx1lookupName.MinWidth = 50;
            this.gvMx1lookupName.Name = "gvMx1lookupName";
            this.gvMx1lookupName.Tag = "query_a.LOOKUP_NAME";
            this.gvMx1lookupName.Tag = "edit";
            this.gvMx1lookupName.Visible = true;
            this.gvMx1lookupName.VisibleIndex = 0;
            this.gvMx1lookupName.Width = 509;
@@ -139,10 +139,10 @@
            // 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);
@@ -404,6 +404,7 @@
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_IQCLookups";
            this.Text = "IQC检验项目";
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
@@ -130,7 +130,16 @@
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
            UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
            if (xtraTabControl1.SelectedTabPageIndex == 1)
            {
                getModel(rowGuid);
            }
            else
            {
                var gvList = new List<GridView>();
                gvList.Add(gvMx1);
                UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
            }
        }
        /// <summary>
@@ -183,7 +192,9 @@
                {
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    getModel(lbGuid.Text);
                    var gridViews = new List<GridView>();
                    gridViews.Add(gvMx1);
                    UtilityHelper.ChangeEnableByControl(panel1.Controls, false,gridViews);
                }
            }
            catch (Exception ex)
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -182,7 +182,7 @@
            this.gvMx1facLevel.FieldName = "facLevel";
            this.gvMx1facLevel.MinWidth = 150;
            this.gvMx1facLevel.Name = "gvMx1facLevel";
            this.gvMx1facLevel.Tag = "query_a.FAC_LEVEL";
            this.gvMx1facLevel.Tag = "edit";
            this.gvMx1facLevel.Visible = true;
            this.gvMx1facLevel.VisibleIndex = 8;
            this.gvMx1facLevel.Width = 150;
@@ -203,10 +203,10 @@
            this.gvMx1fstand.FieldName = "fstand";
            this.gvMx1fstand.MinWidth = 60;
            this.gvMx1fstand.Name = "gvMx1fstand";
            this.gvMx1fstand.Tag = "yz_quantity_0";
            this.gvMx1fstand.Tag = "yz_quantity_edit";
            this.gvMx1fstand.Visible = true;
            this.gvMx1fstand.VisibleIndex = 10;
            this.gvMx1fstand.Width = 150;
            this.gvMx1fstand.Width = 60;
            // 
            // gvMx1fcheckLevel
            // 
@@ -217,7 +217,7 @@
            this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
            this.gvMx1fcheckLevel.MinWidth = 200;
            this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
            this.gvMx1fcheckLevel.Tag = "query_a.FCHECK_LEVEL";
            this.gvMx1fcheckLevel.Tag = "edit";
            this.gvMx1fcheckLevel.Visible = true;
            this.gvMx1fcheckLevel.VisibleIndex = 7;
            this.gvMx1fcheckLevel.Width = 200;
@@ -238,7 +238,7 @@
            this.gvMx1fdownAllow.FieldName = "fdownAllow";
            this.gvMx1fdownAllow.MinWidth = 60;
            this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
            this.gvMx1fdownAllow.Tag = "yz_quantity_0";
            this.gvMx1fdownAllow.Tag = "yz_quantity_edit";
            this.gvMx1fdownAllow.Visible = true;
            this.gvMx1fdownAllow.VisibleIndex = 11;
            this.gvMx1fdownAllow.Width = 60;
@@ -252,7 +252,7 @@
            this.gvMx1fcheckTool.FieldName = "fcheckTool";
            this.gvMx1fcheckTool.MinWidth = 150;
            this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
            this.gvMx1fcheckTool.Tag = "query_a.FCHECK_TOOL";
            this.gvMx1fcheckTool.Tag = "edit";
            this.gvMx1fcheckTool.Visible = true;
            this.gvMx1fcheckTool.VisibleIndex = 4;
            this.gvMx1fcheckTool.Width = 150;
@@ -274,7 +274,7 @@
            this.gvMx1sampleSizeNo.FieldName = "sampleSizeName";
            this.gvMx1sampleSizeNo.MinWidth = 150;
            this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
            this.gvMx1sampleSizeNo.Tag = "query_a.SAMPLE_SIZE_NO";
            this.gvMx1sampleSizeNo.Tag = "edit";
            this.gvMx1sampleSizeNo.Visible = true;
            this.gvMx1sampleSizeNo.VisibleIndex = 5;
            this.gvMx1sampleSizeNo.Width = 150;
@@ -297,7 +297,7 @@
            this.gvMx1fcheckItem.FieldName = "fcheckItem";
            this.gvMx1fcheckItem.MinWidth = 150;
            this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
            this.gvMx1fcheckItem.Tag = "query_a.FCHECK_ITEM";
            this.gvMx1fcheckItem.Tag = "edit";
            this.gvMx1fcheckItem.Visible = true;
            this.gvMx1fcheckItem.VisibleIndex = 1;
            this.gvMx1fcheckItem.Width = 150;
@@ -318,7 +318,7 @@
            this.gvMx1fupAllow.FieldName = "fupAllow";
            this.gvMx1fupAllow.MinWidth = 60;
            this.gvMx1fupAllow.Name = "gvMx1fupAllow";
            this.gvMx1fupAllow.Tag = "yz_quantity_0";
            this.gvMx1fupAllow.Tag = "yz_quantity_edit";
            this.gvMx1fupAllow.Visible = true;
            this.gvMx1fupAllow.VisibleIndex = 9;
            this.gvMx1fupAllow.Width = 60;
@@ -331,7 +331,7 @@
            this.gvMx1forder.FieldName = "forder";
            this.gvMx1forder.MinWidth = 50;
            this.gvMx1forder.Name = "gvMx1forder";
            this.gvMx1forder.Tag = "query_a.FORDER";
            this.gvMx1forder.Tag = "yz_quantity_edit";
            this.gvMx1forder.Visible = true;
            this.gvMx1forder.VisibleIndex = 0;
            this.gvMx1forder.Width = 50;
@@ -344,7 +344,7 @@
            this.gvMx1memo.FieldName = "memo";
            this.gvMx1memo.MinWidth = 150;
            this.gvMx1memo.Name = "gvMx1memo";
            this.gvMx1memo.Tag = "query_a.MEMO";
            this.gvMx1memo.Tag = "edit";
            this.gvMx1memo.Visible = true;
            this.gvMx1memo.VisibleIndex = 3;
            this.gvMx1memo.Width = 150;
@@ -416,6 +416,7 @@
            this.gridColumn5.FieldName = "fspecRequ";
            this.gridColumn5.MinWidth = 150;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Tag = "edit";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 2;
            this.gridColumn5.Width = 150;
@@ -427,6 +428,7 @@
            this.sampleSizeName.MinWidth = 150;
            this.sampleSizeName.Name = "sampleSizeName";
            this.sampleSizeName.OptionsColumn.ReadOnly = true;
            this.sampleSizeName.Tag = "edit";
            this.sampleSizeName.Visible = true;
            this.sampleSizeName.VisibleIndex = 6;
            this.sampleSizeName.Width = 150;
@@ -439,7 +441,7 @@
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 12;
            this.gvMxDel.Width = 50;
            this.gvMxDel.Width = 100;
            // 
            // repositoryItemButtonEdit1
            // 
@@ -483,6 +485,7 @@
            this.gv_isenabled.Name = "gv_isenabled";
            this.gv_isenabled.OptionsColumn.AllowEdit = false;
            this.gv_isenabled.Tag = "query_a.ISENABLED";
            this.gv_isenabled.UnboundDataType = typeof(bool);
            this.gv_isenabled.Visible = true;
            this.gv_isenabled.VisibleIndex = 1;
            this.gv_isenabled.Width = 50;
@@ -596,6 +599,7 @@
            this.gv_ftwoChecked.Name = "gv_ftwoChecked";
            this.gv_ftwoChecked.OptionsColumn.AllowEdit = false;
            this.gv_ftwoChecked.Tag = "query_a.FTWO_CHECKED";
            this.gv_ftwoChecked.UnboundDataType = typeof(bool);
            this.gv_ftwoChecked.Visible = true;
            this.gv_ftwoChecked.VisibleIndex = 3;
            this.gv_ftwoChecked.Width = 50;
@@ -689,6 +693,7 @@
            this.gv_foneChecked.Name = "gv_foneChecked";
            this.gv_foneChecked.OptionsColumn.AllowEdit = false;
            this.gv_foneChecked.Tag = "query_a.FONE_CHECKED";
            this.gv_foneChecked.UnboundDataType = typeof(bool);
            this.gv_foneChecked.Visible = true;
            this.gv_foneChecked.VisibleIndex = 2;
            this.gv_foneChecked.Width = 50;
@@ -1201,6 +1206,7 @@
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_MesQmCheckitemDt";
            this.Text = "IQC物料检验项目";
            ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).EndInit();
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -46,6 +46,26 @@
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            _setIno();
            btnSelect.Click += (s, e) =>
            {
                var frm = new SelectCheckDt("jyxm");
                frm.UpdateParent += (ss, ee) =>
                {
                    var lst = ee.DynamicList;
                    var json = JsonConvert.SerializeObject(lst);
                    DataTable _newTable = (DataTable)JsonConvert.DeserializeObject(json, (typeof(DataTable)));
                    DataTable _oldTable = (DataTable)gridControl2.DataSource;
                    DataRow[] sourceRows = _newTable.Select();
                    for (int i = 0; i < sourceRows.Length; i++)
                    {
                        _oldTable.ImportRow(sourceRows[i]);
                    }
                    gridControl2.BindingContext = new BindingContext();
                    gridControl2.DataSource = _oldTable;
                    gridControl2.ForceInitialize();
                };
                frm.ShowDialog();
            };
            btnSave.Click += BtnSave_Click;
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -166,8 +186,17 @@
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
            UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
            if (xtraTabControl1.SelectedTabPageIndex == 1)
            {
                getModel(rowGuid);
            }
            else
            {
                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                gvList.Add(gvMx1);
                gvList.Add(gridView2);
                UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
            }
        }
        /// <summary>
@@ -181,6 +210,7 @@
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
            var gridViews = new List<GridView>();
            gridViews.Add(gvMx1);
            gridViews.Add(gridView2);
            UtilityHelper.CleanValueByControl(panel1.Controls, true, gridViews);
            UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            xtraTabPageCopy.PageEnabled = false;
@@ -203,59 +233,67 @@
            }
            gvMx1.CloseEditor();
            gvMx1.UpdateCurrentRow();
            var lst = new List<MesQmCheckitemDt>();
            for (var i = 0; i < gvMx1.DataRowCount; i++)
            {
                var row = gvMx1.GetDataRow(i);
                if (row != null)
                    lst.Add(new MesQmCheckitemDt
                    {
                        Guid = UtilityHelper.ToGuid(row["guid"].ToString()),
                        Forder = 1,
                        FcheckItem = row["FcheckItem"].ToString(),
                        SampleSizeNo = row["SampleSizeNo"].ToString(),
                        FcheckTool = row["FcheckTool"].ToString(),
                        FcheckLevel = row["FcheckLevel"].ToString(),
                        Fstand = row["Fstand"].ToString(),
                        FacLevel = row["FacLevel"].ToString(),
                        FspecRequ = row["FspecRequ"].ToString(),
                        Memo = row["memo"].ToString(),
                        FupAllow = row["FupAllow"].ToString(),
                        FdownAllow = row["FdownAllow"].ToString(),
                    });
            }
            var _obj = new MesQmCheckitem
            {
                Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
                ItemId = long.Parse(_ItemId),
                Memo = txt_memo.Text.Trim(),
                ItemNo = txt_itemNo.Text.Trim(),
                Ftype = "1",
                Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()),
                list = lst
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                    _webServiceName + "EditModel",
                    JsonConvert.SerializeObject(_obj));
                var _rtn =
                    UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                var lst = new List<MesQmCheckitemDt>();
                for (var i = 0; i < gvMx1.DataRowCount; i++)
                {
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    var gridViews = new List<GridView>();
                    gridViews.Add(gvMx1);
                    UtilityHelper.ChangeEnableByControl(panel1.Controls, false,
                        gridViews);
                    var row = gvMx1.GetDataRow(i);
                    if (row != null)
                        lst.Add(new MesQmCheckitemDt
                        {
                            Guid = UtilityHelper.ToGuid(row["guid"].ToString()),
                            Forder = int.Parse(row["forder"].ToString()),
                            FcheckItem = row["FcheckItem"].ToString(),
                            SampleSizeNo = row["SampleSizeNo"].ToString(),
                            FcheckTool = row["FcheckTool"].ToString(),
                            FcheckLevel = row["FcheckLevel"].ToString(),
                            Fstand = row["Fstand"].ToString(),
                            FacLevel = row["FacLevel"].ToString(),
                            FspecRequ = row["FspecRequ"].ToString(),
                            Memo = row["memo"].ToString(),
                            FupAllow = row["FupAllow"].ToString(),
                            FdownAllow = row["FdownAllow"].ToString(),
                        });
                }
                var _obj = new MesQmCheckitem
                {
                    Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
                    ItemId = long.Parse(_ItemId),
                    Memo = txt_memo.Text.Trim(),
                    ItemNo = txt_itemNo.Text.Trim(),
                    Ftype = "1",
                    Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()),
                    list = lst
                };
                try
                {
                    var strJson = UtilityHelper.HttpPost("",
                        _webServiceName + "EditModel",
                        JsonConvert.SerializeObject(_obj));
                    var _rtn =
                        UtilityHelper.ReturnToDynamic(strJson);
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    if (_rtn.rtnCode > 0)
                    {
                        lbGuid.Text = _rtn.rtnData;
                        toolBarMenu1.isSetBtn = true;
                        var gridViews = new List<GridView>();
                        gridViews.Add(gvMx1);
                        gridViews.Add(gridView2);
                        UtilityHelper.ChangeEnableByControl(panel1.Controls, false, gridViews);
                    }
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        /// <summary>
@@ -321,7 +359,6 @@
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                         // _webServiceName + "GetModelIQC",
                         _webServiceName + "GetModel",
                    JsonConvert.SerializeObject(_obj));
                var _rtn =
@@ -349,7 +386,7 @@
                    }
                    else
                    {
                        UtilityHelper.SetDefaultTable(gcMx1,gvMx1);
                        UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                    }
                    UtilityHelper.SetDefaultTable(gridControl2, gridView2);
                }
@@ -430,26 +467,7 @@
                txt_itemModel.Text = this.txt_ItemId.GetModel();
                txt_itemNo.Text = this.txt_ItemId.GetCode();
            };
            btnSelect.Click += (s, e) =>
            {
                var frm = new SelectCheckDt();
                frm.UpdateParent += (ss, ee) =>
                {
                    var lst = ee.DynamicList;
                    var json = JsonConvert.SerializeObject(lst);
                    DataTable _newTable = (DataTable)JsonConvert.DeserializeObject(json, (typeof(DataTable)));
                    DataTable _oldTable = (DataTable)gridControl2.DataSource;
                    DataRow[] sourceRows = _newTable.Select();
                    for (int i = 0; i < sourceRows.Length; i++)
                    {
                        _oldTable.ImportRow(sourceRows[i]);
                    }
                    gridControl2.BindingContext = new BindingContext();
                    gridControl2.DataSource = _oldTable;
                    gridControl2.ForceInitialize();
                };
                frm.ShowDialog();
            };
            _getListJyxm();
            _getListJygj();
            _getListJybz();
DevApp/Gs.DevApp/Entity/PageQueryModel.cs
@@ -15,7 +15,7 @@
        /// <param name="_keyWhere">查询表达式 and 开头</param>
        public PageQueryModel(int _currentPage, int _everyPageSize,
            string _sortName = "create_date", string _sortOrder = "asc",
            string _keyWord = "", string _keyWhere = "")
            string _keyWord = "", string _keyWhere = "",string _keyType="")
        {
            currentPage = _currentPage;
            everyPageSize = _everyPageSize;
@@ -23,6 +23,7 @@
            sortOrder = _sortOrder;
            keyWord = _keyWord;
            keyWhere = _keyWhere;
            keyType = _keyType;
        }
        public PageQueryModel()
@@ -59,5 +60,11 @@
        ///     查询表达式
        /// </summary>
        public string keyWhere { get; set; }
        /// <summary>
        /// 业务类别
        /// </summary>
        public string keyType { get; set; }
    }
}
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1599,7 +1599,10 @@
                column.OptionsFilter.AutoFilterCondition = AutoFilterCondition.Contains;
                column.OptionsFilter.ImmediateUpdateAutoFilter = false;
                column.OptionsColumn.AllowEdit = true;
                column.OptionsColumn.ReadOnly = true;
                if (column.Tag == null || column.Tag.ToString().EndsWith("edit"))
                    column.OptionsColumn.ReadOnly = false;
                else
                    column.OptionsColumn.ReadOnly = true;
                if (column.Tag == null || column.Tag.ToString().Length <= 0)
                    column.OptionsFilter.AllowAutoFilter = false;
            }
DevApp/Gs.DevApp/UserControl/SelectCheckDt.Designer.cs
@@ -37,11 +37,12 @@
            this.gv_salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -65,8 +66,11 @@
            // 
            // 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_guid,
            this.gv_chk,
@@ -74,7 +78,8 @@
            this.gv2,
            this.gv_salesOrderId,
            this.gv_orderLineId,
            this.gv_itemId});
            this.gv_itemId,
            this.gridColumn2});
            this.gridView1.GridControl = this.gcMain;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -101,6 +106,7 @@
            this.gv_chk.MaxWidth = 40;
            this.gv_chk.MinWidth = 40;
            this.gv_chk.Name = "gv_chk";
            this.gv_chk.Tag = "edit";
            this.gv_chk.Visible = true;
            this.gv_chk.VisibleIndex = 0;
            this.gv_chk.Width = 40;
@@ -109,12 +115,12 @@
            // 
            this.gridColumn1.Caption = "使用组织";
            this.gridColumn1.FieldName = "fSubsidiary";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.MinWidth = 250;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Tag = "org.FNumber";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 1;
            this.gridColumn1.Width = 94;
            this.gridColumn1.Width = 250;
            // 
            // gv2
            // 
@@ -150,13 +156,13 @@
            this.gv_orderLineId.AppearanceCell.Options.UseFont = true;
            this.gv_orderLineId.Caption = "物料名称";
            this.gv_orderLineId.FieldName = "itemName";
            this.gv_orderLineId.MinWidth = 100;
            this.gv_orderLineId.MinWidth = 200;
            this.gv_orderLineId.Name = "gv_orderLineId";
            this.gv_orderLineId.OptionsColumn.AllowEdit = false;
            this.gv_orderLineId.Tag = "query_a.itemName";
            this.gv_orderLineId.Visible = true;
            this.gv_orderLineId.VisibleIndex = 4;
            this.gv_orderLineId.Width = 100;
            this.gv_orderLineId.Width = 200;
            // 
            // gv_itemId
            // 
@@ -164,13 +170,27 @@
            this.gv_itemId.AppearanceCell.Options.UseFont = true;
            this.gv_itemId.Caption = "物料规格";
            this.gv_itemId.FieldName = "itemModel";
            this.gv_itemId.MinWidth = 100;
            this.gv_itemId.MinWidth = 200;
            this.gv_itemId.Name = "gv_itemId";
            this.gv_itemId.OptionsColumn.AllowEdit = false;
            this.gv_itemId.Tag = "query_a.itemModel";
            this.gv_itemId.Visible = true;
            this.gv_itemId.VisibleIndex = 5;
            this.gv_itemId.Width = 100;
            this.gv_itemId.Width = 200;
            //
            // gridColumn2
            //
            this.gridColumn2.AppearanceCell.ForeColor = System.Drawing.Color.Red;
            this.gridColumn2.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn2.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
            this.gridColumn2.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn2.Caption = "检验项目配置情况";
            this.gridColumn2.FieldName = "yjxm";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 6;
            this.gridColumn2.Width = 94;
            // 
            // xtraTabControl1
            // 
@@ -201,6 +221,16 @@
            this.panelControl1.Size = new System.Drawing.Size(1112, 41);
            this.panelControl1.TabIndex = 4;
            // 
            // btnIn
            //
            this.btnIn.Dock = System.Windows.Forms.DockStyle.Left;
            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
            this.btnIn.Location = new System.Drawing.Point(2, 2);
            this.btnIn.Name = "btnIn";
            this.btnIn.Size = new System.Drawing.Size(94, 37);
            this.btnIn.TabIndex = 6;
            this.btnIn.Text = "确定导入";
            //
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
@@ -213,16 +243,6 @@
            this.pageBar1.TabIndex = 3;
            this.pageBar1.TotalPages = 0;
            // 
            // btnIn
            //
            this.btnIn.Dock = System.Windows.Forms.DockStyle.Left;
            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
            this.btnIn.Location = new System.Drawing.Point(2, 2);
            this.btnIn.Name = "btnIn";
            this.btnIn.Size = new System.Drawing.Size(94, 37);
            this.btnIn.TabIndex = 6;
            this.btnIn.Text = "确定导入";
            //
            // SelectCheckDt
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -234,7 +254,7 @@
            this.MinimizeBox = false;
            this.Name = "SelectCheckDt";
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
            this.Text = "选择需要入导入的数据";
            this.Text = "选择需复制的物料";
            this.TopMost = true;
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -261,5 +281,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_chk;
        private DevExpress.XtraEditors.SimpleButton btnIn;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
    }
}
DevApp/Gs.DevApp/UserControl/SelectCheckDt.cs
@@ -14,9 +14,12 @@
        private List<FilterEntity> _filterList = new List<FilterEntity>();
        private readonly string _webServiceName = "MesQmCheckitemManager/";
        public SelectCheckDt()
        private string _inP2Type = "";
        public SelectCheckDt(string inP2Type)
        {
            InitializeComponent();
            _inP2Type = inP2Type;
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
@@ -42,6 +45,7 @@
                UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
                Close();
            };
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
@@ -72,8 +76,7 @@
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc",
                "", _sbSqlWhere.ToString());
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc","", _sbSqlWhere.ToString(),_inP2Type);
            var json = JsonConvert.SerializeObject(pgq);
            try
            {