bug
lu
5 天以前 5bf6668fc8a570f64498888b8d923911485180b3
bug
已修改10个文件
已删除3个文件
1273 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs 94 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs 370 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs 326 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.resx 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/Role.cs 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/User.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs 174 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -125,7 +125,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定删除吗?"))
@@ -139,6 +139,7 @@
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    ToolBox.MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                    if (xtraTabControl1.SelectedTabPageIndex == 0)
                    {
                        getPageList(this.pageBar1.CurrentPage);
@@ -146,11 +147,12 @@
                    else
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                }
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                else
                    ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -187,7 +189,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -231,14 +233,14 @@
            toolBarMenu1.isSetBtn = false;
            if (string.IsNullOrEmpty(txt_sampleSizeNo.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("标准编码不能为空!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("标准编码不能为空!");
                txt_sampleSizeNo.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_sampleSizeName.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("标准名称不能为空!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("标准名称不能为空!");
                txt_sampleSizeName.Focus();
                return;
            }
@@ -325,12 +327,12 @@
                }
                if (qmaql2.Count <= 0)
                {
                    Gs.DevApp.ToolBox.MsgHelper.Warning("样本量子码不能为空!");
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("样本量子码不能为空!");
                    return;
                }
                if (qmaql3.Count <= 0)
                {
                    Gs.DevApp.ToolBox.MsgHelper.Warning("抽样方案不能为空!");
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("抽样方案不能为空!");
                    return;
                }
                var _obj = new MesQmAql1
@@ -351,9 +353,10 @@
                {
                    string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                    ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    if (_rtn.rtnCode > 0)
                    {
                        ToolBox.MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                        lbGuid.Text = _rtn.rtnData;
                        toolBarMenu1.isSetBtn = true;
                        List<GridView> gridViews = new List<GridView>();
@@ -363,10 +366,12 @@
                        toolBarMenu1.currentAction = "";
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                    }
                    else
                        ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                    ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
                }
            }
            catch (Exception ex)
@@ -414,7 +419,7 @@
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -429,7 +434,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            var _obj = new
@@ -485,11 +490,11 @@
                    }
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -527,13 +532,17 @@
                        JsonConvert.SerializeObject(lst));
                    var _rtn =
                        UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    if (_rtn.rtnCode > 0)
                    {
                        MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                        getModel(lbGuid.Text);
                    }
                    else
                        MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                    MsgHelper.ShowError("提示:" + ex.Message);
                }
            }
        }
@@ -570,13 +579,16 @@
                        JsonConvert.SerializeObject(lst));
                    var _rtn =
                        UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    if (_rtn.rtnCode > 0)
                    {
                        getModel(lbGuid.Text); MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                    }
                    else
                        MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                    MsgHelper.ShowError("提示:" + ex.Message);
                }
            }
        }
@@ -596,13 +608,14 @@
                case 0:
                    strMsg = "反审核";
                    break;
            };
            }
            ;
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定" + strMsg + "吗?"))
@@ -619,9 +632,9 @@
                var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
@@ -630,10 +643,12 @@
                    gridView1.FocusedRowHandle = rowHandle;
                    UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, this, _inFieldValue.ToString());
                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
    }
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
@@ -29,18 +29,18 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            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();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            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.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -322,8 +322,6 @@
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.OptionsColumn.AllowEdit = false;
            this.gridColumn7.Tag = "query_a.ITEM_ID";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 1;
            this.gridColumn7.Width = 94;
            // 
            // gv_itemNo
@@ -336,7 +334,7 @@
            this.gv_itemNo.OptionsColumn.AllowEdit = false;
            this.gv_itemNo.Tag = "query_b.item_no";
            this.gv_itemNo.Visible = true;
            this.gv_itemNo.VisibleIndex = 2;
            this.gv_itemNo.VisibleIndex = 1;
            this.gv_itemNo.Width = 150;
            // 
            // gridColumn3
@@ -348,7 +346,7 @@
            this.gridColumn3.OptionsColumn.AllowEdit = false;
            this.gridColumn3.Tag = "query_b.item_name";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 3;
            this.gridColumn3.VisibleIndex = 2;
            this.gridColumn3.Width = 250;
            // 
            // gridColumn2
@@ -361,7 +359,7 @@
            this.gridColumn2.OptionsColumn.AllowEdit = false;
            this.gridColumn2.Tag = "query_b.item_model";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 4;
            this.gridColumn2.VisibleIndex = 3;
            this.gridColumn2.Width = 100;
            // 
            // gv_foneCheckor
@@ -374,7 +372,7 @@
            this.gv_foneCheckor.OptionsColumn.AllowEdit = false;
            this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR";
            this.gv_foneCheckor.Visible = true;
            this.gv_foneCheckor.VisibleIndex = 5;
            this.gv_foneCheckor.VisibleIndex = 4;
            this.gv_foneCheckor.Width = 94;
            // 
            // gv_foneCheckdate
@@ -387,7 +385,7 @@
            this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
            this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE";
            this.gv_foneCheckdate.Visible = true;
            this.gv_foneCheckdate.VisibleIndex = 6;
            this.gv_foneCheckdate.VisibleIndex = 5;
            this.gv_foneCheckdate.Width = 120;
            // 
            // gridColumn1
@@ -399,7 +397,7 @@
            this.gridColumn1.OptionsColumn.AllowEdit = false;
            this.gridColumn1.Tag = "query_a.CREATE_BY";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 7;
            this.gridColumn1.VisibleIndex = 6;
            this.gridColumn1.Width = 94;
            // 
            // gridColumn4
