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

lu

4 天以前 1c8df1e24fcf4a18c1d96ec6f6821d24313d73aa

 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesAttanCon.cs

@@ -167,11 +167,13 @@
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView2);
                        // 保存原始值
                        SaveOriginalValues();
                        SetGridView2EditState(false);
                    }
                    else
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gridControl2, gridView2);
                        _originalValues.Clear();
                        SetGridView2EditState(false);
                    }

                    JArray array2 = new JArray();
@@ -229,6 +231,7 @@
        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
        {
           // Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
            SetGridView2EditState(false);
        }

        /// <summary>
@@ -374,6 +377,20 @@
        {
            // 其它需要的UI状态切换
            //Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
            SetGridView2EditState(true);

        }

        private void SetGridView2EditState(bool editable)
        {
            // 在岗
            var colHour = gridView2.Columns["hour"];
            if (colHour != null)
                colHour.OptionsColumn.AllowEdit = editable;
            // 修改原因
            var colReason = gridView2.Columns["reason"];
            if (colReason != null)
                colReason.OptionsColumn.AllowEdit = editable;
        }

        /// <summary>
@@ -445,6 +462,7 @@
                    ToolBox.MsgHelper.ShowInformation("保存成功！");
                    getPageList();
                    toolBarMenu1.isSetBtn = true;
                    SetGridView2EditState(false);
                }
                else
                {
@@ -490,7 +508,22 @@
                    strMsg = "反审核";
                    break;
            }
    ;
            if (_inFieldValue == 1)
            {
                string confirmMsg = $"是否审核 产线号：{lineNo}，日期：{date}？";
                if (MessageBox.Show(confirmMsg, "审核确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
                {
                    return;
                }
            }
            else
            {
                string confirmMsg = $"是否反审核 产线号：{lineNo}，日期：{date}？";
                if (MessageBox.Show(confirmMsg, "审核确认", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
                {
                    return;
                }
            }
            toolBarMenu1.guidKey = "";
            var _obj = new
            {