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

lu

2025-09-11 7ac3c37eb27c253923a07a0d9fb4b66bbdaf603a

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

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs

@@ -30,6 +30,7 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "status", "", (value) =>
@@ -175,6 +176,27 @@
                lbGuid, txt_billNo, gridView1);
            toolBarMenu1.guidKey = rowGuid;
        }
        private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
        {
            //guidKey, rptParameter
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_billNo, gridView1, "billNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            this.toolBarMenu1.rptParameter = "rpt_CGTH{"
                                               + ""
                                               + "," + ""
                                               + "," + ""
                                               + "," + ""
                                               + "," + ""
                                               + "}";
            this.toolBarMenu1.guidKey = rowGuid;

        }
        /// <summary>
        /// 分页事件
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSqDj.cs

@@ -80,6 +80,7 @@
            _filterList = e.FilterList;
            getPageList(1);
        }

        /// <summary>
        ///     审核事件
        /// </summary>

 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs

@@ -32,6 +32,7 @@
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick;
            toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick;
            toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
@@ -160,6 +161,28 @@
            getPageList(1);
        }

        private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
        {
            //guidKey, rptParameter
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_billNo, gridView1, "billNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            this.toolBarMenu1.rptParameter = "rpt_XSCK{"
                                               + ""
                                               + "," + ""
                                               + "," + ""
                                               + "," + ""
                                               + "," + ""
                                               + "}";
            this.toolBarMenu1.guidKey = rowGuid;

        }

        /// <summary>
        /// 取消事件
        /// </summary>