From cd47f11ebfaadb81d6efcf778542d3b44acee5a2 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 03 九月 2025 17:27:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.Designer.cs | 604 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.cs | 50 ++++
2 files changed, 625 insertions(+), 29 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.Designer.cs
index cc7b164..e5acdd8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.Designer.cs
@@ -29,6 +29,17 @@
/// </summary>
private void InitializeComponent()
{
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -41,6 +52,7 @@
this.itemName = new DevExpress.XtraGrid.Columns.GridColumn();
this.itemModel = new DevExpress.XtraGrid.Columns.GridColumn();
this.quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.description = new DevExpress.XtraGrid.Columns.GridColumn();
this.createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.creatDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.businessType = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -58,10 +70,39 @@
this.createDate1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.pageBar1 = new UserControls.Data.UcPageBar();
- this.description = new DevExpress.XtraGrid.Columns.GridColumn();
this.fromDepotId = new DevExpress.XtraGrid.Columns.GridColumn();
this.invDepotId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_creatDate = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemDescription1 = new DevExpress.XtraEditors.TextEdit();
+ this.lbGuid = new System.Windows.Forms.Label();
+ this.txt_itemBarcode = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemNo1 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemDescription6 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_quantity = new DevExpress.XtraEditors.TextEdit();
+ this.txt_description = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fromDepot = new DevExpress.XtraEditors.TextEdit();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_invDepot = new DevExpress.XtraEditors.TextEdit();
+ this.txt_name = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -72,6 +113,40 @@
this.split1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ this.xtraTabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+ this.splitMx1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+ this.splitMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+ this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_creatDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemDescription1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemBarcode.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemDescription6.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_quantity.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fromDepot.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_invDepot.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -101,7 +176,8 @@
this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1});
+ this.xtraTabPage1,
+ this.xtraTabPage2});
//
// xtraTabPage1
//
@@ -251,6 +327,17 @@
this.quantity.Visible = true;
this.quantity.VisibleIndex = 5;
this.quantity.Width = 112;
+ //
+ // description
+ //
+ this.description.Caption = "浜ゆ槗淇℃伅";
+ this.description.FieldName = "description";
+ this.description.MinWidth = 30;
+ this.description.Name = "description";
+ this.description.Tag = "description";
+ this.description.Visible = true;
+ this.description.VisibleIndex = 6;
+ this.description.Width = 112;
//
// createBy
//
@@ -423,29 +510,6 @@
this.lastupdateDate.Tag = "lastupdateDate";
this.lastupdateDate.Width = 112;
//
- // pageBar1
- //
- this.pageBar1.CurrentPage = 1;
- this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 635);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
- this.pageBar1.Name = "pageBar1";
- this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1408, 48);
- this.pageBar1.TabIndex = 4;
- this.pageBar1.TotalPages = 0;
- //
- // description
- //
- this.description.Caption = "浜ゆ槗淇℃伅";
- this.description.FieldName = "description";
- this.description.MinWidth = 30;
- this.description.Name = "description";
- this.description.Tag = "description";
- this.description.Visible = true;
- this.description.VisibleIndex = 6;
- this.description.Width = 112;
- //
// fromDepotId
//
this.fromDepotId.Caption = "婧愪粨搴揑D";
@@ -463,6 +527,430 @@
this.invDepotId.Name = "invDepotId";
this.invDepotId.Tag = "invDepotId";
this.invDepotId.Width = 112;
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 635);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.Size = new System.Drawing.Size(1408, 48);
+ this.pageBar1.TabIndex = 4;
+ this.pageBar1.TotalPages = 0;
+ //
+ // xtraTabPage2
+ //
+ this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+ //
+ // splitMx1
+ //
+ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitMx1.Horizontal = false;
+ this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Name = "splitMx1";
+ //
+ // splitMx1.Panel1
+ //
+ this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+ this.splitMx1.Panel1.Text = "Panel1";
+ //
+ // splitMx1.Panel2
+ //
+ this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Size = new System.Drawing.Size(1408, 698);
+ this.splitMx1.SplitterPosition = 271;
+ this.splitMx1.TabIndex = 0;
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.txt_creatDate);
+ this.layoutMx1.Controls.Add(this.txt_itemDescription1);
+ this.layoutMx1.Controls.Add(this.lbGuid);
+ this.layoutMx1.Controls.Add(this.txt_itemBarcode);
+ this.layoutMx1.Controls.Add(this.txt_itemNo1);
+ this.layoutMx1.Controls.Add(this.txt_itemName);
+ this.layoutMx1.Controls.Add(this.txt_itemDescription6);
+ this.layoutMx1.Controls.Add(this.txt_quantity);
+ this.layoutMx1.Controls.Add(this.txt_description);
+ this.layoutMx1.Controls.Add(this.txt_fromDepot);
+ this.layoutMx1.Controls.Add(this.txt_invDepot);
+ this.layoutMx1.Controls.Add(this.txt_name);
+ this.layoutMx1.Controls.Add(this.txt_billNo);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem24});
+ this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Name = "layoutMx1";
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1050, 249, 975, 600);
+ this.layoutMx1.Root = this.Root;
+ this.layoutMx1.Size = new System.Drawing.Size(1408, 271);
+ this.layoutMx1.TabIndex = 0;
+ this.layoutMx1.Text = "layoutMx1";
+ //
+ // txt_creatDate
+ //
+ this.txt_creatDate.Location = new System.Drawing.Point(1137, 47);
+ this.txt_creatDate.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_creatDate.Name = "txt_creatDate";
+ this.txt_creatDate.Properties.Appearance.Options.UseFont = true;
+ this.txt_creatDate.Size = new System.Drawing.Size(259, 28);
+ this.txt_creatDate.StyleController = this.layoutMx1;
+ this.txt_creatDate.TabIndex = 222;
+ this.txt_creatDate.Tag = "creatDate";
+ //
+ // txt_itemDescription1
+ //
+ this.txt_itemDescription1.Location = new System.Drawing.Point(96, 83);
+ this.txt_itemDescription1.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_itemDescription1.Name = "txt_itemDescription1";
+ this.txt_itemDescription1.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemDescription1.Size = new System.Drawing.Size(259, 28);
+ this.txt_itemDescription1.StyleController = this.layoutMx1;
+ this.txt_itemDescription1.TabIndex = 222;
+ this.txt_itemDescription1.Tag = "itemDescription";
+ //
+ // lbGuid
+ //
+ this.lbGuid.Location = new System.Drawing.Point(725, 216);
+ this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(350, 37);
+ this.lbGuid.TabIndex = 1;
+ this.lbGuid.Text = "lbGuid";
+ this.lbGuid.Visible = false;
+ //
+ // txt_itemBarcode
+ //
+ this.txt_itemBarcode.Location = new System.Drawing.Point(443, 12);
+ this.txt_itemBarcode.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_itemBarcode.Name = "txt_itemBarcode";
+ this.txt_itemBarcode.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemBarcode.Size = new System.Drawing.Size(259, 28);
+ this.txt_itemBarcode.StyleController = this.layoutMx1;
+ this.txt_itemBarcode.TabIndex = 222;
+ this.txt_itemBarcode.Tag = "itemBarcode";
+ //
+ // txt_itemNo1
+ //
+ this.txt_itemNo1.Location = new System.Drawing.Point(790, 12);
+ this.txt_itemNo1.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_itemNo1.Name = "txt_itemNo1";
+ this.txt_itemNo1.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemNo1.Size = new System.Drawing.Size(259, 28);
+ this.txt_itemNo1.StyleController = this.layoutMx1;
+ this.txt_itemNo1.TabIndex = 222;
+ this.txt_itemNo1.Tag = "itemNo1";
+ //
+ // txt_itemName
+ //
+ this.txt_itemName.Location = new System.Drawing.Point(1137, 12);
+ this.txt_itemName.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_itemName.Name = "txt_itemName";
+ this.txt_itemName.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemName.Size = new System.Drawing.Size(259, 28);
+ this.txt_itemName.StyleController = this.layoutMx1;
+ this.txt_itemName.TabIndex = 222;
+ this.txt_itemName.Tag = "itemDescription";
+ //
+ // txt_itemDescription6
+ //
+ this.txt_itemDescription6.Location = new System.Drawing.Point(96, 47);
+ this.txt_itemDescription6.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_itemDescription6.Name = "txt_itemDescription6";
+ this.txt_itemDescription6.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemDescription6.Size = new System.Drawing.Size(259, 28);
+ this.txt_itemDescription6.StyleController = this.layoutMx1;
+ this.txt_itemDescription6.TabIndex = 222;
+ this.txt_itemDescription6.Tag = "itemDescription";
+ //
+ // txt_quantity
+ //
+ this.txt_quantity.Location = new System.Drawing.Point(443, 47);
+ this.txt_quantity.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_quantity.Name = "txt_quantity";
+ this.txt_quantity.Properties.Appearance.Options.UseFont = true;
+ this.txt_quantity.Size = new System.Drawing.Size(259, 28);
+ this.txt_quantity.StyleController = this.layoutMx1;
+ this.txt_quantity.TabIndex = 222;
+ this.txt_quantity.Tag = "quantity";
+ //
+ // txt_description
+ //
+ this.txt_description.Location = new System.Drawing.Point(790, 47);
+ this.txt_description.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_description.Name = "txt_description";
+ this.txt_description.Properties.Appearance.Options.UseFont = true;
+ this.txt_description.Size = new System.Drawing.Size(259, 28);
+ this.txt_description.StyleController = this.layoutMx1;
+ this.txt_description.TabIndex = 222;
+ this.txt_description.Tag = "description";
+ //
+ // txt_fromDepot
+ //
+ this.txt_fromDepot.Location = new System.Drawing.Point(443, 83);
+ this.txt_fromDepot.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_fromDepot.Name = "txt_fromDepot";
+ this.txt_fromDepot.Properties.Appearance.Options.UseFont = true;
+ this.txt_fromDepot.Size = new System.Drawing.Size(259, 28);
+ this.txt_fromDepot.StyleController = this.layoutMx1;
+ this.txt_fromDepot.TabIndex = 222;
+ this.txt_fromDepot.Tag = "fromDepot";
+ //
+ // Root
+ //
+ this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.Root.GroupBordersVisible = false;
+ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem2,
+ this.layoutControlItem3,
+ this.layoutControlItem6,
+ this.layoutControlItem7,
+ this.layoutControlItem8,
+ this.layoutControlItem9,
+ this.layoutControlItem4,
+ this.layoutControlItem1,
+ this.layoutControlItem21,
+ this.layoutControlItem11,
+ this.layoutControlItem20,
+ this.layoutControlItem5});
+ this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.Root.Name = "Root";
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
+ this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6,
+ rowDefinition7});
+ this.Root.Size = new System.Drawing.Size(1408, 271);
+ this.Root.TextVisible = false;
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_itemBarcode;
+ this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem2.CustomizationFormText = "鐗╂枡鏉＄爜";
+ this.layoutControlItem2.Location = new System.Drawing.Point(347, 0);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(347, 35);
+ this.layoutControlItem2.Text = "鐗╂枡鏉＄爜";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_itemNo1;
+ this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem3.CustomizationFormText = "鐗╂枡缂栫爜";
+ this.layoutControlItem3.Location = new System.Drawing.Point(694, 0);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem3.Size = new System.Drawing.Size(347, 35);
+ this.layoutControlItem3.Text = "鐗╂枡缂栫爜";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem24
+ //
+ this.layoutControlItem24.Control = this.lbGuid;
+ this.layoutControlItem24.Location = new System.Drawing.Point(568, 165);
+ this.layoutControlItem24.Name = "layoutControlItem24";
+ this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem24.Size = new System.Drawing.Size(284, 34);
+ this.layoutControlItem24.Text = "lbGuid";
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem24.TextVisible = false;
+ //
+ // txt_invDepot
+ //
+ this.txt_invDepot.Location = new System.Drawing.Point(790, 83);
+ this.txt_invDepot.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_invDepot.Name = "txt_invDepot";
+ this.txt_invDepot.Properties.Appearance.Options.UseFont = true;
+ this.txt_invDepot.Size = new System.Drawing.Size(259, 28);
+ this.txt_invDepot.StyleController = this.layoutMx1;
+ this.txt_invDepot.TabIndex = 222;
+ this.txt_invDepot.Tag = "invDepot";
+ //
+ // txt_name
+ //
+ this.txt_name.Location = new System.Drawing.Point(96, 119);
+ this.txt_name.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_name.Name = "txt_name";
+ this.txt_name.Properties.Appearance.Options.UseFont = true;
+ this.txt_name.Size = new System.Drawing.Size(259, 28);
+ this.txt_name.StyleController = this.layoutMx1;
+ this.txt_name.TabIndex = 222;
+ this.txt_name.Tag = "itemDescription";
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_itemName;
+ this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem6.CustomizationFormText = "鐗╂枡鍚嶇О";
+ this.layoutControlItem6.Location = new System.Drawing.Point(1041, 0);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem6.Size = new System.Drawing.Size(347, 35);
+ this.layoutControlItem6.Text = "鐗╂枡鍚嶇О";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_itemDescription6;
+ this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem7.CustomizationFormText = "瑙勬牸鍨嬪彿";
+ this.layoutControlItem7.Location = new System.Drawing.Point(0, 35);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem7.Size = new System.Drawing.Size(347, 36);
+ this.layoutControlItem7.Text = "瑙勬牸鍨嬪彿";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_quantity;
+ this.layoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem8.CustomizationFormText = "鏁伴噺";
+ this.layoutControlItem8.Location = new System.Drawing.Point(347, 35);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem8.Size = new System.Drawing.Size(347, 36);
+ this.layoutControlItem8.Text = "鏁伴噺";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_description;
+ this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem9.CustomizationFormText = "浜ゆ槗淇℃伅";
+ this.layoutControlItem9.Location = new System.Drawing.Point(694, 35);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem9.Size = new System.Drawing.Size(347, 36);
+ this.layoutControlItem9.Text = "浜ゆ槗淇℃伅";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_creatDate;
+ this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem4.CustomizationFormText = "鍒涘缓鏃堕棿";
+ this.layoutControlItem4.Location = new System.Drawing.Point(1041, 35);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem4.Size = new System.Drawing.Size(347, 36);
+ this.layoutControlItem4.Text = "鍒涘缓鏃堕棿";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_itemDescription1;
+ this.layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem1.CustomizationFormText = "浜ゆ槗绫诲瀷";
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 71);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem1.Size = new System.Drawing.Size(347, 36);
+ this.layoutControlItem1.Text = "浜ゆ槗绫诲瀷";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem21
+ //
+ this.layoutControlItem21.Control = this.txt_name;
+ this.layoutControlItem21.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem21.CustomizationFormText = "浣跨敤缁勭粐";
+ this.layoutControlItem21.Location = new System.Drawing.Point(0, 107);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem21.Size = new System.Drawing.Size(347, 36);
+ this.layoutControlItem21.Text = "浣跨敤缁勭粐";
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_fromDepot;
+ this.layoutControlItem11.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem11.CustomizationFormText = "鍑哄簱浠撳簱";
+ this.layoutControlItem11.Location = new System.Drawing.Point(347, 71);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(347, 36);
+ this.layoutControlItem11.Text = "鍑哄簱浠撳簱";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.txt_invDepot;
+ this.layoutControlItem20.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem20.CustomizationFormText = "鍏ュ簱浠撳簱";
+ this.layoutControlItem20.Location = new System.Drawing.Point(694, 71);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem20.Size = new System.Drawing.Size(347, 36);
+ this.layoutControlItem20.Text = "鍏ュ簱浠撳簱";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 22);
+ //
+ // txt_billNo
+ //
+ this.txt_billNo.Location = new System.Drawing.Point(96, 12);
+ this.txt_billNo.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_billNo.Name = "txt_billNo";
+ this.txt_billNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_billNo.Size = new System.Drawing.Size(259, 28);
+ this.txt_billNo.StyleController = this.layoutMx1;
+ this.txt_billNo.TabIndex = 222;
+ this.txt_billNo.Tag = "billNo";
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_billNo;
+ this.layoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem5.CustomizationFormText = "鍗曟嵁缂栫爜";
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.Size = new System.Drawing.Size(347, 35);
+ this.layoutControlItem5.Text = "鍗曟嵁缂栫爜";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
//
// BTDetails
//
@@ -485,6 +973,40 @@
this.split1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ this.xtraTabPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+ this.splitMx1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+ this.splitMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+ this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_creatDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemDescription1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemBarcode.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemDescription6.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_quantity.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fromDepot.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_invDepot.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
this.ResumeLayout(false);
}
@@ -522,5 +1044,35 @@
private DevExpress.XtraGrid.Columns.GridColumn description;
private DevExpress.XtraGrid.Columns.GridColumn fromDepotId;
private DevExpress.XtraGrid.Columns.GridColumn invDepotId;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+ private DevExpress.XtraLayout.LayoutControl layoutMx1;
+ private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraEditors.TextEdit txt_creatDate;
+ private DevExpress.XtraEditors.TextEdit txt_itemDescription1;
+ private DevExpress.XtraEditors.TextEdit txt_itemBarcode;
+ private DevExpress.XtraEditors.TextEdit txt_itemNo1;
+ private DevExpress.XtraEditors.TextEdit txt_itemName;
+ private DevExpress.XtraEditors.TextEdit txt_itemDescription6;
+ private DevExpress.XtraEditors.TextEdit txt_quantity;
+ private DevExpress.XtraEditors.TextEdit txt_description;
+ private DevExpress.XtraEditors.TextEdit txt_fromDepot;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraEditors.TextEdit txt_invDepot;
+ private DevExpress.XtraEditors.TextEdit txt_name;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraEditors.TextEdit txt_billNo;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.cs
index 327c597..46ee421 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/BTDetails.cs
@@ -1,3 +1,4 @@
+using DevExpress.Utils.DirectXPaint;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -23,14 +24,15 @@
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) =>
{
-
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
});
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
+ getModel(value);
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- });
+ }, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
@@ -82,7 +84,12 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- getPageList(this.pageBar1.CurrentPage);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim());
+ else
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }
}
/// <summary>
@@ -128,5 +135,42 @@
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
+
+ private void getModel(string strGuid)
+ {
+ bool isEdit = false;
+ if (toolBarMenu1.currentAction == "add") return;
+ if (toolBarMenu1.currentAction == "edit") isEdit = true;
+ if (string.IsNullOrEmpty(strGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ var _obj = new
+ {
+ guid = strGuid //涓诲缓
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "GetModel",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ var dy = _rtn.rtnData;
+ lbGuid.Text = strGuid;
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
+ }
+ else
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3