@@ -411,7 +409,7 @@
            this.gridColumn4.OptionsColumn.AllowEdit = false;
            this.gridColumn4.Tag = "query_a.CREATE_DATE";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 8;
            this.gridColumn4.VisibleIndex = 7;
            this.gridColumn4.Width = 180;
            // 
            // gv_memo
@@ -424,7 +422,7 @@
            this.gv_memo.OptionsColumn.AllowEdit = false;
            this.gv_memo.Tag = "query_a.MEMO";
            this.gv_memo.Visible = true;
            this.gv_memo.VisibleIndex = 9;
            this.gv_memo.VisibleIndex = 8;
            this.gv_memo.Width = 150;
            // 
            // gridColumn16
@@ -444,7 +442,7 @@
            this.gridColumn8.OptionsColumn.AllowEdit = false;
            this.gridColumn8.Tag = "org.fnumber";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 10;
            this.gridColumn8.VisibleIndex = 9;
            this.gridColumn8.Width = 250;
            // 
            // gridColumn18
@@ -454,7 +452,7 @@
            this.gridColumn18.MinWidth = 25;
            this.gridColumn18.Name = "gridColumn18";
            this.gridColumn18.Visible = true;
            this.gridColumn18.VisibleIndex = 11;
            this.gridColumn18.VisibleIndex = 10;
            this.gridColumn18.Width = 94;
            // 
            // pageBar1
@@ -678,29 +676,29 @@
            this.layoutControlItem6});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition4,
            rowDefinition5,
            rowDefinition6});
            rowDefinition1,
            rowDefinition2,
            rowDefinition3});
            this.Root.Size = new System.Drawing.Size(1127, 113);
            this.Root.TextVisible = false;
            // 
@@ -1143,10 +1141,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            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);
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -48,7 +48,7 @@
            txt_ftype.Text = strType;
            if (strType == QcSeason.iqc.ToString())
            {
                dfValue = 5;
                dfValue = 5;
                gvMx1.Columns["funit"].Visible = true;
                gvMx1.Columns["funit"].VisibleIndex = 13;
                gvMx1.Columns["fcheckType"].Visible = false;
@@ -62,7 +62,7 @@
            {
                dfValue = 0;
                gvMx1.Columns["ypsl"].Visible = false;
            }
            //如果是ipqc巡检,显示工位
            if (strType != QcSeason.ipqc巡检.ToString())
@@ -251,6 +251,8 @@
                gvList.Add(gvMx1);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
            }
            //2025/07/12加上修改状态下不能修改
            txt_itemId.Enabled = false;
        }
        /// <summary>
@@ -592,6 +594,7 @@
                }
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
@@ -601,7 +604,8 @@
                    Form parentForm = this.FindForm();
                    UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, parentForm, _inFieldValue.ToString());
                }
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
@@ -844,12 +848,17 @@
                        _webServiceName + "DeleteModelMx",
                        JsonConvert.SerializeObject(lst));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    if (_rtn.rtnCode > 0)
                    {
                        getModel(lbGuid.Text);
                        MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                    }
                    else
                        MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                    MsgHelper.ShowError("提示:" + ex.Message);
                }
            }
        }
DevApp/Gs.DevApp/DevFrm/QC/JyxmShowCopy.cs
@@ -59,7 +59,7 @@
                }
                if (_oldTable.Rows.Count <= 0)
                {
                    MsgHelper.ShowInformation("请选择你需要复制的物料!");
                    MsgHelper.ShowError("请选择你需要复制的物料!");
                    return;
                }
                gcMainCopy.BindingContext = new BindingContext();
@@ -72,7 +72,7 @@
                int _rows = gvMainCopy.RowCount;
                if (_rows <= 0)
                {
                    MsgHelper.ShowInformation("请选择你需要复制的物料!");
                    MsgHelper.ShowError("请选择你需要复制的物料!");
                    e.Cancel = true;
                    return;
                }
@@ -100,15 +100,17 @@
                {
                    var strJson = UtilityHelper.HttpPost("", _webServiceName + "ItemsComyMx", JsonConvert.SerializeObject(_obj));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    if (_rtn.rtnCode > 0)
                    {
                        MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                        UtilityHelper.SetDefaultTable(gcMainCopy, gvMainCopy);
                    }
                    else
                        MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                    MsgHelper.ShowError("提示:" + ex.Message);
                }
            };
            this.wizardControl1.NextClick += (s, e) =>
@@ -119,7 +121,7 @@
                    int _rows = gvMainCopy.RowCount;
                    if (_rows <= 0)
                    {
                        MsgHelper.ShowInformation("请选择你需要复制的物料!");
                        MsgHelper.ShowError("请选择你需要复制的物料!");
                        e.Handled = true;
                        return;
                    }
@@ -186,7 +188,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -229,12 +231,12 @@
                }
                else
                {
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.Designer.cs
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.resx
ÎļþÒÑɾ³ý
DevApp/Gs.DevApp/DevFrm/Sys/Organization.cs
@@ -63,7 +63,8 @@
                    {
                        gcMain1.DataSource = dt;
                        gcMain1.ForceInitialize();
                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                        gridView1.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
@@ -75,7 +76,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
    }
DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -106,7 +106,7 @@
                lbGuid, txt_roleName, gridView1, "roleName");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定删除吗?\n该操作将会清空相应的用户权限"))
