Merge branch 'master' of http://43.142.96.171:8080/r/~cnf/JH/JH_MesCilent

huawei

2025-12-04 0bd6795c9962fcbc3b332a4fe0f42276bd484c4f

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs

@@ -1,5 +1,6 @@
using DevExpress.XtraEditors;
using DevExpress.XtraPrinting.Native;
using Gs.DevApp.DevFrm.WOM;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -315,23 +316,39 @@
        /// <param name="e"></param>
        private void ToolBarMenu1_btnPrintClick(object sender, EventArgs e)
        {
            //guidKey, rptParameter
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_fBillNo, gridView1, "fBillNo");
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1);
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.ShowError("请先选择你要操作的行！");
                this.toolBarMenu1.rptParameter = "return false";
                MsgHelper.Warning("请先选择你要打印的单据！");
                return;
            }
            this.toolBarMenu1.rptParameter = "rpt_sdzjdb{"
                                               + "100"
                                               + "," + ""
                                               + "," + ""
                                               + "," + ""
                                               + "," + ""
                                               + "}";
            this.toolBarMenu1.guidKey = rowGuid;
            Frm_MesDbck_Print_Select frm = new Frm_MesDbck_Print_Select(rowGuid);
            DialogResult result = frm.ShowDialog();
            if (result == DialogResult.Cancel || result == DialogResult.None)
            {
                // 用户点击了取消按钮或直接关闭窗口
                this.toolBarMenu1.rptParameter = "return false";
            }

            ////guidKey, rptParameter
            //string rowGuid, rowName;
            //(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
            //    lbGuid, txt_fBillNo, gridView1, "fBillNo");
            //if (string.IsNullOrEmpty(rowGuid))
            //{
            //    MsgHelper.ShowError("请先选择你要操作的行！");
            //    return;
            //}
            //this.toolBarMenu1.rptParameter = "rpt_sdzjdb{"
            //                                   + "100"
            //                                   + "," + ""
            //                                   + "," + ""
            //                                   + "," + ""
            //                                   + "," + ""
            //                                   + "}";
            //this.toolBarMenu1.guidKey = rowGuid;

        }