diff --git a/插件库/Lskj.PubBill/BillModule.Designer.cs b/插件库/Lskj.PubBill/BillModule.Designer.cs index e3d159b..e02b44a 100644 --- a/插件库/Lskj.PubBill/BillModule.Designer.cs +++ b/插件库/Lskj.PubBill/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_left = 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(); @@ -50,7 +51,7 @@ this.btnTreeSearch = new DevExpress.XtraEditors.SimpleButton(); this.pl_main_bottom = new DevExpress.XtraEditors.PanelControl(); this.dbpFP = new DevExpress.XtraEditors.DropDownButton(); - this.pmFP = new DevExpress.XtraBars.PopupMenu(); + this.pmFP = new DevExpress.XtraBars.PopupMenu(this.components); this.btnRefresh = new DevExpress.XtraEditors.SimpleButton(); this.btnHiding = new DevExpress.XtraEditors.SimpleButton(); this.btnHelp = new DevExpress.XtraEditors.SimpleButton(); @@ -63,15 +64,15 @@ this.labelControl2 = new DevExpress.XtraEditors.LabelControl(); this.btn_input = new DevExpress.XtraEditors.SimpleButton(); this.dpbImport = new DevExpress.XtraEditors.DropDownButton(); - this.pmBillExp = new DevExpress.XtraBars.PopupMenu(); + this.pmBillExp = new DevExpress.XtraBars.PopupMenu(this.components); this.btnBillAdd = new DevExpress.XtraEditors.SimpleButton(); this.btnBillApply = new DevExpress.XtraEditors.SimpleButton(); this.dpCopyBill = new DevExpress.XtraEditors.DropDownButton(); - this.pmBill = new DevExpress.XtraBars.PopupMenu(); + this.pmBill = new DevExpress.XtraBars.PopupMenu(this.components); this.btnPrint = new DevExpress.XtraEditors.DropDownButton(); - this.pMprint = new DevExpress.XtraBars.PopupMenu(); + this.pMprint = new DevExpress.XtraBars.PopupMenu(this.components); this.dpbTools = new DevExpress.XtraEditors.DropDownButton(); - this.pMenu = new DevExpress.XtraBars.PopupMenu(); + this.pMenu = new DevExpress.XtraBars.PopupMenu(this.components); this.btnDelete = new DevExpress.XtraEditors.SimpleButton(); this.btnBillSave = new DevExpress.XtraEditors.SimpleButton(); this.pl_main_top = new DevExpress.XtraEditors.PanelControl(); @@ -190,9 +191,9 @@ this.xtc_left_container.Appearance.Options.UseBackColor = true; this.xtc_left_container.Dock = System.Windows.Forms.DockStyle.Fill; this.xtc_left_container.HeaderLocation = DevExpress.XtraTab.TabHeaderLocation.Bottom; - this.xtc_left_container.Location = new System.Drawing.Point(2, 2); + this.xtc_left_container.Location = new System.Drawing.Point(3, 3); this.xtc_left_container.Name = "xtc_left_container"; - this.xtc_left_container.Size = new System.Drawing.Size(287, 441); + this.xtc_left_container.Size = new System.Drawing.Size(285, 439); this.xtc_left_container.TabIndex = 0; this.xtc_left_container.SelectedPageChanged += new DevExpress.XtraTab.TabPageChangedEventHandler(this.OnTabSelectedPageChanged); // @@ -206,7 +207,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(1215, 445); + this.pl_main.Size = new System.Drawing.Size(1212, 445); this.pl_main.TabIndex = 1; // // pl_main_center @@ -217,9 +218,9 @@ this.pl_main_center.Controls.Add(this.pl_main_center_detail); this.pl_main_center.Controls.Add(this.pl_main_center_master); this.pl_main_center.Dock = System.Windows.Forms.DockStyle.Fill; - this.pl_main_center.Location = new System.Drawing.Point(2, 40); + this.pl_main_center.Location = new System.Drawing.Point(3, 41); this.pl_main_center.Name = "pl_main_center"; - this.pl_main_center.Size = new System.Drawing.Size(1211, 366); + this.pl_main_center.Size = new System.Drawing.Size(1206, 364); this.pl_main_center.TabIndex = 2; // // pl_main_center_detail @@ -231,7 +232,7 @@ this.pl_main_center_detail.Dock = System.Windows.Forms.DockStyle.Fill; this.pl_main_center_detail.Location = new System.Drawing.Point(0, 164); this.pl_main_center_detail.Name = "pl_main_center_detail"; - this.pl_main_center_detail.Size = new System.Drawing.Size(1211, 202); + this.pl_main_center_detail.Size = new System.Drawing.Size(1206, 200); this.pl_main_center_detail.TabIndex = 5; // // gcMain @@ -243,7 +244,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(1211, 202); + this.gcMain.Size = new System.Drawing.Size(1206, 200); this.gcMain.TabIndex = 0; // // pl_main_center_master @@ -253,7 +254,7 @@ this.pl_main_center_master.Dock = System.Windows.Forms.DockStyle.Top; this.pl_main_center_master.Location = new System.Drawing.Point(0, 0); this.pl_main_center_master.Name = "pl_main_center_master"; - this.pl_main_center_master.Size = new System.Drawing.Size(1211, 164); + this.pl_main_center_master.Size = new System.Drawing.Size(1206, 164); this.pl_main_center_master.TabIndex = 6; this.pl_main_center_master.Click += new System.EventHandler(this.OnMainFocusAfter); // @@ -291,7 +292,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(91, 20); + this.textEdit1.Size = new System.Drawing.Size(91, 26); this.textEdit1.TabIndex = 5; // // barManager1 @@ -340,7 +341,7 @@ 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); + this.lceCombobox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.lceCombobox.Model = null; this.lceCombobox.Name = "lceCombobox"; this.lceCombobox.NullText = ""; @@ -393,9 +394,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(2, 406); + this.pl_main_bottom.Location = new System.Drawing.Point(3, 405); this.pl_main_bottom.Name = "pl_main_bottom"; - this.pl_main_bottom.Size = new System.Drawing.Size(1211, 37); + this.pl_main_bottom.Size = new System.Drawing.Size(1206, 37); this.pl_main_bottom.TabIndex = 1; // // dbpFP @@ -405,7 +406,7 @@ this.dbpFP.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.dbpFP.Appearance.Options.UseFont = true; this.dbpFP.DropDownControl = this.pmFP; - this.dbpFP.Location = new System.Drawing.Point(350, 7); + this.dbpFP.Location = new System.Drawing.Point(345, 7); this.dbpFP.Name = "dbpFP"; this.dbpFP.Size = new System.Drawing.Size(58, 26); this.dbpFP.TabIndex = 34; @@ -423,7 +424,7 @@ this.btnRefresh.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnRefresh.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnRefresh.Appearance.Options.UseFont = true; - this.btnRefresh.Location = new System.Drawing.Point(414, 7); + this.btnRefresh.Location = new System.Drawing.Point(409, 7); this.btnRefresh.Name = "btnRefresh"; this.btnRefresh.Size = new System.Drawing.Size(74, 26); this.btnRefresh.TabIndex = 33; @@ -436,7 +437,7 @@ this.btnHiding.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnHiding.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnHiding.Appearance.Options.UseFont = true; - this.btnHiding.Location = new System.Drawing.Point(490, 7); + this.btnHiding.Location = new System.Drawing.Point(485, 7); this.btnHiding.Name = "btnHiding"; this.btnHiding.Size = new System.Drawing.Size(67, 26); this.btnHiding.TabIndex = 32; @@ -450,7 +451,7 @@ this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnHelp.Appearance.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnHelp.Appearance.Options.UseFont = true; - this.btnHelp.Location = new System.Drawing.Point(559, 7); + this.btnHelp.Location = new System.Drawing.Point(554, 7); this.btnHelp.Name = "btnHelp"; this.btnHelp.Size = new System.Drawing.Size(67, 26); this.btnHelp.TabIndex = 30; @@ -477,7 +478,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, 20); + this.cb_templete.Size = new System.Drawing.Size(133, 28); 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); @@ -487,7 +488,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(48, 12); + this.lbl_templete.Size = new System.Drawing.Size(72, 18); this.lbl_templete.TabIndex = 16; this.lbl_templete.Text = "选择模版"; // @@ -513,7 +514,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, 20); + this.cb_input.Size = new System.Drawing.Size(79, 28); this.cb_input.TabIndex = 19; // // txt_input @@ -523,7 +524,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, 20); + this.txt_input.Size = new System.Drawing.Size(98, 28); this.txt_input.TabIndex = 18; this.txt_input.KeyDown += new System.Windows.Forms.KeyEventHandler(this.OnInputKeyDown); // @@ -532,7 +533,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(48, 12); + this.labelControl2.Size = new System.Drawing.Size(72, 18); this.labelControl2.TabIndex = 16; this.labelControl2.Text = "快速录入"; // @@ -555,7 +556,7 @@ this.dpbImport.Appearance.Options.UseFont = true; this.dpbImport.DropDownArrowStyle = DevExpress.XtraEditors.DropDownArrowStyle.Show; this.dpbImport.DropDownControl = this.pmBillExp; - this.dpbImport.Location = new System.Drawing.Point(704, 7); + this.dpbImport.Location = new System.Drawing.Point(699, 7); this.dpbImport.Name = "dpbImport"; this.dpbImport.Size = new System.Drawing.Size(74, 26); this.dpbImport.TabIndex = 26; @@ -572,7 +573,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("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnBillAdd.Appearance.Options.UseFont = true; - this.btnBillAdd.Location = new System.Drawing.Point(856, 7); + this.btnBillAdd.Location = new System.Drawing.Point(851, 7); this.btnBillAdd.Name = "btnBillAdd"; this.btnBillAdd.Size = new System.Drawing.Size(67, 26); this.btnBillAdd.TabIndex = 19; @@ -585,7 +586,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("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnBillApply.Appearance.Options.UseFont = true; - this.btnBillApply.Location = new System.Drawing.Point(1063, 7); + this.btnBillApply.Location = new System.Drawing.Point(1058, 7); this.btnBillApply.Name = "btnBillApply"; this.btnBillApply.Size = new System.Drawing.Size(67, 26); this.btnBillApply.TabIndex = 25; @@ -600,7 +601,7 @@ this.dpCopyBill.Appearance.Options.UseFont = true; this.dpCopyBill.DropDownArrowStyle = DevExpress.XtraEditors.DropDownArrowStyle.Show; this.dpCopyBill.DropDownControl = this.pmBill; - this.dpCopyBill.Location = new System.Drawing.Point(780, 7); + this.dpCopyBill.Location = new System.Drawing.Point(775, 7); this.dpCopyBill.Name = "dpCopyBill"; this.dpCopyBill.Size = new System.Drawing.Size(74, 26); this.dpCopyBill.TabIndex = 24; @@ -619,7 +620,7 @@ this.btnPrint.Appearance.Options.UseFont = true; this.btnPrint.DropDownArrowStyle = DevExpress.XtraEditors.DropDownArrowStyle.Show; this.btnPrint.DropDownControl = this.pMprint; - this.btnPrint.Location = new System.Drawing.Point(1132, 7); + this.btnPrint.Location = new System.Drawing.Point(1127, 7); this.btnPrint.Name = "btnPrint"; this.btnPrint.Size = new System.Drawing.Size(74, 26); this.btnPrint.TabIndex = 23; @@ -638,7 +639,7 @@ this.dpbTools.Appearance.Options.UseFont = true; this.dpbTools.DropDownArrowStyle = DevExpress.XtraEditors.DropDownArrowStyle.Show; this.dpbTools.DropDownControl = this.pMenu; - this.dpbTools.Location = new System.Drawing.Point(628, 7); + this.dpbTools.Location = new System.Drawing.Point(623, 7); this.dpbTools.Name = "dpbTools"; this.dpbTools.Size = new System.Drawing.Size(74, 26); this.dpbTools.TabIndex = 22; @@ -656,7 +657,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("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnDelete.Appearance.Options.UseFont = true; - this.btnDelete.Location = new System.Drawing.Point(925, 7); + this.btnDelete.Location = new System.Drawing.Point(920, 7); this.btnDelete.Name = "btnDelete"; this.btnDelete.Size = new System.Drawing.Size(67, 26); this.btnDelete.TabIndex = 20; @@ -669,7 +670,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("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnBillSave.Appearance.Options.UseFont = true; - this.btnBillSave.Location = new System.Drawing.Point(994, 7); + this.btnBillSave.Location = new System.Drawing.Point(989, 7); this.btnBillSave.Name = "btnBillSave"; this.btnBillSave.Size = new System.Drawing.Size(67, 26); this.btnBillSave.TabIndex = 21; @@ -684,9 +685,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(2, 2); + this.pl_main_top.Location = new System.Drawing.Point(3, 3); this.pl_main_top.Name = "pl_main_top"; - this.pl_main_top.Size = new System.Drawing.Size(1211, 38); + this.pl_main_top.Size = new System.Drawing.Size(1206, 38); this.pl_main_top.TabIndex = 0; // // pl_main_top_center @@ -696,9 +697,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(162, 2); + this.pl_main_top_center.Location = new System.Drawing.Point(163, 3); this.pl_main_top_center.Name = "pl_main_top_center"; - this.pl_main_top_center.Size = new System.Drawing.Size(864, 34); + this.pl_main_top_center.Size = new System.Drawing.Size(857, 32); this.pl_main_top_center.TabIndex = 3; // // lbTitle @@ -709,7 +710,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(864, 34); + this.lbTitle.Size = new System.Drawing.Size(857, 32); this.lbTitle.TabIndex = 1; this.lbTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lbTitle.Paint += new System.Windows.Forms.PaintEventHandler(this.OnLabelTitlePaint); @@ -722,9 +723,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(1026, 2); + this.pl_main_top_right.Location = new System.Drawing.Point(1020, 3); this.pl_main_top_right.Name = "pl_main_top_right"; - this.pl_main_top_right.Size = new System.Drawing.Size(183, 34); + this.pl_main_top_right.Size = new System.Drawing.Size(183, 32); this.pl_main_top_right.TabIndex = 2; // // lblOrderNo @@ -734,7 +735,7 @@ this.lblOrderNo.Appearance.ForeColor = System.Drawing.Color.Blue; this.lblOrderNo.Location = new System.Drawing.Point(67, 19); this.lblOrderNo.Name = "lblOrderNo"; - this.lblOrderNo.Size = new System.Drawing.Size(90, 12); + this.lblOrderNo.Size = new System.Drawing.Size(135, 18); this.lblOrderNo.TabIndex = 1; this.lblOrderNo.Text = "XTC170112010001"; // @@ -745,7 +746,7 @@ this.labelControl1.Appearance.ForeColor = System.Drawing.Color.Blue; this.labelControl1.Location = new System.Drawing.Point(7, 19); this.labelControl1.Name = "labelControl1"; - this.labelControl1.Size = new System.Drawing.Size(54, 12); + this.labelControl1.Size = new System.Drawing.Size(81, 18); this.labelControl1.TabIndex = 0; this.labelControl1.Text = "单据编号:"; // @@ -757,9 +758,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(2, 2); + this.pl_main_top_left.Location = new System.Drawing.Point(3, 3); this.pl_main_top_left.Name = "pl_main_top_left"; - this.pl_main_top_left.Size = new System.Drawing.Size(160, 34); + this.pl_main_top_left.Size = new System.Drawing.Size(160, 32); this.pl_main_top_left.TabIndex = 1; // // pl_red @@ -771,7 +772,7 @@ this.pl_red.Dock = System.Windows.Forms.DockStyle.Left; this.pl_red.Location = new System.Drawing.Point(80, 0); this.pl_red.Name = "pl_red"; - this.pl_red.Size = new System.Drawing.Size(80, 34); + this.pl_red.Size = new System.Drawing.Size(80, 32); this.pl_red.TabIndex = 3; // // rdRed @@ -781,7 +782,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(71, 16); + this.rdRed.Size = new System.Drawing.Size(105, 22); this.rdRed.TabIndex = 3; this.rdRed.Text = "红字单据"; this.rdRed.UseVisualStyleBackColor = true; @@ -796,7 +797,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(80, 34); + this.pl_blue.Size = new System.Drawing.Size(80, 32); this.pl_blue.TabIndex = 2; // // rdBlue @@ -807,7 +808,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(71, 16); + this.rdBlue.Size = new System.Drawing.Size(105, 22); this.rdBlue.TabIndex = 2; this.rdBlue.TabStop = true; this.rdBlue.Text = "蓝字单据"; @@ -819,7 +820,7 @@ this.tb_buttom.Dock = System.Windows.Forms.DockStyle.Fill; this.tb_buttom.Location = new System.Drawing.Point(0, 0); this.tb_buttom.Name = "tb_buttom"; - this.tb_buttom.Size = new System.Drawing.Size(1511, 280); + this.tb_buttom.Size = new System.Drawing.Size(1511, 277); this.tb_buttom.TabIndex = 25; this.tb_buttom.Load += new System.EventHandler(this.tb_buttom_Load); // diff --git a/插件库/Lskj.PubBill/BillModule.cs b/插件库/Lskj.PubBill/BillModule.cs index 9df52cd..772fa4f 100644 --- a/插件库/Lskj.PubBill/BillModule.cs +++ b/插件库/Lskj.PubBill/BillModule.cs @@ -33,6 +33,8 @@ using DevExpress.XtraTreeList.Columns; using System.Threading.Tasks; using DevExpress.Utils; using System.Data.SqlClient; +using Newtonsoft.Json.Linq; +using Newtonsoft.Json; namespace Lskj.PubBill { @@ -1260,11 +1262,11 @@ namespace Lskj.PubBill } } } - if (dataTable != null && dataTable.Columns.Contains("项目代号")) + if (dataTable != null && dataTable.Columns.Contains("num")) { MultiLineSummary = true; gcMain.GridView.OptionsView.ShowFooter = true; - DataRow[] dataRows = dataTable.Select("项目代号='胡波'"); + DataRow[] dataRows = dataTable.Select("num='999'"); DataRow dataRow = dataRows != null && dataRows.Length > 0 ? dataRows[0] : null; //树表格 gcMain.AddHeadquarters(dataRow); @@ -4792,10 +4794,24 @@ namespace Lskj.PubBill //保存完成后所有数据源进行拼接执行保存 if (tvp != null && tvp.Rows.Count > 0) { + if (gcMain.jhrowitem != null) + { + // 插入数据到临时表 + DataRow dr = tvp.NewRow(); + dr["lblOrderNo"] = billNo; + dr["billdocument_id"] = "计划文件"+ gcMain.jhrowitem.ToJsonObject(); + if (DateColumnList.Count > 0 && DateColumnList[0].Tag is DateTime dateTime) + { + dr["showday"] = dateTime.ToString("yyyy-MM-dd"); //日期 + } + tvp.Rows.Add(dr); + + } foreach (DataRow item in tvp.Rows) { item["lblOrderNo"] = billNo; } + // 调用存储过程保存变更数据 string msg; int ret = SaveDayPlanChanges(tvp, out msg); @@ -5323,10 +5339,41 @@ namespace Lskj.PubBill if (dataTable != null) { //DataTable dataMain = dataTable.Copy(); - string sqlValue = "select * from RD_worktimetab where 1 = 1"; - sqlValue = $"{sqlValue} and lblOrderNo = '{billNo}' and showday >= '{dateTime.ToString("yyyy-MM-dd")}'"; - DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue); - MergeMainDataWithDayPlan(dataTable, dataDayPlan, dateTime); + //string sqlValue = "select * from RD_worktimetab where 1 = 1"; + //sqlValue = $"{sqlValue} and lblOrderNo = '{billNo}' and showday >= '{dateTime.ToString("yyyy-MM-dd")}'"; + //DataTable dataDayPlan = BaseImpl.GetDataTableResult(sqlValue); + //---------- 查询①：渲染表格排程” ---------- + string sqlExcludePlan = "SELECT * FROM RD_worktimetab WHERE 1 = 1"; + sqlExcludePlan += $" AND lblOrderNo = '{billNo}'"; + sqlExcludePlan += $" AND showday >= '{dateTime:yyyy-MM-dd}'"; + sqlExcludePlan += " AND billdocument_id NOT LIKE N'计划文件%'"; + // 获取结果 + DataTable dataNoPlanFile = BaseImpl.GetDataTableResult(sqlExcludePlan); + // ---------- 查询②：只包含“计划文件” ---------- + string sqlIncludePlan = "SELECT billdocument_id FROM RD_worktimetab WHERE 1 = 1"; + sqlIncludePlan += $" AND lblOrderNo = '{billNo}'"; + sqlIncludePlan += $" AND showday >= '{dateTime:yyyy-MM-dd}'"; + sqlIncludePlan += " AND billdocument_id LIKE N'计划文件%'"; + // 获取结果 + DataTable dataOnlyPlanFile = BaseImpl.GetDataTableResult(sqlIncludePlan); + MergeMainDataWithDayPlan(dataTable, dataNoPlanFile, dateTime); + //若存在缓存计划数据则渲染合计 + if (dataOnlyPlanFile.Rows.Count>0) + { + string jhrowtiemjson = (dataOnlyPlanFile.Rows[0]["billdocument_id"] + "").Replace("计划文件",""); + try + { + JObject rowObject = JsonConvert.DeserializeObject(jhrowtiemjson); + JArray jArray = new JArray(); + jArray.Add(rowObject); + DataRow jhrowitem= JsonConvert.DeserializeObject(JsonConvert.SerializeObject(jArray)).Rows[0]; + //渲染计划合计 + gcMain.AddHeadquarters(jhrowitem); + } + catch (Exception) + { + } + } this.gcMain.GridControl.DataSource = null; this.gcMain.GridControl.DataSource = dataTable; }