@@ -121,17 +121,19 @@
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                    if (xtraTabControl1.SelectedTabPageIndex == 0)
                    { }
                    else
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                    getPageList(this.pageBar1.CurrentPage);
                }
                MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                else
                MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -169,7 +171,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_roleName, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -205,14 +207,14 @@
            toolBarMenu1.isSetBtn = false;
            if (string.IsNullOrEmpty(txt_roleName.Text.Trim()))
            {
                MsgHelper.Warning("角色名称不能为空!");
                MsgHelper.ShowError("角色名称不能为空!");
                txt_roleName.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_roleRemark.Text.Trim()))
            {
                MsgHelper.Warning("角色备注不能为空!");
                MsgHelper.ShowError("角色备注不能为空!");
                txt_roleRemark.Focus();
                return;
            }
@@ -228,19 +230,21 @@
                var strJson = UtilityHelper.HttpPost("", "Role/EditModel",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
                    toolBarMenu1.currentAction = "";
                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                }
                else
                    MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -283,7 +287,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        /// <summary>
@@ -297,7 +301,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            var _obj = new
@@ -318,12 +322,12 @@
                }
                else
                {
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        // éåކTreeView中的所有节点
DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -105,7 +105,7 @@
                lbGuid, txt_userName, gridView1, "userName");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
@@ -121,14 +121,16 @@
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                    if (xtraTabControl1.SelectedTabPageIndex == 0)
                    { }
                    else
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                    getPageList(this.pageBar1.CurrentPage);
                }
                else
                MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
@@ -169,7 +171,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_userName, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -207,21 +209,21 @@
            toolBarMenu1.isSetBtn = false;
            if (string.IsNullOrEmpty(txt_account.Text.Trim()))
            {
                MsgHelper.Warning("登录账号不能为空!");
                MsgHelper.ShowError("登录账号不能为空!");
                txt_account.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_password.Text.Trim()))
            {
                MsgHelper.Warning("密码不能为空!");
                MsgHelper.ShowError("密码不能为空!");
                txt_password.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_userName.Text.Trim()))
            {
                MsgHelper.Warning("姓名不能为空!");
                MsgHelper.ShowError("姓名不能为空!");
                txt_userName.Focus();
                return;
            }
@@ -245,15 +247,17 @@
                var strJson = UtilityHelper.HttpPost("", "User/EditModel",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
                    toolBarMenu1.currentAction = "";
                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                }
                else
                    MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
