From d7a2307850e66392812366949af8eccad3c97545 Mon Sep 17 00:00:00 2001 From: cyf Date: Fri, 27 Jun 2025 01:58:24 +0000 Subject: [PATCH] SVN r795 SVN-Revision: r795 --- .../BillModule.Designer.cs | 95 ++++++++++--------- 插件库/Lskj.PubBillSpecial/BillModule.cs | 37 +++++--- 2 files changed, 70 insertions(+), 62 deletions(-) diff --git a/插件库/Lskj.PubBillSpecial/BillModule.Designer.cs b/插件库/Lskj.PubBillSpecial/BillModule.Designer.cs index 475d8b1..2ae66e9 100644 --- a/插件库/Lskj.PubBillSpecial/BillModule.Designer.cs +++ b/插件库/Lskj.PubBillSpecial/BillModule.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); this.ssc_main = new DevExpress.XtraEditors.SplitContainerControl(); this.ssc_main_top = new DevExpress.XtraEditors.SplitContainerControl(); this.pl_main = new DevExpress.XtraEditors.PanelControl(); @@ -40,7 +41,7 @@ this.pl_treeview_detault_search = new DevExpress.XtraEditors.PanelControl(); this.panelControl4 = new DevExpress.XtraEditors.PanelControl(); this.textEdit1 = new DevExpress.XtraEditors.TextEdit(); - this.barManager1 = new DevExpress.XtraBars.BarManager(); + this.barManager1 = new DevExpress.XtraBars.BarManager(this.components); this.barDockControl1 = new DevExpress.XtraBars.BarDockControl(); this.barDockControl2 = new DevExpress.XtraBars.BarDockControl(); this.barDockControl3 = new DevExpress.XtraBars.BarDockControl(); @@ -75,11 +76,11 @@ this.rdRed = new System.Windows.Forms.RadioButton(); this.pl_blue = new DevExpress.XtraEditors.PanelControl(); this.rdBlue = new System.Windows.Forms.RadioButton(); - this.pMprint = new DevExpress.XtraBars.PopupMenu(); - this.pmFP = new DevExpress.XtraBars.PopupMenu(); - this.pmBillExp = new DevExpress.XtraBars.PopupMenu(); - this.pmBill = new DevExpress.XtraBars.PopupMenu(); - this.pMenu = new DevExpress.XtraBars.PopupMenu(); + this.pMprint = new DevExpress.XtraBars.PopupMenu(this.components); + this.pmFP = new DevExpress.XtraBars.PopupMenu(this.components); + this.pmBillExp = new DevExpress.XtraBars.PopupMenu(this.components); + this.pmBill = new DevExpress.XtraBars.PopupMenu(this.components); + this.pMenu = new DevExpress.XtraBars.PopupMenu(this.components); this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); this.backgroundWorker2 = new System.ComponentModel.BackgroundWorker(); ((System.ComponentModel.ISupportInitialize)(this.ssc_main)).BeginInit(); @@ -163,7 +164,7 @@ this.ssc_main_top.Panel1.Text = "Panel1"; this.ssc_main_top.Panel2.Controls.Add(this.pl_main); this.ssc_main_top.Panel2.Text = "Panel2"; - this.ssc_main_top.Size = new System.Drawing.Size(1511, 722); + this.ssc_main_top.Size = new System.Drawing.Size(1511, 725); this.ssc_main_top.SplitterPosition = 1; this.ssc_main_top.TabIndex = 1; this.ssc_main_top.Text = "splitContainerControl1"; @@ -179,7 +180,7 @@ this.pl_main.Dock = System.Windows.Forms.DockStyle.Fill; this.pl_main.Location = new System.Drawing.Point(0, 0); this.pl_main.Name = "pl_main"; - this.pl_main.Size = new System.Drawing.Size(1502, 722); + this.pl_main.Size = new System.Drawing.Size(1505, 725); this.pl_main.TabIndex = 1; // // pl_main_center @@ -190,9 +191,9 @@ this.pl_main_center.Controls.Add(this.pl_main_center_detail); this.pl_main_center.Controls.Add(this.splitMainControl); this.pl_main_center.Dock = System.Windows.Forms.DockStyle.Fill; - this.pl_main_center.Location = new System.Drawing.Point(3, 41); + this.pl_main_center.Location = new System.Drawing.Point(2, 40); this.pl_main_center.Name = "pl_main_center"; - this.pl_main_center.Size = new System.Drawing.Size(1496, 615); + this.pl_main_center.Size = new System.Drawing.Size(1501, 620); this.pl_main_center.TabIndex = 2; // // pl_main_center_detail @@ -204,7 +205,7 @@ this.pl_main_center_detail.Dock = System.Windows.Forms.DockStyle.Fill; this.pl_main_center_detail.Location = new System.Drawing.Point(0, 215); this.pl_main_center_detail.Name = "pl_main_center_detail"; - this.pl_main_center_detail.Size = new System.Drawing.Size(1496, 400); + this.pl_main_center_detail.Size = new System.Drawing.Size(1501, 405); this.pl_main_center_detail.TabIndex = 26; // // gcMain @@ -216,7 +217,7 @@ this.gcMain.Margin = new System.Windows.Forms.Padding(5); this.gcMain.Name = "gcMain"; this.gcMain.SiftEnumObj = Lskj.Control.GridControlEx.HeaderSiftEnum.Sum; - this.gcMain.Size = new System.Drawing.Size(1496, 400); + this.gcMain.Size = new System.Drawing.Size(1501, 405); this.gcMain.TabIndex = 0; // // splitMainControl @@ -228,7 +229,7 @@ this.splitMainControl.Panel1.Controls.Add(this.pl_Right); this.splitMainControl.Panel1.Text = "Panel1"; this.splitMainControl.Panel2.Text = "Panel2"; - this.splitMainControl.Size = new System.Drawing.Size(1496, 215); + this.splitMainControl.Size = new System.Drawing.Size(1501, 215); this.splitMainControl.SplitterPosition = 636; this.splitMainControl.TabIndex = 25; this.splitMainControl.Text = "splitContainerControl1"; @@ -276,7 +277,7 @@ this.panelControl4.Location = new System.Drawing.Point(0, 0); this.panelControl4.Name = "panelControl4"; this.panelControl4.Padding = new System.Windows.Forms.Padding(2, 4, 2, 0); - this.panelControl4.Size = new System.Drawing.Size(0, 9); + this.panelControl4.Size = new System.Drawing.Size(0, 6); this.panelControl4.TabIndex = 25; // // textEdit1 @@ -287,7 +288,7 @@ this.textEdit1.Name = "textEdit1"; this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("宋体", 10F); this.textEdit1.Properties.Appearance.Options.UseFont = true; - this.textEdit1.Size = new System.Drawing.Size(0, 26); + this.textEdit1.Size = new System.Drawing.Size(0, 20); this.textEdit1.TabIndex = 5; // // barManager1 @@ -336,13 +337,13 @@ this.lceCombobox.FontSize = 0F; this.lceCombobox.LabelText = "查询"; this.lceCombobox.Location = new System.Drawing.Point(2, 4); - this.lceCombobox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.lceCombobox.Margin = new System.Windows.Forms.Padding(4); this.lceCombobox.Model = null; this.lceCombobox.Name = "lceCombobox"; this.lceCombobox.NullText = ""; this.lceCombobox.ReadOnly = false; this.lceCombobox.Required = false; - this.lceCombobox.Size = new System.Drawing.Size(111, 5); + this.lceCombobox.Size = new System.Drawing.Size(111, 2); this.lceCombobox.TabIndex = 4; // // panelControl3 @@ -350,10 +351,10 @@ this.panelControl3.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; this.panelControl3.Controls.Add(this.btnTreeSearch); this.panelControl3.Dock = System.Windows.Forms.DockStyle.Right; - this.panelControl3.Location = new System.Drawing.Point(-245, 0); + this.panelControl3.Location = new System.Drawing.Point(-271, 0); this.panelControl3.Name = "panelControl3"; this.panelControl3.Padding = new System.Windows.Forms.Padding(3); - this.panelControl3.Size = new System.Drawing.Size(324, 9); + this.panelControl3.Size = new System.Drawing.Size(324, 6); this.panelControl3.TabIndex = 25; // // btnTreeSearch @@ -364,7 +365,7 @@ this.btnTreeSearch.Dock = System.Windows.Forms.DockStyle.Right; this.btnTreeSearch.Location = new System.Drawing.Point(261, 3); this.btnTreeSearch.Name = "btnTreeSearch"; - this.btnTreeSearch.Size = new System.Drawing.Size(60, 3); + this.btnTreeSearch.Size = new System.Drawing.Size(60, 0); this.btnTreeSearch.TabIndex = 21; this.btnTreeSearch.Text = "查询"; // @@ -405,9 +406,9 @@ this.pl_main_bottom.Controls.Add(this.btnDelete); this.pl_main_bottom.Controls.Add(this.btnBillSave); this.pl_main_bottom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pl_main_bottom.Location = new System.Drawing.Point(3, 656); + this.pl_main_bottom.Location = new System.Drawing.Point(2, 660); this.pl_main_bottom.Name = "pl_main_bottom"; - this.pl_main_bottom.Size = new System.Drawing.Size(1496, 63); + this.pl_main_bottom.Size = new System.Drawing.Size(1501, 63); this.pl_main_bottom.TabIndex = 1; // // btnPrint @@ -416,7 +417,7 @@ this.btnPrint.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnPrint.Appearance.Font = new System.Drawing.Font("宋体", 10F); this.btnPrint.Appearance.Options.UseFont = true; - this.btnPrint.Location = new System.Drawing.Point(1413, 11); + this.btnPrint.Location = new System.Drawing.Point(1418, 11); this.btnPrint.Name = "btnPrint"; this.btnPrint.Size = new System.Drawing.Size(80, 40); this.btnPrint.TabIndex = 30; @@ -443,7 +444,7 @@ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.cb_templete.Properties.DropDownRows = 8; this.cb_templete.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.cb_templete.Size = new System.Drawing.Size(133, 28); + this.cb_templete.Size = new System.Drawing.Size(133, 20); this.cb_templete.TabIndex = 19; this.cb_templete.QueryCloseUp += new System.ComponentModel.CancelEventHandler(this.cb_templete_QueryCloseUp); this.cb_templete.Click += new System.EventHandler(this.OnTempleteClick); @@ -453,7 +454,7 @@ this.lbl_templete.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbl_templete.Location = new System.Drawing.Point(5, 8); this.lbl_templete.Name = "lbl_templete"; - this.lbl_templete.Size = new System.Drawing.Size(72, 18); + this.lbl_templete.Size = new System.Drawing.Size(48, 12); this.lbl_templete.TabIndex = 16; this.lbl_templete.Text = "选择模版"; // @@ -479,7 +480,7 @@ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.cb_input.Properties.DropDownRows = 8; this.cb_input.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; - this.cb_input.Size = new System.Drawing.Size(79, 28); + this.cb_input.Size = new System.Drawing.Size(79, 20); this.cb_input.TabIndex = 19; // // txt_input @@ -489,7 +490,7 @@ this.txt_input.Name = "txt_input"; this.txt_input.Properties.Appearance.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txt_input.Properties.Appearance.Options.UseFont = true; - this.txt_input.Size = new System.Drawing.Size(98, 28); + this.txt_input.Size = new System.Drawing.Size(98, 20); this.txt_input.TabIndex = 18; this.txt_input.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnInputKeyDown); // @@ -498,7 +499,7 @@ this.labelControl2.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.labelControl2.Location = new System.Drawing.Point(5, 8); this.labelControl2.Name = "labelControl2"; - this.labelControl2.Size = new System.Drawing.Size(72, 18); + this.labelControl2.Size = new System.Drawing.Size(48, 12); this.labelControl2.TabIndex = 16; this.labelControl2.Text = "快速录入"; // @@ -519,7 +520,7 @@ this.btnBillAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnBillAdd.Appearance.Font = new System.Drawing.Font("宋体", 10F); this.btnBillAdd.Appearance.Options.UseFont = true; - this.btnBillAdd.Location = new System.Drawing.Point(1069, 11); + this.btnBillAdd.Location = new System.Drawing.Point(1074, 11); this.btnBillAdd.Name = "btnBillAdd"; this.btnBillAdd.Size = new System.Drawing.Size(80, 40); this.btnBillAdd.TabIndex = 19; @@ -532,7 +533,7 @@ this.btnBillApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnBillApply.Appearance.Font = new System.Drawing.Font("宋体", 10F); this.btnBillApply.Appearance.Options.UseFont = true; - this.btnBillApply.Location = new System.Drawing.Point(1327, 11); + this.btnBillApply.Location = new System.Drawing.Point(1332, 11); this.btnBillApply.Name = "btnBillApply"; this.btnBillApply.Size = new System.Drawing.Size(80, 40); this.btnBillApply.TabIndex = 25; @@ -545,7 +546,7 @@ this.btnDelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnDelete.Appearance.Font = new System.Drawing.Font("宋体", 10F); this.btnDelete.Appearance.Options.UseFont = true; - this.btnDelete.Location = new System.Drawing.Point(1155, 11); + this.btnDelete.Location = new System.Drawing.Point(1160, 11); this.btnDelete.Name = "btnDelete"; this.btnDelete.Size = new System.Drawing.Size(80, 40); this.btnDelete.TabIndex = 20; @@ -558,7 +559,7 @@ this.btnBillSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnBillSave.Appearance.Font = new System.Drawing.Font("宋体", 10F); this.btnBillSave.Appearance.Options.UseFont = true; - this.btnBillSave.Location = new System.Drawing.Point(1241, 11); + this.btnBillSave.Location = new System.Drawing.Point(1246, 11); this.btnBillSave.Name = "btnBillSave"; this.btnBillSave.Size = new System.Drawing.Size(80, 40); this.btnBillSave.TabIndex = 21; @@ -573,9 +574,9 @@ this.pl_main_top.Controls.Add(this.pl_main_top_right); this.pl_main_top.Controls.Add(this.pl_main_top_left); this.pl_main_top.Dock = System.Windows.Forms.DockStyle.Top; - this.pl_main_top.Location = new System.Drawing.Point(3, 3); + this.pl_main_top.Location = new System.Drawing.Point(2, 2); this.pl_main_top.Name = "pl_main_top"; - this.pl_main_top.Size = new System.Drawing.Size(1496, 38); + this.pl_main_top.Size = new System.Drawing.Size(1501, 38); this.pl_main_top.TabIndex = 0; // // pl_main_top_center @@ -585,9 +586,9 @@ this.pl_main_top_center.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder; this.pl_main_top_center.Controls.Add(this.lbTitle); this.pl_main_top_center.Dock = System.Windows.Forms.DockStyle.Fill; - this.pl_main_top_center.Location = new System.Drawing.Point(203, 3); + this.pl_main_top_center.Location = new System.Drawing.Point(202, 2); this.pl_main_top_center.Name = "pl_main_top_center"; - this.pl_main_top_center.Size = new System.Drawing.Size(884, 32); + this.pl_main_top_center.Size = new System.Drawing.Size(891, 34); this.pl_main_top_center.TabIndex = 3; // // lbTitle @@ -598,7 +599,7 @@ this.lbTitle.ForeColor = System.Drawing.Color.Blue; this.lbTitle.Location = new System.Drawing.Point(0, 0); this.lbTitle.Name = "lbTitle"; - this.lbTitle.Size = new System.Drawing.Size(884, 32); + this.lbTitle.Size = new System.Drawing.Size(891, 34); this.lbTitle.TabIndex = 1; this.lbTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lbTitle.Paint += new System.Windows.Forms.PaintEventHandler(this.OnLabelTitlePaint); @@ -611,9 +612,9 @@ this.pl_main_top_right.Controls.Add(this.lblOrderNo); this.pl_main_top_right.Controls.Add(this.labelControl1); this.pl_main_top_right.Dock = System.Windows.Forms.DockStyle.Right; - this.pl_main_top_right.Location = new System.Drawing.Point(1087, 3); + this.pl_main_top_right.Location = new System.Drawing.Point(1093, 2); this.pl_main_top_right.Name = "pl_main_top_right"; - this.pl_main_top_right.Size = new System.Drawing.Size(406, 32); + this.pl_main_top_right.Size = new System.Drawing.Size(406, 34); this.pl_main_top_right.TabIndex = 2; // // lblOrderNo @@ -623,7 +624,7 @@ this.lblOrderNo.Appearance.ForeColor = System.Drawing.Color.Blue; this.lblOrderNo.Location = new System.Drawing.Point(85, 15); this.lblOrderNo.Name = "lblOrderNo"; - this.lblOrderNo.Size = new System.Drawing.Size(180, 24); + this.lblOrderNo.Size = new System.Drawing.Size(120, 16); this.lblOrderNo.TabIndex = 1; this.lblOrderNo.Text = "XTC170112010001"; // @@ -634,7 +635,7 @@ this.labelControl1.Appearance.ForeColor = System.Drawing.Color.Blue; this.labelControl1.Location = new System.Drawing.Point(7, 15); this.labelControl1.Name = "labelControl1"; - this.labelControl1.Size = new System.Drawing.Size(108, 24); + this.labelControl1.Size = new System.Drawing.Size(72, 16); this.labelControl1.TabIndex = 0; this.labelControl1.Text = "单据编号:"; // @@ -646,9 +647,9 @@ this.pl_main_top_left.Controls.Add(this.pl_red); this.pl_main_top_left.Controls.Add(this.pl_blue); this.pl_main_top_left.Dock = System.Windows.Forms.DockStyle.Left; - this.pl_main_top_left.Location = new System.Drawing.Point(3, 3); + this.pl_main_top_left.Location = new System.Drawing.Point(2, 2); this.pl_main_top_left.Name = "pl_main_top_left"; - this.pl_main_top_left.Size = new System.Drawing.Size(200, 32); + this.pl_main_top_left.Size = new System.Drawing.Size(200, 34); this.pl_main_top_left.TabIndex = 1; // // pl_red @@ -660,7 +661,7 @@ this.pl_red.Dock = System.Windows.Forms.DockStyle.Left; this.pl_red.Location = new System.Drawing.Point(100, 0); this.pl_red.Name = "pl_red"; - this.pl_red.Size = new System.Drawing.Size(100, 32); + this.pl_red.Size = new System.Drawing.Size(100, 34); this.pl_red.TabIndex = 3; // // rdRed @@ -670,7 +671,7 @@ this.rdRed.ForeColor = System.Drawing.Color.Red; this.rdRed.Location = new System.Drawing.Point(6, 12); this.rdRed.Name = "rdRed"; - this.rdRed.Size = new System.Drawing.Size(131, 28); + this.rdRed.Size = new System.Drawing.Size(90, 20); this.rdRed.TabIndex = 3; this.rdRed.Text = "销售退货"; this.rdRed.UseVisualStyleBackColor = true; @@ -685,7 +686,7 @@ this.pl_blue.Dock = System.Windows.Forms.DockStyle.Left; this.pl_blue.Location = new System.Drawing.Point(0, 0); this.pl_blue.Name = "pl_blue"; - this.pl_blue.Size = new System.Drawing.Size(100, 32); + this.pl_blue.Size = new System.Drawing.Size(100, 34); this.pl_blue.TabIndex = 2; // // rdBlue @@ -696,7 +697,7 @@ this.rdBlue.ForeColor = System.Drawing.Color.Blue; this.rdBlue.Location = new System.Drawing.Point(7, 12); this.rdBlue.Name = "rdBlue"; - this.rdBlue.Size = new System.Drawing.Size(131, 28); + this.rdBlue.Size = new System.Drawing.Size(90, 20); this.rdBlue.TabIndex = 2; this.rdBlue.TabStop = true; this.rdBlue.Text = "销售出库"; diff --git a/插件库/Lskj.PubBillSpecial/BillModule.cs b/插件库/Lskj.PubBillSpecial/BillModule.cs index 0ad1578..9b02ced 100644 --- a/插件库/Lskj.PubBillSpecial/BillModule.cs +++ b/插件库/Lskj.PubBillSpecial/BillModule.cs @@ -220,6 +220,10 @@ namespace Lskj.PubBillSpecial /// 扫码框 /// public TextEdit ScanCodeTextEdit = null; + /// + /// 右侧表格 + /// + public ModuleGridEx gridEx = null; public BillModule() { @@ -634,15 +638,15 @@ namespace Lskj.PubBillSpecial /// private void InitializeModuleGridex() { - DynamicModel dyncModel = new DynamicModel(new string[] {"", ERPInfo.Instance.UserId, ERPInfo.Instance.UserName, this.SysModel.Privilege, this.BillModel.RightModuleCode, "0" }); - DataRow moduleInformation = MainImpl.GetSystemdllTab(this.BillModel.RightModuleCode); + DynamicModel dyncModel = new DynamicModel(new string[] { "", ERPInfo.Instance.UserId, ERPInfo.Instance.UserName, this.SysModel.Privilege, this.BillModel.RightModuleCode, "0" }); + DataRow moduleInformation = MainImpl.GetSystemdllTab(this.BillModel.RightModuleCode); if (moduleInformation == null) { MessageUtil.Show("没有找到编号为" + this.BillModel.RightModuleCode + "的模块信息"); return; } ModuleModel model = new ModuleModel(moduleInformation); - ModuleGridEx gridEx = new ModuleGridEx(); + this.gridEx = new ModuleGridEx(); model.ParmaryKey = BaseImpl.GetBasePrimaryKey(this.BillModel.RightModuleCode); gridEx.OnSaveGridCallBack += OnDetailSaveGridCallBack; gridEx.DetailRightGridCallBack += OnDetailRightCallback; @@ -651,7 +655,7 @@ namespace Lskj.PubBillSpecial gridEx.Dock = DockStyle.Fill; gridEx.OperShortMode = false; // 不显示简短模式 gridEx.VisibleSearchPanel = false; - gridEx.VisibleOperPanel =true; + gridEx.VisibleOperPanel = true; gridEx.InitializeControl(model, dyncModel); gridEx.GridControlObj.Tag = model;//都在本地图可留着备用 //gridEx.ParentControlEx = this.gcMain; @@ -659,6 +663,9 @@ namespace Lskj.PubBillSpecial gridEx.ParentGridEx = this.gcMain;//父级关联明细可扩展 //gridEx.ParentKeyField = string.IsNullOrEmpty(model.UnionParentField) ? model.SystemModel.ParmaryKey : model.UnionParentField; //gridEx.DetailKeyField = model.UnionValue;//新增关联可拖拽刷新数据源 + + gridEx.VisibleSearchPanel = false; + gridEx.GridControlObj.ParentControl = gridEx.SearchObj; this.splitMainControl.Panel2.Controls.Add(gridEx); gridEx.SearchObj.SearchGrid(); @@ -667,11 +674,11 @@ namespace Lskj.PubBillSpecial #region 衍生表格数据操作 private void OnDetailRightCallback(object sender, EventArgs e) { - throw new NotImplementedException(); + } private void OnDetailSaveGridCallBack(object sender, EventArgs e) { - throw new NotImplementedException(); + } #endregion @@ -6485,11 +6492,11 @@ namespace Lskj.PubBillSpecial { Type = "B"; } - else + else { string Sql = string.Format("select line_str from wms_ScanCodeLinetab a where modid='{0}' and hl_tig='{1}'", this.SysModel.ModuleCode, DocumentColor); Type = SqlHelper.ExecuteScalar(Sql) + ""; - if (string.IsNullOrWhiteSpace(Type)) + if (string.IsNullOrWhiteSpace(Type)) { MessageUtil.Show("扫码配置错误，请联系朗速服务人员"); return; @@ -6498,11 +6505,11 @@ namespace Lskj.PubBillSpecial - + switch (Type.ToUpper()) { case "A": - + FrmAdd frmAdd = new FrmAdd(); if (frmAdd.ShowDialog() == DialogResult.OK) { @@ -6514,7 +6521,7 @@ namespace Lskj.PubBillSpecial textEdit.Focus(); return; } - this.ExecuteWcanningSQL(MainRowItem, Quantity+"", DocumentColor, inputText); + this.ExecuteWcanningSQL(MainRowItem, Quantity + "", DocumentColor, inputText); break; case "B": this.ExecuteWcanningSQL(MainRowItem, Quantity + "", DocumentColor, inputText); @@ -6561,7 +6568,7 @@ namespace Lskj.PubBillSpecial } } break; - + } } @@ -6578,7 +6585,7 @@ namespace Lskj.PubBillSpecial ///数量 ///红蓝单据字段 ///串码，多个用;隔开 - public void ExecuteWcanningSQL(DataRow MainRowItem, string Quantity, string DocumentColor,string Codes) + public void ExecuteWcanningSQL(DataRow MainRowItem, string Quantity, string DocumentColor, string Codes) { int j = 0; foreach (string code in Codes.TrimEnd(';').Split(';')) @@ -6657,11 +6664,11 @@ namespace Lskj.PubBillSpecial if (string.IsNullOrWhiteSpace(varchar)) { //刷新当前单据 - if (j == Codes.TrimEnd(';').Split(';').Length - 1 ) + if (j == Codes.TrimEnd(';').Split(';').Length - 1) { this.SetBillStatus(BillImpl.GetDataRowResult(string.Format("select * from {0} where {1}='{2}'", BillModel.MasterTable, BillModel.PrimaryKey, this.lblOrderNo.Text))); } - + } else {