Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

lu

8 天以前 7f7b09f2cb3dbbdfe4a4bf078bfcde6cfbe76595

 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs

@@ -79,7 +79,11 @@
                        }

                        DataTable _newTable = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                        DataTable _oldTable = _newTable.Clone();
                        DataTable _oldTable = gridControl1.DataSource as DataTable;
                        if (_oldTable == null)
                        {
                            _oldTable = _newTable.Clone();
                        }
                        DataRow[] sourceRows = _newTable.Select();
                        for (int i = 0; i < sourceRows.Length; i++)
                        {
@@ -285,7 +289,7 @@
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "guid");
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "errorNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
@@ -618,7 +622,7 @@
            ;
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "guid");
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "errorNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");