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

lu

2025-08-27 98267f9dfb90aa98eb55e7abeabc52d3f8a5b694

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

@@ -40,6 +40,7 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            btnFZ.Click += btnFZ_Click;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
            {
@@ -52,11 +53,6 @@
            {
                getPageList(this.pageBar1.CurrentPage);
            }, lbGuid);
            // 延迟调用 getXmlConfig，确保 GridView 完全初始化后再恢复布局
            this.Load += (s, e) =>
            {
                this.toolBarMenu1.getXmlConfig();
            };
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            txt_DAA001.EditValueChanged += txt_DAA001_EditValueChanged;
@@ -64,7 +60,8 @@
            //选择需要入库的明细
            btnSelect.Click += (s, e) =>
            {
                var frm = new SelectSTAFF();
                var orgId = txt_OrgId.GetId();
                var frm = new SelectSTAFF(orgId);
                //赋值给明细表
                frm.UpdateParent += (ss, ee) =>
                {
@@ -373,6 +370,7 @@
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMain1, gridView1);
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gridControl1, gridView2);
            txt_ErrorType.EditValue = "计时工时";
            string deftOrg = UtilityHelper.GetFirstOrg(txt_OrgId);
            GetTimeType();
            GetWOMDAAInfo();
        }
@@ -391,6 +389,7 @@
                getModel(rowGuid);
            GetTimeType();
            GetWOMDAAInfo();
            txt_OrgId.IsReadly = true;
        }

        /// <summary>
@@ -425,6 +424,7 @@
                remark = txt_Remark.Text.Trim(),//说明
                DAA001 = txt_DAA001.Text.Trim(),//工单号
                DAAType = txt_DAAType.Text.Trim(),//工单类型
                OrgId = txt_OrgId.GetId().Trim(),//工单类型
                list = new List<dynamic>(),
            };
            gridView2.CloseEditor();
@@ -509,8 +509,12 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "", "", "", _sbSqlWhere.ToString());
            gcMain1.DataSource = null;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and a.OrgId in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "desc", "", _sbSqlWhere.ToString());
            var json = JsonConvert.SerializeObject(pgq);
            try
            {