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

cdk

2025-11-01 cbb5315301b1490b57497212256c5255e5eb7eb6

 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs

@@ -36,6 +36,7 @@
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            toolBarMenu1.btnPingZhiClick += ToolBarMenu1_btnPingZhiClick;
            toolBarMenu1.btnFPingZhiClick += ToolBarMenu1_btnFPingZhiClick;
            toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -218,6 +219,9 @@
            #endregion

        }

    

        /// <summary>
        /// 打印
        /// </summary>
@@ -308,7 +312,16 @@
            _filterList = e.FilterList;
            getPageList(1);
        }

        /// <summary>
        /// 完结
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
        {
            _toolCk(199);
        }
        /// <summary>
        /// 批准
        /// </summary>
@@ -804,6 +817,9 @@
                case 5:
                    strMsg = "品质反审核";
                    break;
                case 199:
                    strMsg = "完结";
                    break;
            }
            ;
            toolBarMenu1.guidKey = "";