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

cdk

2025-11-01 cbb5315301b1490b57497212256c5255e5eb7eb6

 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs

@@ -1,4 +1,3 @@
using DevExpress.XtraEditors;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sales;
using Gs.DevApp.Entity;
@@ -34,6 +33,7 @@
            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
@@ -110,8 +110,46 @@
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
            };
            //全部打印
            ucBtnPrintAll1.btnPrintClick += (s, e) =>
            {
                this.ucBtnPrintAll1.rptType = "";
                this.ucBtnPrintAll1.mxList = null;
                if (string.IsNullOrEmpty(lbGuid.Text.Trim()))
                {
                    MsgHelper.ShowError("提示：打印前请先保存单据！");
                    return;
                }
                getModel(lbGuid.Text.Trim());
                List<dynamic> lst = new List<dynamic>();
                DataTable dt = (DataTable)gcMx1.DataSource;
                foreach (DataRow row in dt.Rows)
                {
                    string guid = row["guid"].ToString();
                    string psnQty = row["kdy"].ToString();
                    if (string.IsNullOrEmpty(psnQty))
                    {
                        continue;
                    }
                    if (psnQty == "0")
                    {
                        continue;
                    }
                    lst.Add(new
                    {
                        guid = guid,
                        kdy = psnQty,
                    });
                }
                if (lst.Count <= 0)
                {
                    MsgHelper.ShowError("提示：暂无可打印的物料！");
                    return;
                }
                this.ucBtnPrintAll1.rptType = "rpt_Xsth";
                this.ucBtnPrintAll1.mxList = lst;
            };
            #endregion

            //销售组织
            txt_salesOrg.EditChanged += (s, e) =>
            {
@@ -283,6 +321,7 @@
                setSrm();
            };
        }

        /// <summary>
        /// 打印
        /// </summary>
@@ -788,8 +827,16 @@
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }


        /// <summary>
        /// 完结
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
        {
            _toolCk(2);
        }
        /// <summary>
        ///     审核事件
        /// </summary>
@@ -826,6 +873,9 @@
                case 0:
                    strMsg = "反审核";
                    break;
                case 2:
                    strMsg = "完结";
                    break;
            }
            ;
            toolBarMenu1.guidKey = "";