1、erp推送报表2、其他新增显示字段

kyy

2025-11-25 91777cd07bb42802b2ac730cc6c35750ab7cc69e

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs

@@ -53,80 +53,50 @@

            #region 打印相关 2025-10-18 

            // -------------------- gvMx1 打印事件 --------------------
            //浏览打印事件
            this.ucBtnPrint1.btnPrintClick += (s, e) =>
            {
                  _print(0);
                _print(0);
              
            };
           
            //直接打印事件
            this.ucBtnPrint1.btnZhiJieClick += (s, e) =>
            {
                _print(1);
            };

            //打印批量操作事件
            this.ucBtnPrint1.btnAllClick += (s, e) =>
            {
                string rowGuid = lbMxGuid.Text.Trim();
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "采购入库");
                string strCodeList = "";
                string strAction = "";
                frm.UpdateParent += (ss, ee) =>
                {
                    strCodeList = ee.StringSingle;
                    strAction = ee.Data;
                };
                frm.ShowDialog();
                if (string.IsNullOrEmpty(strCodeList))
                    return;
                if (strAction == "print")
                {
                    try
                    {
                        string rptParameter = "rpt_Arrival{"
                        + "100"//重打都是传100，
                        + "," + ""
                        + "," + ""
                        + "," + ""
                        + "," + ""
                        + "," + strCodeList
                        + "}";
                        using (Form rpt = new RptPreview(rowGuid, rptParameter))
                        {
                            rpt.ShowDialog();
                        }
                        frm.Close();
                    }
                    catch (Exception ex)
                    {
                        MsgHelper.ShowError(ex.Message);
                    }
                }

                _print100(rowGuid, frm);//重打都是传100，  
            };

            //直接打印事件
            this.ucBtnPrint1.btnZhiJieClick += (s, e) =>
            {
                  _print(1);
          
            };
      

            // -------------------- gvMx3 打印事件 --------------------
            this.ucBtnPrint2.btnPrintClick += (s, e) =>
            {
                _print2(0);
            };

            //直接打印事件
            this.ucBtnPrint2.btnZhiJieClick += (s, e) =>
            {
                _print2(1);

            };

            // gvMx3 批量打印事件
            // gvMx1 1打印事件
            this.ucBtnPrint2.btnAllClick += (s, e) =>
            {
                // string rowGuid = lbMxGuid3.Text.Trim(); // 使用gvMx3的GUID
                string rowGuid = txt_releaseNo.Text.Trim();
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "到货条码（合并）码"); // 标题区分来源


              //  _print100(rowGuid, frm);//重打都是传100，


                string strCodeList = "";
                string strAction = "";
                frm.UpdateParent += (ss, ee) =>
@@ -161,68 +131,36 @@
                    }
                }


            };
            // --------------------gvMx3 ucBtnPrintOne1 批量打印事件（优化版）--------------------

            // --------------------gvMx1 ucBtnPrintOne1  明细打印事件（优化版）--------------------

            //一键打印事件
            this.ucBtnPrintOne1.btnPrintClick += (s, e) =>
            {
                string mainGuid = lbGuid.Text.Trim();
                ucBtnPrintOne1.guidKey = mainGuid;
                this.ucBtnPrintOne1.rptParameter = "rpt_Arrival{"
                     + "101"//一键打印101
                     + "," + ""
                     + "," + ""
                     + "," + ""
                     + "," + ""
                     + "}";

                txt_iCount_1.Text = "";
                txt_psnQty_1.Text = "";
                _print3(101); //一键打印101
            };

       
            this.ucBtnPrintOne1.btnAllClick += (s, e) =>
            {
                string mainGuid = lbGuid.Text.Trim();
                SelectDeleteBar frm = new SelectDeleteBar(mainGuid, "批量条码"); // 标题区分来源
                string strCodeList = "";
                string strAction = "";
                frm.UpdateParent += (ss, ee) =>
                {
                    strCodeList = ee.StringSingle;
                    strAction = ee.Data;
                };
                frm.ShowDialog();
                if (string.IsNullOrEmpty(strCodeList))
                    return;
                if (strAction == "print")
                {
                    try
                    {
                        string rptParameter = "rpt_Arrival{"
                        + "100"//重打都是传100，
                        + "," + ""
                        + "," + ""
                        + "," + ""
                        + "," + ""
                        + "," + strCodeList
                        + "}";
                        using (Form rpt = new RptPreview(mainGuid, rptParameter))
                        {
                            rpt.ShowDialog();
                        }
                        frm.Close();
                    }
                    catch (Exception ex)
                    {
                        MsgHelper.ShowError(ex.Message);
                    }
                }
                _print100(mainGuid, frm);//重打都是传100，
            };

            // --------------------gvMx3 ucBtnPrintOne2 合并批量打印事件（优化版）--------------------


            //一键打印事件
            this.ucBtnPrintOne2.btnPrintClick += (s, e) =>
            {
                _print4(102); //一键合并打印102
            };
            this.ucBtnPrintOne2.btnAllClick += (s, e) =>
            {
                string mainGuid = lbGuid.Text.Trim();
                SelectDeleteBar frm = new SelectDeleteBar(mainGuid, "批量条码"); // 标题区分来源
                _print100(mainGuid, frm);//重打都是传100，
            };

            //明细行切换事件
            // 关键：绑定gvMx1和gvMx3的焦点行变化事件
@@ -339,7 +277,6 @@
            txt_iCount_1.Text = "";
            txt_psnQty_1.Text = "";
        }

        private void _print2(int type)
        {
            string rowGuid = txt_releaseNo.Text.Trim(); // 新增lbMxGuid3用于存储gvMx3的选中行GUID
@@ -380,7 +317,74 @@
            txt_iCount_2.Text = "";
            txt_psnQty_2.Text = "";
        }
        private void _print3(int type)
        {
            string mainGuid = lbGuid.Text.Trim();
            ucBtnPrintOne1.guidKey = mainGuid;
            this.ucBtnPrintOne1.rptParameter = "rpt_Arrival{"
            + type
            + "," + ""
            + "," + ""
            + "," + ""
            + "," + ""
            + "}";

            txt_iCount_1.Text = "";
            txt_psnQty_1.Text = "";
        }
        private void _print4(int type)
        {
            string mainGuid = lbGuid.Text.Trim();
            ucBtnPrintOne2.guidKey = mainGuid;
            this.ucBtnPrintOne2.rptParameter = "rpt_Arrival{"
            + type
            + "," + ""
            + "," + ""
            + "," + ""
            + "," + ""
            + "}";

            txt_iCount_1.Text = "";
            txt_psnQty_1.Text = "";
        }
        private void _print100(string mainGuid, SelectDeleteBar frm)
        {
          
            string strCodeList = "";
            string strAction = "";
            frm.UpdateParent += (ss, ee) =>
            {
                strCodeList = ee.StringSingle;
                strAction = ee.Data;
            };
            frm.ShowDialog();
            if (string.IsNullOrEmpty(strCodeList))
                return;
            if (strAction == "print")
            {
                try
                {
                    string rptParameter = "rpt_Arrival{"
                    + "100"//重打都是传100，
                    + "," + ""
                    + "," + ""
                    + "," + ""
                    + "," + ""
                    + "," + strCodeList
                    + "}";
                    using (Form rpt = new RptPreview(mainGuid, rptParameter))
                    {
                        rpt.ShowDialog();
                    }
                    frm.Close();
                }
                catch (Exception ex)
                {
                    MsgHelper.ShowError(ex.Message);
                }
            }
        }
      
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);