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

@@ -29,13 +29,6 @@
        {
            InitializeComponent();

            // 添加序号显示（使用行指示器）
            gridView2.IndicatorWidth = 60;
            gridView2.CustomDrawRowIndicator += (s, e) =>
            {
                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
            };
            gridView2.CellValueChanged += gridView2_CellValueChanged;
            this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
            this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
@@ -48,6 +41,7 @@
            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) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -61,11 +55,13 @@
            }, lbGuid);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            txt_DAA001.EditValueChanged += txt_DAA001_EditValueChanged;

            //选择需要入库的明细
            btnSelect.Click += (s, e) =>
            {
                var frm = new SelectSTAFF();
                var orgId = txt_OrgId.GetId();
                var frm = new SelectSTAFF(orgId);
                //赋值给明细表
                frm.UpdateParent += (ss, ee) =>
                {
@@ -298,7 +294,7 @@
        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
        {
            string rowGuid = "", rowName = "";
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "errorNo");
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_ErrorNo, gridView1, "errorNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
@@ -374,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();
        }
@@ -392,6 +389,7 @@
                getModel(rowGuid);
            GetTimeType();
            GetWOMDAAInfo();
            txt_OrgId.IsReadly = true;
        }

        /// <summary>
@@ -426,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();
@@ -441,7 +440,6 @@
                var row = gridView2.GetDataRow(i);
                if (row != null)
                {
                    Guid? _guid = UtilityHelper.ToGuid(row["id"].ToString());
                    if (string.IsNullOrEmpty(row["staffId"].ToString()))
                    {
                        MsgHelper.ShowError("员工不能为空！");
@@ -465,8 +463,8 @@

                    _obj.list.Add(new
                    {
                        Guid = _guid,
                        ID = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["id"].ToString()),
                        Guid = "",
                        ID = "",
                        Staff_Id = row["staffId"].ToString(),
                        Staff_No = row["staffNo"].ToString(),
                        Staff_Name = row["staffName"].ToString(),
@@ -511,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
            {
@@ -631,7 +633,7 @@
            ;
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "errorNo");
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_ErrorNo, gridView1, "errorNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
@@ -771,5 +773,24 @@
            }
            gridView2.RefreshData();
        }

        /// <summary>
        /// 工单下拉框选择事件
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void txt_DAA001_EditValueChanged(object sender, EventArgs e)
        {
            SearchLookUpEdit lookupEdit = sender as SearchLookUpEdit;
            DataRowView selectedDataRow = (DataRowView)lookupEdit.GetSelectedDataRow();
            if (selectedDataRow != null)
            {
                txt_DAAType.Text = selectedDataRow["工单类型"].ToString();
            }
            else
            {
                txt_DAAType.Text = "";
            }
        }
    }
}