销售，委外增加完结

lu

2025-10-31 0ca800b9c2670e05f672d5472a9e2200533334ec

销售，委外增加完结

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

@@ -32,6 +32,7 @@
            toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick;
            toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick;
            toolBarMenu1.btnPrintClick += ToolBarMenu1_btnPrintClick;
            toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
@@ -105,8 +106,8 @@
                            _row["kcQty"] = dym.kcQty; //库存数量
                            _row["depotId"] = dym.depotId; //库存数量
                            _row["depotName"] = dym.depotName; //库存数量
                            _row["yjfhDate"] = DateTime.Now.ToString("yyyy-MM-dd"); 
                             _row["fEntrynote"] = dym.entryNote; ; 
                            _row["yjfhDate"] = DateTime.Now.ToString("yyyy-MM-dd");
                            _row["fEntrynote"] = dym.entryNote; ;
                            _Table.Rows.Add(_row);
                        }
                        gcMx1.BindingContext = new BindingContext();
@@ -126,6 +127,8 @@
                frm.ShowDialog();
            };
        }


        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -525,6 +528,12 @@
            }
        }


        private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
        {
            _toolCk(2);
        }

        /// <summary>
        /// 财务审核
        /// </summary>
@@ -581,14 +590,16 @@
                case 0:
                    strMsg = "反审核";
                    break;
                case 2:
                    strMsg = "完结";
                    break;
                case 30:
                    strMsg = "财务审核";
                    break;
                case 31:
                    strMsg = "财务反审核";
                    break;
            }
            ;
            };
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
@@ -712,6 +723,6 @@
            frm.ShowDialog();
        }

     

    }
}

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

@@ -1,5 +1,3 @@
using DevExpress.Utils.VisualEffects;
using DevExpress.XtraEditors;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sales;
using Gs.DevApp.Entity;
@@ -10,8 +8,6 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;

@@ -37,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);
@@ -153,7 +150,6 @@
                this.ucBtnPrintAll1.mxList = lst;
            };
            #endregion

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


        /// <summary>
        /// 打印
@@ -832,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>
@@ -870,6 +873,9 @@
                case 0:
                    strMsg = "反审核";
                    break;
                case 2:
                    strMsg = "完结";
                    break;
            }
            ;
            toolBarMenu1.guidKey = "";