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

cdk

2025-11-01 cbb5315301b1490b57497212256c5255e5eb7eb6

 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");
@@ -711,5 +722,7 @@
            };
            frm.ShowDialog();
        }


    }
}