@@ -301,7 +305,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        /// <summary>
@@ -315,7 +319,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            var _obj = new
@@ -336,12 +340,12 @@
                }
                else
                {
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        /// <summary>
DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
@@ -26,7 +26,7 @@
        {
            if (string.IsNullOrEmpty(_userGuid))
            {
                MsgHelper.Warning("请先选择你要操作的用户!");
                MsgHelper.ShowError("请先选择你要操作的用户!");
                return;
            }
@@ -52,12 +52,15 @@
                strJson = UtilityHelper.HttpPost("", "Role/SetUserRole",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning("提示:" + _rtn.rtnData.outMsg);
                if (_rtn.rtnCode > 0)
                    MsgHelper.ShowInformation("提示:" + _rtn.rtnData.outMsg);
                else
                    MsgHelper.ShowError("提示:" + _rtn.rtnData.outMsg);
                Close();
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        /// <summary>
@@ -92,7 +95,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -166,7 +169,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
    }
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -352,8 +352,6 @@
            this.gv_factory.Name = "gv_factory";
            this.gv_factory.OptionsColumn.AllowEdit = false;
            this.gv_factory.Tag = "query_a.ebelnK3id";
            this.gv_factory.Visible = true;
            this.gv_factory.VisibleIndex = 0;
            this.gv_factory.Width = 80;
            // 
            // gv_billNo
@@ -366,7 +364,7 @@
            this.gv_billNo.OptionsColumn.AllowEdit = false;
            this.gv_billNo.Tag = "query_a.BILL_NO";
            this.gv_billNo.Visible = true;
            this.gv_billNo.VisibleIndex = 1;
            this.gv_billNo.VisibleIndex = 0;
            this.gv_billNo.Width = 120;
            // 
            // gv_documentStatus
@@ -379,7 +377,7 @@
            this.gv_documentStatus.OptionsColumn.AllowEdit = false;
            this.gv_documentStatus.Tag = "query_a.DOCUMENT_STATUS";
            this.gv_documentStatus.Visible = true;
            this.gv_documentStatus.VisibleIndex = 2;
            this.gv_documentStatus.VisibleIndex = 1;
            this.gv_documentStatus.Width = 70;
            // 
            // gv_documentType
@@ -392,7 +390,7 @@
            this.gv_documentType.OptionsColumn.AllowEdit = false;
            this.gv_documentType.Tag = "query_a.DOCUMENT_TYPE";
            this.gv_documentType.Visible = true;
            this.gv_documentType.VisibleIndex = 3;
            this.gv_documentType.VisibleIndex = 2;
            this.gv_documentType.Width = 80;
            // 
            // gv_businessType
@@ -404,8 +402,6 @@
            this.gv_businessType.Name = "gv_businessType";
            this.gv_businessType.OptionsColumn.AllowEdit = false;
            this.gv_businessType.Tag = "query_a.BUSINESS_TYPE";
            this.gv_businessType.Visible = true;
            this.gv_businessType.VisibleIndex = 4;
            this.gv_businessType.Width = 80;
            // 
            // gv_purchaseDate
@@ -418,7 +414,7 @@
            this.gv_purchaseDate.OptionsColumn.AllowEdit = false;
            this.gv_purchaseDate.Tag = "query_a.PURCHASE_DATE";
            this.gv_purchaseDate.Visible = true;
            this.gv_purchaseDate.VisibleIndex = 5;
            this.gv_purchaseDate.VisibleIndex = 3;
            this.gv_purchaseDate.Width = 170;
            // 
            // bandedGridColumn1
@@ -430,7 +426,7 @@
            this.bandedGridColumn1.OptionsColumn.AllowEdit = false;
            this.bandedGridColumn1.Tag = "query_a.suppName";
            this.bandedGridColumn1.Visible = true;
            this.bandedGridColumn1.VisibleIndex = 6;
            this.bandedGridColumn1.VisibleIndex = 4;
            this.bandedGridColumn1.Width = 134;
            // 
            // gv_supplier
@@ -443,7 +439,7 @@
            this.gv_supplier.OptionsColumn.AllowEdit = false;
            this.gv_supplier.Tag = "query_a.SUPPLIER";
            this.gv_supplier.Visible = true;
            this.gv_supplier.VisibleIndex = 7;
            this.gv_supplier.VisibleIndex = 5;
            this.gv_supplier.Width = 66;
            // 
            // gv_closeStatus
@@ -456,7 +452,7 @@
            this.gv_closeStatus.OptionsColumn.AllowEdit = false;
            this.gv_closeStatus.Tag = "query_a.CLOSE_STATUS";
            this.gv_closeStatus.Visible = true;
            this.gv_closeStatus.VisibleIndex = 8;
            this.gv_closeStatus.VisibleIndex = 6;
            this.gv_closeStatus.Width = 80;
            // 
            // bandedGridColumn2
@@ -468,7 +464,7 @@
            this.bandedGridColumn2.OptionsColumn.AllowEdit = false;
            this.bandedGridColumn2.Tag = "query_a.departmentname";
            this.bandedGridColumn2.Visible = true;
            this.bandedGridColumn2.VisibleIndex = 9;
            this.bandedGridColumn2.VisibleIndex = 7;
            this.bandedGridColumn2.Width = 80;
            // 
            // gv_purchaseDept
@@ -480,8 +476,6 @@
            this.gv_purchaseDept.Name = "gv_purchaseDept";
            this.gv_purchaseDept.OptionsColumn.AllowEdit = false;
            this.gv_purchaseDept.Tag = "query_a.PURCHASE_DEPT";
            this.gv_purchaseDept.Visible = true;
            this.gv_purchaseDept.VisibleIndex = 10;
            this.gv_purchaseDept.Width = 50;
            // 
            // gv_purchaser
@@ -494,7 +488,7 @@
            this.gv_purchaser.OptionsColumn.AllowEdit = false;
            this.gv_purchaser.Tag = "query_a.PURCHASER";
            this.gv_purchaser.Visible = true;
            this.gv_purchaser.VisibleIndex = 11;
            this.gv_purchaser.VisibleIndex = 8;
            this.gv_purchaser.Width = 60;
            // 
            // gv_qualityReq
@@ -507,7 +501,7 @@
            this.gv_qualityReq.OptionsColumn.AllowEdit = false;
            this.gv_qualityReq.Tag = "query_a.QUALITY_REQ";
            this.gv_qualityReq.Visible = true;
            this.gv_qualityReq.VisibleIndex = 12;
            this.gv_qualityReq.VisibleIndex = 9;
            this.gv_qualityReq.Width = 80;
            // 
            // gv_settlementParty
@@ -542,7 +536,7 @@
            this.gv_remarks.OptionsColumn.AllowEdit = false;
            this.gv_remarks.Tag = "query_a.REMARKS";
            this.gv_remarks.Visible = true;
            this.gv_remarks.VisibleIndex = 13;
            this.gv_remarks.VisibleIndex = 10;
            this.gv_remarks.Width = 100;
            // 
            // gv_cancellationStatus
@@ -555,7 +549,7 @@
            this.gv_cancellationStatus.OptionsColumn.AllowEdit = false;
            this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS";
            this.gv_cancellationStatus.Visible = true;
            this.gv_cancellationStatus.VisibleIndex = 14;
            this.gv_cancellationStatus.VisibleIndex = 11;
            this.gv_cancellationStatus.Width = 60;
            // 
            // gv_cancellationPerson
@@ -568,7 +562,7 @@
            this.gv_cancellationPerson.OptionsColumn.AllowEdit = false;
            this.gv_cancellationPerson.Tag = "query_a.CANCELLATION_PERSON";
            this.gv_cancellationPerson.Visible = true;
            this.gv_cancellationPerson.VisibleIndex = 15;
            this.gv_cancellationPerson.VisibleIndex = 12;
            this.gv_cancellationPerson.Width = 60;
            // 
            // gv_cancellationDate
@@ -581,7 +575,7 @@
            this.gv_cancellationDate.OptionsColumn.AllowEdit = false;
            this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE";
            this.gv_cancellationDate.Visible = true;
            this.gv_cancellationDate.VisibleIndex = 16;
            this.gv_cancellationDate.VisibleIndex = 13;
            this.gv_cancellationDate.Width = 180;
            // 
            // gv_createBy
@@ -594,7 +588,7 @@
            this.gv_createBy.OptionsColumn.AllowEdit = false;
            this.gv_createBy.Tag = "query_a.CREATE_BY";
            this.gv_createBy.Visible = true;
            this.gv_createBy.VisibleIndex = 17;
            this.gv_createBy.VisibleIndex = 14;
            this.gv_createBy.Width = 80;
            // 
            // gv_createDate
@@ -607,7 +601,7 @@
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_a.CREATE_DATE";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 18;
            this.gv_createDate.VisibleIndex = 15;
            this.gv_createDate.Width = 180;
            // 
            // gv_lastupdateDate
@@ -620,7 +614,7 @@
            this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
            this.gv_lastupdateDate.Visible = true;
            this.gv_lastupdateDate.VisibleIndex = 19;
            this.gv_lastupdateDate.VisibleIndex = 16;
            this.gv_lastupdateDate.Width = 200;
            // 
            // gv_lastupdateBy
@@ -633,7 +627,7 @@
            this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
            this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
            this.gv_lastupdateBy.Visible = true;
            this.gv_lastupdateBy.VisibleIndex = 20;
            this.gv_lastupdateBy.VisibleIndex = 17;
            this.gv_lastupdateBy.Width = 100;
            // 
            // gv_erpCheckBy
@@ -646,7 +640,7 @@
            this.gv_erpCheckBy.OptionsColumn.AllowEdit = false;
            this.gv_erpCheckBy.Tag = "query_a.ERP_CHECK_BY";
            this.gv_erpCheckBy.Visible = true;
            this.gv_erpCheckBy.VisibleIndex = 21;
            this.gv_erpCheckBy.VisibleIndex = 18;
            this.gv_erpCheckBy.Width = 80;
            // 
            // gv_erpCheckDate
@@ -659,7 +653,7 @@
            this.gv_erpCheckDate.OptionsColumn.AllowEdit = false;
            this.gv_erpCheckDate.Tag = "query_a.ERP_CHECK_DATE";
            this.gv_erpCheckDate.Visible = true;
            this.gv_erpCheckDate.VisibleIndex = 22;
            this.gv_erpCheckDate.VisibleIndex = 19;
            this.gv_erpCheckDate.Width = 180;
            // 
            // gv_changereason
@@ -672,7 +666,7 @@
            this.gv_changereason.OptionsColumn.AllowEdit = false;
            this.gv_changereason.Tag = "query_a.CHANGEREASON";
            this.gv_changereason.Visible = true;
            this.gv_changereason.VisibleIndex = 23;
            this.gv_changereason.VisibleIndex = 20;
            this.gv_changereason.Width = 100;
            // 
            // gridColumn4
@@ -682,7 +676,7 @@
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 24;
            this.gridColumn4.VisibleIndex = 21;
            this.gridColumn4.Width = 94;
            // 
            // gridColumn5
@@ -716,7 +710,7 @@
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 25;
            this.gridColumn11.VisibleIndex = 22;
            this.gridColumn11.Width = 94;
            // 
            // pageBar1
@@ -799,7 +793,7 @@
            this.txt_billNo.Location = new System.Drawing.Point(109, 12);
            this.txt_billNo.Name = "txt_billNo";
            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
            this.txt_billNo.Size = new System.Drawing.Size(229, 24);
            this.txt_billNo.Size = new System.Drawing.Size(234, 24);
            this.txt_billNo.StyleController = this.layoutMx1;
            this.txt_billNo.TabIndex = 213;
            // 
@@ -813,41 +807,41 @@
            // 
            // txt_suppName
            // 
            this.txt_suppName.Location = new System.Drawing.Point(769, 12);
            this.txt_suppName.Location = new System.Drawing.Point(780, 12);
            this.txt_suppName.Name = "txt_suppName";
            this.txt_suppName.Size = new System.Drawing.Size(229, 24);
            this.txt_suppName.Size = new System.Drawing.Size(235, 24);
            this.txt_suppName.StyleController = this.layoutMx1;
            this.txt_suppName.TabIndex = 231;
            // 
            // txt_documentTypeTxt
            // 
            this.txt_documentTypeTxt.Location = new System.Drawing.Point(439, 12);
            this.txt_documentTypeTxt.Location = new System.Drawing.Point(444, 12);
            this.txt_documentTypeTxt.Name = "txt_documentTypeTxt";
            this.txt_documentTypeTxt.Size = new System.Drawing.Size(229, 24);
            this.txt_documentTypeTxt.Size = new System.Drawing.Size(235, 24);
            this.txt_documentTypeTxt.StyleController = this.layoutMx1;
            this.txt_documentTypeTxt.TabIndex = 232;
            // 
            // txt_suppNo
            // 
            this.txt_suppNo.Location = new System.Drawing.Point(769, 40);
            this.txt_suppNo.Location = new System.Drawing.Point(780, 40);
            this.txt_suppNo.Name = "txt_suppNo";
            this.txt_suppNo.Size = new System.Drawing.Size(229, 24);
            this.txt_suppNo.Size = new System.Drawing.Size(235, 24);
            this.txt_suppNo.StyleController = this.layoutMx1;
            this.txt_suppNo.TabIndex = 233;
            // 
            // txt_closeStatusTxt
            // 
            this.txt_closeStatusTxt.Location = new System.Drawing.Point(1099, 40);
            this.txt_closeStatusTxt.Location = new System.Drawing.Point(1116, 40);
            this.txt_closeStatusTxt.Name = "txt_closeStatusTxt";
            this.txt_closeStatusTxt.Size = new System.Drawing.Size(231, 24);
            this.txt_closeStatusTxt.Size = new System.Drawing.Size(235, 24);
            this.txt_closeStatusTxt.StyleController = this.layoutMx1;
            this.txt_closeStatusTxt.TabIndex = 234;
            // 
            // txt_cancellationStatusTxt
            // 
            this.txt_cancellationStatusTxt.Location = new System.Drawing.Point(1099, 68);
            this.txt_cancellationStatusTxt.Location = new System.Drawing.Point(1116, 68);
            this.txt_cancellationStatusTxt.Name = "txt_cancellationStatusTxt";
            this.txt_cancellationStatusTxt.Size = new System.Drawing.Size(231, 24);
            this.txt_cancellationStatusTxt.Size = new System.Drawing.Size(235, 24);
            this.txt_cancellationStatusTxt.StyleController = this.layoutMx1;
            this.txt_cancellationStatusTxt.TabIndex = 235;
            // 
@@ -855,39 +849,39 @@
            // 
            this.txt_dptName.Location = new System.Drawing.Point(109, 40);
            this.txt_dptName.Name = "txt_dptName";
            this.txt_dptName.Size = new System.Drawing.Size(229, 24);
            this.txt_dptName.Size = new System.Drawing.Size(234, 24);
            this.txt_dptName.StyleController = this.layoutMx1;
            this.txt_dptName.TabIndex = 236;
            // 
            // txt_purchaseDate
            // 
            this.txt_purchaseDate.Location = new System.Drawing.Point(439, 40);
            this.txt_purchaseDate.Location = new System.Drawing.Point(444, 40);
            this.txt_purchaseDate.Name = "txt_purchaseDate";
            this.txt_purchaseDate.Size = new System.Drawing.Size(229, 24);
            this.txt_purchaseDate.Size = new System.Drawing.Size(235, 24);
            this.txt_purchaseDate.StyleController = this.layoutMx1;
            this.txt_purchaseDate.TabIndex = 237;
            // 
            // txt_docStusTxt
            // 
            this.txt_docStusTxt.Location = new System.Drawing.Point(1099, 12);
            this.txt_docStusTxt.Location = new System.Drawing.Point(1116, 12);
            this.txt_docStusTxt.Name = "txt_docStusTxt";
            this.txt_docStusTxt.Size = new System.Drawing.Size(231, 24);
            this.txt_docStusTxt.Size = new System.Drawing.Size(235, 24);
            this.txt_docStusTxt.StyleController = this.layoutMx1;
            this.txt_docStusTxt.TabIndex = 238;
            // 
            // txt_createDate
            // 
            this.txt_createDate.Location = new System.Drawing.Point(769, 68);
            this.txt_createDate.Location = new System.Drawing.Point(780, 68);
            this.txt_createDate.Name = "txt_createDate";
            this.txt_createDate.Size = new System.Drawing.Size(229, 24);
            this.txt_createDate.Size = new System.Drawing.Size(235, 24);
            this.txt_createDate.StyleController = this.layoutMx1;
            this.txt_createDate.TabIndex = 239;
            // 
            // txt_erpCheckDate
            // 
            this.txt_erpCheckDate.Location = new System.Drawing.Point(439, 68);
            this.txt_erpCheckDate.Location = new System.Drawing.Point(444, 68);
            this.txt_erpCheckDate.Name = "txt_erpCheckDate";
            this.txt_erpCheckDate.Size = new System.Drawing.Size(229, 24);
            this.txt_erpCheckDate.Size = new System.Drawing.Size(235, 24);
            this.txt_erpCheckDate.StyleController = this.layoutMx1;
            this.txt_erpCheckDate.TabIndex = 240;
            // 
@@ -895,7 +889,7 @@
            // 
            this.txt_erpCheckBy.Location = new System.Drawing.Point(109, 68);
            this.txt_erpCheckBy.Name = "txt_erpCheckBy";
            this.txt_erpCheckBy.Size = new System.Drawing.Size(229, 24);
            this.txt_erpCheckBy.Size = new System.Drawing.Size(234, 24);
            this.txt_erpCheckBy.StyleController = this.layoutMx1;
            this.txt_erpCheckBy.TabIndex = 241;
            // 
@@ -962,7 +956,7 @@
            rowDefinition1,
            rowDefinition2,
            rowDefinition3});
            this.Root.Size = new System.Drawing.Size(1342, 104);
            this.Root.Size = new System.Drawing.Size(1363, 104);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -970,38 +964,38 @@
            this.layoutControlItem1.Control = this.txt_billNo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(330, 28);
            this.layoutControlItem1.Size = new System.Drawing.Size(335, 28);
            this.layoutControlItem1.Text = "采购单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(85, 18);
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_documentTypeTxt;
            this.layoutControlItem5.Location = new System.Drawing.Point(330, 0);
            this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(330, 28);
            this.layoutControlItem5.Size = new System.Drawing.Size(336, 28);
            this.layoutControlItem5.Text = "单据类型";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(85, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_suppName;
            this.layoutControlItem2.Location = new System.Drawing.Point(660, 0);
            this.layoutControlItem2.Location = new System.Drawing.Point(671, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem2.Size = new System.Drawing.Size(330, 28);
            this.layoutControlItem2.Size = new System.Drawing.Size(336, 28);
            this.layoutControlItem2.Text = "供应商名称";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(85, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_suppNo;
            this.layoutControlItem6.Location = new System.Drawing.Point(660, 28);
            this.layoutControlItem6.Location = new System.Drawing.Point(671, 28);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem6.Size = new System.Drawing.Size(330, 28);
            this.layoutControlItem6.Size = new System.Drawing.Size(336, 28);
            this.layoutControlItem6.Text = "供应商编号";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(85, 18);
            // 
@@ -1011,72 +1005,72 @@
            this.layoutControlItem9.Location = new System.Drawing.Point(0, 28);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem9.Size = new System.Drawing.Size(330, 28);
            this.layoutControlItem9.Size = new System.Drawing.Size(335, 28);
            this.layoutControlItem9.Text = "采购部门";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(85, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_purchaseDate;
            this.layoutControlItem10.Location = new System.Drawing.Point(330, 28);
            this.layoutControlItem10.Location = new System.Drawing.Point(335, 28);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(330, 28);
            this.layoutControlItem10.Size = new System.Drawing.Size(336, 28);
            this.layoutControlItem10.Text = "采购日期";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(85, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_cancellationStatusTxt;
            this.layoutControlItem8.Location = new System.Drawing.Point(990, 56);
            this.layoutControlItem8.Location = new System.Drawing.Point(1007, 56);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem8.Size = new System.Drawing.Size(332, 28);
            this.layoutControlItem8.Size = new System.Drawing.Size(336, 28);
            this.layoutControlItem8.Text = "作废状态";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(85, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_closeStatusTxt;
            this.layoutControlItem7.Location = new System.Drawing.Point(990, 28);
            this.layoutControlItem7.Location = new System.Drawing.Point(1007, 28);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(332, 28);
            this.layoutControlItem7.Size = new System.Drawing.Size(336, 28);
            this.layoutControlItem7.Text = "关闭状态";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(85, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_docStusTxt;
            this.layoutControlItem11.Location = new System.Drawing.Point(990, 0);
            this.layoutControlItem11.Location = new System.Drawing.Point(1007, 0);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.Size = new System.Drawing.Size(332, 28);
            this.layoutControlItem11.Size = new System.Drawing.Size(336, 28);
            this.layoutControlItem11.Text = "单据状态";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(85, 18);
            // 
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_createDate;
            this.layoutControlItem12.Location = new System.Drawing.Point(660, 56);
            this.layoutControlItem12.Location = new System.Drawing.Point(671, 56);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(330, 28);
            this.layoutControlItem12.Size = new System.Drawing.Size(336, 28);
            this.layoutControlItem12.Text = "同步时间";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(85, 18);
            // 
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.txt_erpCheckDate;
            this.layoutControlItem13.Location = new System.Drawing.Point(330, 56);
            this.layoutControlItem13.Location = new System.Drawing.Point(335, 56);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem13.Size = new System.Drawing.Size(330, 28);
            this.layoutControlItem13.Size = new System.Drawing.Size(336, 28);
            this.layoutControlItem13.Text = "ERP审核时间";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(85, 18);
            // 
@@ -1086,7 +1080,7 @@
            this.layoutControlItem14.Location = new System.Drawing.Point(0, 56);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem14.Size = new System.Drawing.Size(330, 28);
            this.layoutControlItem14.Size = new System.Drawing.Size(335, 28);
            this.layoutControlItem14.Text = "ERP审核人";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(85, 18);
            // 
@@ -1190,8 +1184,6 @@
            this.gv_erpid.FieldName = "ebelnK3id";
            this.gv_erpid.MinWidth = 25;
            this.gv_erpid.Name = "gv_erpid";
            this.gv_erpid.Visible = true;
            this.gv_erpid.VisibleIndex = 1;
            this.gv_erpid.Width = 46;
            // 
            // gvMx1itemId
@@ -1211,7 +1203,7 @@
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 2;
            this.gridColumn2.VisibleIndex = 1;
            this.gridColumn2.Width = 46;
            // 
            // gridColumn1
@@ -1221,7 +1213,7 @@
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 3;
            this.gridColumn1.VisibleIndex = 2;
            this.gridColumn1.Width = 55;
            // 
            // gvMx1pricingQty
@@ -1253,7 +1245,7 @@
            this.gvMx1deliveryDate.Name = "gvMx1deliveryDate";
            this.gvMx1deliveryDate.Tag = "query_a.DELIVERY_DATE";
            this.gvMx1deliveryDate.Visible = true;
            this.gvMx1deliveryDate.VisibleIndex = 13;
            this.gvMx1deliveryDate.VisibleIndex = 12;
            this.gvMx1deliveryDate.Width = 92;
            // 
            // gvMx1earliestDeliveryDate
@@ -1265,7 +1257,7 @@
            this.gvMx1earliestDeliveryDate.Name = "gvMx1earliestDeliveryDate";
            this.gvMx1earliestDeliveryDate.Tag = "query_a.EARLIEST_DELIVERY_DATE";
            this.gvMx1earliestDeliveryDate.Visible = true;
            this.gvMx1earliestDeliveryDate.VisibleIndex = 14;
            this.gvMx1earliestDeliveryDate.VisibleIndex = 13;
            this.gvMx1earliestDeliveryDate.Width = 92;
            // 
            // gvMx1latestDeliveryDate
@@ -1277,7 +1269,7 @@
            this.gvMx1latestDeliveryDate.Name = "gvMx1latestDeliveryDate";
            this.gvMx1latestDeliveryDate.Tag = "query_a.LATEST_DELIVERY_DATE";
            this.gvMx1latestDeliveryDate.Visible = true;
            this.gvMx1latestDeliveryDate.VisibleIndex = 15;
            this.gvMx1latestDeliveryDate.VisibleIndex = 14;
            this.gvMx1latestDeliveryDate.Width = 92;
            // 
            // gvMx1purchaseQty
@@ -1289,7 +1281,7 @@
            this.gvMx1purchaseQty.Name = "gvMx1purchaseQty";
            this.gvMx1purchaseQty.Tag = "query_a.PURCHASE_QTY";
            this.gvMx1purchaseQty.Visible = true;
            this.gvMx1purchaseQty.VisibleIndex = 4;
            this.gvMx1purchaseQty.VisibleIndex = 3;
            this.gvMx1purchaseQty.Width = 25;
            // 
            // gvMx1purchaseUnit
@@ -1301,7 +1293,7 @@
            this.gvMx1purchaseUnit.Name = "gvMx1purchaseUnit";
            this.gvMx1purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
            this.gvMx1purchaseUnit.Visible = true;
            this.gvMx1purchaseUnit.VisibleIndex = 7;
            this.gvMx1purchaseUnit.VisibleIndex = 6;
            this.gvMx1purchaseUnit.Width = 25;
            // 
            // gvMx1inventoryUnit
@@ -1333,7 +1325,7 @@
            this.gvMx1isGift.Name = "gvMx1isGift";
            this.gvMx1isGift.Tag = "query_a.IS_GIFT";
            this.gvMx1isGift.Visible = true;
            this.gvMx1isGift.VisibleIndex = 8;
            this.gvMx1isGift.VisibleIndex = 7;
            this.gvMx1isGift.Width = 25;
            // 
            // gvMx1remarks
@@ -1345,7 +1337,7 @@
            this.gvMx1remarks.Name = "gvMx1remarks";
            this.gvMx1remarks.Tag = "query_a.REMARKS";
            this.gvMx1remarks.Visible = true;
            this.gvMx1remarks.VisibleIndex = 9;
            this.gvMx1remarks.VisibleIndex = 8;
            this.gvMx1remarks.Width = 46;
            // 
            // gvMx1businessTerminate
@@ -1357,7 +1349,7 @@
            this.gvMx1businessTerminate.Name = "gvMx1businessTerminate";
            this.gvMx1businessTerminate.Tag = "query_a.BUSINESS_TERMINATE";
            this.gvMx1businessTerminate.Visible = true;
            this.gvMx1businessTerminate.VisibleIndex = 10;
            this.gvMx1businessTerminate.VisibleIndex = 9;
            this.gvMx1businessTerminate.Width = 25;
            // 
            // gvMx1businessClose
@@ -1369,7 +1361,7 @@
            this.gvMx1businessClose.Name = "gvMx1businessClose";
            this.gvMx1businessClose.Tag = "query_a.BUSINESS_CLOSE";
            this.gvMx1businessClose.Visible = true;
            this.gvMx1businessClose.VisibleIndex = 11;
            this.gvMx1businessClose.VisibleIndex = 10;
            this.gvMx1businessClose.Width = 25;
            // 
            // gvMx1businessFreeze
@@ -1381,7 +1373,7 @@
            this.gvMx1businessFreeze.Name = "gvMx1businessFreeze";
            this.gvMx1businessFreeze.Tag = "query_a.BUSINESS_FREEZE";
            this.gvMx1businessFreeze.Visible = true;
            this.gvMx1businessFreeze.VisibleIndex = 12;
            this.gvMx1businessFreeze.VisibleIndex = 11;
            this.gvMx1businessFreeze.Width = 25;
            // 
            // gvMx1freezer
@@ -1491,7 +1483,7 @@
            this.gvMx1remainingStoredQty.Name = "gvMx1remainingStoredQty";
            this.gvMx1remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY";
            this.gvMx1remainingStoredQty.Visible = true;
            this.gvMx1remainingStoredQty.VisibleIndex = 5;
            this.gvMx1remainingStoredQty.VisibleIndex = 4;
            this.gvMx1remainingStoredQty.Width = 32;
            // 
            // gvMx1returnableReceivedQty
@@ -1531,7 +1523,7 @@
            this.gridColumn20.MinWidth = 25;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 6;
            this.gridColumn20.VisibleIndex = 5;
            this.gridColumn20.Width = 94;
            // 
            // gvMx1returnableStoredQty
@@ -1603,7 +1595,7 @@
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 16;
            this.gridColumn8.VisibleIndex = 15;
            this.gridColumn8.Width = 43;
            // 
            // gridColumn9
@@ -1613,7 +1605,7 @@
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 17;
            this.gridColumn9.VisibleIndex = 16;
            this.gridColumn9.Width = 94;
            // 
            // gridColumn19
@@ -1623,7 +1615,7 @@
            this.gridColumn19.MinWidth = 25;
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Visible = true;
            this.gridColumn19.VisibleIndex = 18;
            this.gridColumn19.VisibleIndex = 17;
            this.gridColumn19.Width = 94;
            // 
            // rptHistory
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
@@ -146,7 +146,7 @@
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        /// <summary>
@@ -160,7 +160,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            var _obj = new
@@ -216,12 +216,12 @@
                }
                else
                {
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }