From 794e8cba6af8fc33146bf34caa6940fcaab5f42f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 04 四月 2025 17:35:12 +0800
Subject: [PATCH] 打印按钮
---
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs | 31
DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs | 66 +
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs | 2
DevApp/Gs.DevApp/Gs.DevApp.csproj.user | 2
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs | 2
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 343 ++++++-------
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs | 2
DevApp/Gs.DevApp/Gs.DevApp.csproj | 36 -
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs | 3
DevApp/Gs.DevApp/UserControl/UcBtnPrint.Designer.cs | 103 +++
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs | 2
DevApp/Gs.DevApp/UserControl/SelectFont.cs | 1
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs | 21
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs | 184 +++----
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 39 -
DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs | 2
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs | 295 +++++------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs | 10
DevApp/Gs.DevApp/DevFrm/User/Role.cs | 2
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 281 +++++-----
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs | 12
24 files changed, 731 insertions(+), 714 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
index c31cdd7..edf5e90 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshopLine.cs
@@ -170,7 +170,7 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- getModel(lbGuid.Text.Trim());
+ getModel(rowGuid);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index 0e576fe..34dde71 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -231,7 +231,7 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- getModel(lbGuid.Text.Trim());
+ getModel(rowGuid);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
index 635e23a..47d0bc7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
@@ -264,7 +264,7 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- getModel(lbGuid.Text.Trim());
+ getModel(rowGuid);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 2f46268..ee73342 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -29,34 +29,34 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
+ 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.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -79,7 +79,6 @@
this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckDate = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_checkQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -408,7 +407,6 @@
this.gv_remarks,
this.gv_fcheckBy,
this.gv_fcheckDate,
- this.gv_checkQty,
this.gv_createBy,
this.gridColumn15,
this.gv_lastupdateBy,
@@ -554,7 +552,7 @@
//
this.gv_fbatchQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fbatchQty.AppearanceCell.Options.UseFont = true;
- this.gv_fbatchQty.Caption = "閲囪喘鏁伴噺";
+ this.gv_fbatchQty.Caption = "鏀惰揣鏁伴噺";
this.gv_fbatchQty.FieldName = "fbatchQty";
this.gv_fbatchQty.MinWidth = 30;
this.gv_fbatchQty.Name = "gv_fbatchQty";
@@ -635,20 +633,6 @@
this.gv_fcheckDate.VisibleIndex = 15;
this.gv_fcheckDate.Width = 182;
//
- // gv_checkQty
- //
- this.gv_checkQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_checkQty.AppearanceCell.Options.UseFont = true;
- this.gv_checkQty.Caption = "鎶芥鏁伴噺";
- this.gv_checkQty.FieldName = "checkQty";
- this.gv_checkQty.MinWidth = 30;
- this.gv_checkQty.Name = "gv_checkQty";
- this.gv_checkQty.OptionsColumn.AllowEdit = false;
- this.gv_checkQty.Tag = "query_a.check_qty";
- this.gv_checkQty.Visible = true;
- this.gv_checkQty.VisibleIndex = 16;
- this.gv_checkQty.Width = 50;
- //
// gv_createBy
//
this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -670,7 +654,7 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 17;
+ this.gridColumn15.VisibleIndex = 16;
this.gridColumn15.Width = 94;
//
// gv_lastupdateBy
@@ -684,7 +668,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 18;
+ this.gv_lastupdateBy.VisibleIndex = 17;
this.gv_lastupdateBy.Width = 60;
//
// gv_lastupdateDate
@@ -698,7 +682,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 19;
+ this.gv_lastupdateDate.VisibleIndex = 18;
this.gv_lastupdateDate.Width = 120;
//
// gv_fngHandle
@@ -712,7 +696,7 @@
this.gv_fngHandle.OptionsColumn.AllowEdit = false;
this.gv_fngHandle.Tag = "query_a.fng_handle";
this.gv_fngHandle.Visible = true;
- this.gv_fngHandle.VisibleIndex = 20;
+ this.gv_fngHandle.VisibleIndex = 19;
this.gv_fngHandle.Width = 100;
//
// bandedGridColumn1
@@ -723,7 +707,7 @@
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Tag = "org.fnamber";
this.bandedGridColumn1.Visible = true;
- this.bandedGridColumn1.VisibleIndex = 21;
+ this.bandedGridColumn1.VisibleIndex = 20;
this.bandedGridColumn1.Width = 250;
//
// gridColumn18
@@ -733,7 +717,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 22;
+ this.gridColumn18.VisibleIndex = 21;
this.gridColumn18.Width = 94;
//
// gridColumn19
@@ -743,7 +727,7 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 23;
+ this.gridColumn19.VisibleIndex = 22;
this.gridColumn19.Width = 94;
//
// gridColumn17
@@ -761,7 +745,7 @@
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 24;
+ this.gridColumn23.VisibleIndex = 23;
this.gridColumn23.Width = 94;
//
// pageBar1
@@ -848,28 +832,28 @@
// txt_suppName
//
this.txt_suppName.Enabled = false;
- this.txt_suppName.Location = new System.Drawing.Point(744, 76);
+ this.txt_suppName.Location = new System.Drawing.Point(734, 76);
this.txt_suppName.Name = "txt_suppName";
- this.txt_suppName.Size = new System.Drawing.Size(254, 24);
+ this.txt_suppName.Size = new System.Drawing.Size(249, 24);
this.txt_suppName.StyleController = this.layoutMx1;
this.txt_suppName.TabIndex = 801;
this.txt_suppName.Tag = "readonly";
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(414, 108);
+ this.txt_remarks.Location = new System.Drawing.Point(409, 108);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
- this.txt_remarks.Size = new System.Drawing.Size(584, 28);
+ this.txt_remarks.Size = new System.Drawing.Size(574, 28);
this.txt_remarks.StyleController = this.layoutMx1;
this.txt_remarks.TabIndex = 797;
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(414, 76);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(409, 76);
this.txt_fcheckResu.Name = "txt_fcheckResu";
- this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
+ this.txt_fcheckResu.Size = new System.Drawing.Size(249, 24);
this.txt_fcheckResu.StyleController = this.layoutMx1;
this.txt_fcheckResu.TabIndex = 798;
this.txt_fcheckResu.Tag = "readonly";
@@ -880,7 +864,7 @@
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(254, 28);
+ this.txt_itemName.Size = new System.Drawing.Size(249, 28);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 800;
this.txt_itemName.Tag = "readonly";
@@ -891,29 +875,29 @@
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(254, 28);
+ this.txt_releaseNo.Size = new System.Drawing.Size(249, 28);
this.txt_releaseNo.StyleController = this.layoutMx1;
this.txt_releaseNo.TabIndex = 213;
this.txt_releaseNo.Tag = "readonly";
//
// txt_fcheckDate
//
- this.txt_fcheckDate.Location = new System.Drawing.Point(414, 12);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(409, 12);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckDate.Size = new System.Drawing.Size(254, 28);
+ this.txt_fcheckDate.Size = new System.Drawing.Size(249, 28);
this.txt_fcheckDate.StyleController = this.layoutMx1;
this.txt_fcheckDate.TabIndex = 216;
this.txt_fcheckDate.Tag = "readonly";
//
// txt_lotNo
//
- this.txt_lotNo.Location = new System.Drawing.Point(744, 12);
+ this.txt_lotNo.Location = new System.Drawing.Point(734, 12);
this.txt_lotNo.Name = "txt_lotNo";
this.txt_lotNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
- this.txt_lotNo.Size = new System.Drawing.Size(254, 28);
+ this.txt_lotNo.Size = new System.Drawing.Size(249, 28);
this.txt_lotNo.StyleController = this.layoutMx1;
this.txt_lotNo.TabIndex = 262;
this.txt_lotNo.Tag = "readonly";
@@ -924,7 +908,7 @@
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(254, 28);
+ this.txt_itemNo.Size = new System.Drawing.Size(249, 28);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 789;
this.txt_itemNo.Tag = "readonly";
@@ -933,7 +917,7 @@
//
this.txt_itemModel.Location = new System.Drawing.Point(84, 108);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(249, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 801;
this.txt_itemModel.Tag = "readonly";
@@ -949,59 +933,59 @@
//
// txt_fcheckBy
//
- this.txt_fcheckBy.Location = new System.Drawing.Point(414, 44);
+ this.txt_fcheckBy.Location = new System.Drawing.Point(409, 44);
this.txt_fcheckBy.Name = "txt_fcheckBy";
this.txt_fcheckBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckBy.Size = new System.Drawing.Size(254, 28);
+ this.txt_fcheckBy.Size = new System.Drawing.Size(249, 28);
this.txt_fcheckBy.StyleController = this.layoutMx1;
this.txt_fcheckBy.TabIndex = 217;
this.txt_fcheckBy.Tag = "readonly";
//
// txt_fbatchQty
//
- this.txt_fbatchQty.Location = new System.Drawing.Point(744, 44);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(734, 44);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
- this.txt_fbatchQty.Size = new System.Drawing.Size(254, 28);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(249, 28);
this.txt_fbatchQty.StyleController = this.layoutMx1;
this.txt_fbatchQty.TabIndex = 222;
this.txt_fbatchQty.Tag = "readonly";
//
// txt_fsubmitBy
//
- this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 44);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1059, 44);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
- this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
+ this.txt_fsubmitBy.Size = new System.Drawing.Size(250, 24);
this.txt_fsubmitBy.StyleController = this.layoutMx1;
this.txt_fsubmitBy.TabIndex = 804;
this.txt_fsubmitBy.Tag = "readonly";
//
// txt_fsubmitDate
//
- this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 76);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(1059, 76);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
- this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24);
+ this.txt_fsubmitDate.Size = new System.Drawing.Size(250, 24);
this.txt_fsubmitDate.StyleController = this.layoutMx1;
this.txt_fsubmitDate.TabIndex = 805;
this.txt_fsubmitDate.Tag = "readonly";
//
// txt_fsubmit
//
- this.txt_fsubmit.Location = new System.Drawing.Point(1002, 12);
+ this.txt_fsubmit.Location = new System.Drawing.Point(987, 12);
this.txt_fsubmit.Name = "txt_fsubmit";
this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
+ this.txt_fsubmit.Size = new System.Drawing.Size(322, 24);
this.txt_fsubmit.StyleController = this.layoutMx1;
this.txt_fsubmit.TabIndex = 806;
this.txt_fsubmit.Tag = "readonly";
//
// txt_slOrg
//
- this.txt_slOrg.Location = new System.Drawing.Point(1074, 108);
+ this.txt_slOrg.Location = new System.Drawing.Point(1059, 108);
this.txt_slOrg.Name = "txt_slOrg";
- this.txt_slOrg.Size = new System.Drawing.Size(256, 24);
+ this.txt_slOrg.Size = new System.Drawing.Size(250, 24);
this.txt_slOrg.StyleController = this.layoutMx1;
this.txt_slOrg.TabIndex = 807;
this.txt_slOrg.Tag = "readonly";
@@ -1070,33 +1054,33 @@
this.layoutControlItem18});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition9.Width = 100D;
- columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition10.Width = 100D;
- columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition11.Width = 100D;
- columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition12.Width = 100D;
+ 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[] {
- columnDefinition9,
- columnDefinition10,
- columnDefinition11,
- columnDefinition12});
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ 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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition6,
- rowDefinition7,
- rowDefinition8,
- rowDefinition9});
- this.Root.Size = new System.Drawing.Size(1342, 148);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
+ this.Root.Size = new System.Drawing.Size(1321, 148);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1104,27 +1088,27 @@
this.layoutControlItem1.Control = this.txt_releaseNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(330, 32);
+ this.layoutControlItem1.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fcheckDate;
- this.layoutControlItem2.Location = new System.Drawing.Point(330, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(325, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(330, 32);
+ this.layoutControlItem2.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_lotNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(660, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(650, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(330, 32);
+ this.layoutControlItem3.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem3.Text = "閫佹鎵瑰彿";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1134,7 +1118,7 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(330, 32);
+ this.layoutControlItem4.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1144,7 +1128,7 @@
this.layoutControlItem5.Location = new System.Drawing.Point(0, 64);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(330, 32);
+ this.layoutControlItem5.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1154,83 +1138,83 @@
this.layoutControlItem6.Location = new System.Drawing.Point(0, 96);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(330, 32);
+ this.layoutControlItem6.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fcheckBy;
- this.layoutControlItem8.Location = new System.Drawing.Point(330, 32);
+ this.layoutControlItem8.Location = new System.Drawing.Point(325, 32);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(330, 32);
+ this.layoutControlItem8.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(660, 32);
+ this.layoutControlItem9.Location = new System.Drawing.Point(650, 32);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(330, 32);
- this.layoutControlItem9.Text = "鎵规鏁伴噺";
+ this.layoutControlItem9.Size = new System.Drawing.Size(325, 32);
+ this.layoutControlItem9.Text = "鏀惰揣鏁伴噺";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(330, 64);
+ this.layoutControlItem10.Location = new System.Drawing.Point(325, 64);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(330, 32);
+ this.layoutControlItem10.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_suppName;
- this.layoutControlItem13.Location = new System.Drawing.Point(660, 64);
+ this.layoutControlItem13.Location = new System.Drawing.Point(650, 64);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(330, 32);
+ this.layoutControlItem13.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem13.Text = "渚涘簲鍟�";
this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fsubmitBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(990, 32);
+ this.layoutControlItem15.Location = new System.Drawing.Point(975, 32);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(332, 32);
+ this.layoutControlItem15.Size = new System.Drawing.Size(326, 32);
this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fsubmitDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(990, 64);
+ this.layoutControlItem16.Location = new System.Drawing.Point(975, 64);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(332, 32);
+ this.layoutControlItem16.Size = new System.Drawing.Size(326, 32);
this.layoutControlItem16.Text = "瀹℃牳浜�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fsubmit;
- this.layoutControlItem14.Location = new System.Drawing.Point(990, 0);
+ this.layoutControlItem14.Location = new System.Drawing.Point(975, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(332, 32);
+ this.layoutControlItem14.Size = new System.Drawing.Size(326, 32);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -1238,23 +1222,23 @@
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(330, 96);
+ this.layoutControlItem12.Location = new System.Drawing.Point(325, 96);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(660, 32);
+ this.layoutControlItem12.Size = new System.Drawing.Size(650, 32);
this.layoutControlItem12.Text = "澶囨敞璇存槑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_slOrg;
- this.layoutControlItem18.Location = new System.Drawing.Point(990, 96);
+ this.layoutControlItem18.Location = new System.Drawing.Point(975, 96);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(332, 32);
+ this.layoutControlItem18.Size = new System.Drawing.Size(326, 32);
this.layoutControlItem18.Text = "鏀舵枡缁勭粐";
this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1846,23 +1830,23 @@
this.layoutControlItem19});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition13.Width = 100D;
- columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition14.Width = 100D;
- columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition15.Width = 100D;
- columnDefinition16.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition16.Width = 110D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ columnDefinition8.Width = 110D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition13,
- columnDefinition14,
- columnDefinition15,
- columnDefinition16});
- rowDefinition10.Height = 100D;
- rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition10});
+ rowDefinition5});
this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43);
this.layoutControlGroup1.TextVisible = false;
@@ -2023,10 +2007,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.show_16x162;
- editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.show_16x162;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "娴忚", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "娴忚", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -2044,10 +2028,10 @@
// repositoryItemButtonEdit3
//
this.repositoryItemButtonEdit3.AutoHeight = false;
- editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.download_16x16;
- editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "涓嬭浇", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
@@ -2065,10 +2049,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍒犻櫎", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍒犻櫎", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -2262,7 +2246,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckDate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_checkQty;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_fngHandle;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
index 4929ec8..43aaa6f 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -188,7 +188,15 @@
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(rowGuid);
+ }
+ else
+ {
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true);
+ }
+
}
/// <summary>
/// 鏂板浜嬩欢
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index f502791..c52b45a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -209,7 +209,7 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- getModel(lbGuid.Text.Trim());
+ getModel(rowGuid);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index 50499aa..0d7b467 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -248,7 +248,7 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- getModel(lbGuid.Text.Trim());
+ getModel(rowGuid);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
index b31ad45..574053b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -175,7 +175,7 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- getModel(lbGuid.Text.Trim());
+ getModel(rowGuid);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
index 58ffdf9..51a89ee 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_MesSysPageview.cs
@@ -127,6 +127,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
+
string rowGuid = "", rowName = "";
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_pageView, gridView1);
if (string.IsNullOrEmpty(rowGuid))
@@ -135,7 +136,16 @@
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(rowGuid);
+ }
+ else
+ {
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true);
+ }
+
+
}
/// <summary>
/// 鏂板浜嬩欢
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
index b1c645c..6db38ce 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_PrintUser.cs
@@ -170,7 +170,7 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- getModel(lbGuid.Text.Trim());
+ getModel(rowGuid);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
index ce873c3..d9611a5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysMenu.cs
@@ -85,7 +85,7 @@
{
var rowGuid = UtilityHelper.GetCurrentDoubleRow(tlMenu, e, "guid");
if (!string.IsNullOrEmpty(rowGuid))
- getModel(rowGuid, false, 999);
+ getModel(rowGuid);
}
/// <summary>
@@ -95,7 +95,7 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
}
/// <summary>
@@ -125,7 +125,10 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ { }
+ else
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
getTree();
}
@@ -144,8 +147,21 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getTree();
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim());
+ else
+ {
+ //_filterList.Clear();
+ //if (gridView1.ActiveFilter.Count > 0)
+ //{
+ // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ // gridView1.ActiveFilter.Clear();
+ // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ //}
+ //getPageList(1);
+ getTree();
+ }
+
}
/// <summary>
@@ -155,26 +171,35 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_name, tlMenu);
+
+ string rowGuid = "", rowName = "";
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_name, tlMenu);
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
-
- getModel(rowGuid, true, 1);
- if (txt_category.SelectedIndex == 1)
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- txt_formPath.Enabled = true;
- txt_icon.Enabled = true;
+ getModel(rowGuid);
+ if (txt_category.SelectedIndex == 1)
+ {
+ txt_formPath.Enabled = true;
+ txt_icon.Enabled = true;
+ }
+ else
+ {
+ txt_formPath.Enabled = false;
+ txt_icon.Enabled = false;
+ }
}
else
{
- txt_formPath.Enabled = false;
- txt_icon.Enabled = false;
+ UtilityHelper.ChangeEnableByControl(this.panel1.Controls, true);
}
+
+
}
/// <summary>
@@ -184,9 +209,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 1);
lbGuid.Text = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
UtilityHelper.CleanValueByControl(panel1.Controls, true);
+
}
/// <summary>
@@ -278,14 +304,16 @@
}
}
- private void getModel(string strGuid, bool isEdit, int tabIdx)
+ 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;
}
- UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
var _obj = new
{
guid = strGuid //涓诲缓
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index 562dc7b..89613dd 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -175,7 +175,7 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- getModel(lbGuid.Text.Trim());
+ getModel(rowGuid);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 365f764..99722b4 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -29,39 +29,34 @@
/// </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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -231,13 +226,12 @@
this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.panMx98 = new System.Windows.Forms.Panel();
this.layoutMx98 = new DevExpress.XtraLayout.LayoutControl();
this.ucBtnPrint98 = new Gs.DevApp.UserControl.UcBtnPrint();
@@ -342,7 +336,6 @@
this.xtraTabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
this.panMx98.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutMx98)).BeginInit();
this.layoutMx98.SuspendLayout();
@@ -1290,38 +1283,38 @@
this.layoutControlItem27});
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;
+ columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition16.Width = 100D;
+ columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition17.Width = 100D;
+ columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition18.Width = 100D;
+ columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition19.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;
+ columnDefinition16,
+ columnDefinition17,
+ columnDefinition18,
+ columnDefinition19});
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition13.Height = 100D;
+ rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition14.Height = 100D;
+ rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6});
+ rowDefinition9,
+ rowDefinition10,
+ rowDefinition11,
+ rowDefinition12,
+ rowDefinition13,
+ rowDefinition14});
this.Root.Size = new System.Drawing.Size(1105, 188);
this.Root.TextVisible = false;
//
@@ -2160,10 +2153,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -2188,7 +2181,7 @@
this.layoutMx99.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx99.Location = new System.Drawing.Point(0, 0);
this.layoutMx99.Name = "layoutMx99";
- this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 65, 812, 500);
+ this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(288, 465, 812, 500);
this.layoutMx99.Root = this.layoutControlGroup1;
this.layoutMx99.Size = new System.Drawing.Size(1124, 54);
this.layoutMx99.TabIndex = 0;
@@ -2197,11 +2190,11 @@
// ucBtnPrint1
//
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(932, 12);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(931, 10);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(180, 30);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(182, 34);
this.ucBtnPrint1.TabIndex = 464;
//
// txt_iCount_1
@@ -2270,34 +2263,36 @@
this.layoutControlItem26});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
- columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition9.Width = 100D;
- columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition10.Width = 100D;
+ columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition20.Width = 100D;
+ columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition21.Width = 100D;
+ columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition22.Width = 100D;
+ columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition23.Width = 100D;
+ columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition24.Width = 100D;
+ columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition25.Width = 100D;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8,
- columnDefinition9,
- columnDefinition10});
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition20,
+ columnDefinition21,
+ columnDefinition22,
+ columnDefinition23,
+ columnDefinition24,
+ columnDefinition25});
+ rowDefinition15.Height = 100D;
+ rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition7});
+ rowDefinition15});
this.layoutControlGroup1.Size = new System.Drawing.Size(1124, 54);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem22
//
+ this.layoutControlItem22.AppearanceItemCaption.Options.UseTextOptions = true;
+ this.layoutControlItem22.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem22.Control = this.txt_yQty;
this.layoutControlItem22.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem22.Name = "layoutControlItem22";
@@ -2307,6 +2302,8 @@
//
// layoutControlItem23
//
+ this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true;
+ this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem23.Control = this.txt_kQty;
this.layoutControlItem23.Location = new System.Drawing.Point(184, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
@@ -2317,6 +2314,8 @@
//
// layoutControlItem21
//
+ this.layoutControlItem21.AppearanceItemCaption.Options.UseTextOptions = true;
+ this.layoutControlItem21.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem21.Control = this.txt_printRemark;
this.layoutControlItem21.Location = new System.Drawing.Point(368, 0);
this.layoutControlItem21.Name = "layoutControlItem21";
@@ -2327,6 +2326,8 @@
//
// layoutControlItem24
//
+ this.layoutControlItem24.AppearanceItemCaption.Options.UseTextOptions = true;
+ this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem24.Control = this.txt_psnQty_1;
this.layoutControlItem24.Location = new System.Drawing.Point(552, 0);
this.layoutControlItem24.Name = "layoutControlItem24";
@@ -2337,6 +2338,8 @@
//
// layoutControlItem25
//
+ this.layoutControlItem25.AppearanceItemCaption.Options.UseTextOptions = true;
+ this.layoutControlItem25.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem25.Control = this.txt_iCount_1;
this.layoutControlItem25.Location = new System.Drawing.Point(736, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
@@ -2347,10 +2350,13 @@
//
// layoutControlItem26
//
+ this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true;
+ this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem26.Control = this.ucBtnPrint1;
this.layoutControlItem26.Location = new System.Drawing.Point(920, 0);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 5;
+ this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
this.layoutControlItem26.Size = new System.Drawing.Size(184, 34);
this.layoutControlItem26.Text = "鎶ュ伐鎵撳嵃";
this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
@@ -2367,12 +2373,10 @@
// gcMx3
//
this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx3.Location = new System.Drawing.Point(0, 48);
+ this.gcMx3.Location = new System.Drawing.Point(0, 54);
this.gcMx3.MainView = this.gvMx3;
this.gcMx3.Name = "gcMx3";
- this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit2});
- this.gcMx3.Size = new System.Drawing.Size(1124, 433);
+ this.gcMx3.Size = new System.Drawing.Size(1124, 427);
this.gcMx3.TabIndex = 1;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -2419,16 +2423,6 @@
this.gridColumn38.Visible = true;
this.gridColumn38.VisibleIndex = 0;
this.gridColumn38.Width = 94;
- //
- // gridColumn34
- //
- this.gridColumn34.Caption = "绾垮埆ID";
- this.gridColumn34.FieldName = "lineId";
- this.gridColumn34.MinWidth = 25;
- this.gridColumn34.Name = "gridColumn34";
- this.gridColumn34.Visible = true;
- this.gridColumn34.VisibleIndex = 5;
- this.gridColumn34.Width = 94;
//
// gridColumn36
//
@@ -2478,6 +2472,16 @@
this.gridColumn43.VisibleIndex = 4;
this.gridColumn43.Width = 94;
//
+ // gridColumn34
+ //
+ this.gridColumn34.Caption = "绾垮埆ID";
+ this.gridColumn34.FieldName = "lineId";
+ this.gridColumn34.MinWidth = 25;
+ this.gridColumn34.Name = "gridColumn34";
+ this.gridColumn34.Visible = true;
+ this.gridColumn34.VisibleIndex = 5;
+ this.gridColumn34.Width = 94;
+ //
// gridColumn35
//
this.gridColumn35.Caption = "绾垮埆鍚嶇О";
@@ -2488,23 +2492,13 @@
this.gridColumn35.VisibleIndex = 6;
this.gridColumn35.Width = 94;
//
- // repositoryItemButtonEdit2
- //
- this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
- this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
- //
// panMx98
//
this.panMx98.Controls.Add(this.layoutMx98);
this.panMx98.Dock = System.Windows.Forms.DockStyle.Top;
this.panMx98.Location = new System.Drawing.Point(0, 0);
this.panMx98.Name = "panMx98";
- this.panMx98.Size = new System.Drawing.Size(1124, 48);
+ this.panMx98.Size = new System.Drawing.Size(1124, 54);
this.panMx98.TabIndex = 0;
//
// layoutMx98
@@ -2517,19 +2511,20 @@
this.layoutMx98.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx98.Location = new System.Drawing.Point(0, 0);
this.layoutMx98.Name = "layoutMx98";
+ this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(199, 178, 812, 500);
this.layoutMx98.Root = this.layoutControlGroup2;
- this.layoutMx98.Size = new System.Drawing.Size(1124, 48);
+ this.layoutMx98.Size = new System.Drawing.Size(1124, 54);
this.layoutMx98.TabIndex = 0;
this.layoutMx98.Text = "layoutControl1";
//
// ucBtnPrint98
//
this.ucBtnPrint98.guidKey = null;
- this.ucBtnPrint98.Location = new System.Drawing.Point(895, 12);
+ this.ucBtnPrint98.Location = new System.Drawing.Point(894, 10);
this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint98.Name = "ucBtnPrint98";
this.ucBtnPrint98.rptParameter = null;
- this.ucBtnPrint98.Size = new System.Drawing.Size(217, 24);
+ this.ucBtnPrint98.Size = new System.Drawing.Size(219, 34);
this.ucBtnPrint98.TabIndex = 8;
//
// txt_yQty98
@@ -2577,28 +2572,28 @@
this.layoutControlItem33,
this.layoutControlItem34});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
- this.layoutControlGroup2.Name = "layoutControlGroup2";
- columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition11.Width = 100D;
- columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition12.Width = 100D;
- columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition13.Width = 100D;
- columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition14.Width = 100D;
- columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition15.Width = 100D;
+ this.layoutControlGroup2.Name = "Root";
+ columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition26.Width = 100D;
+ columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition27.Width = 100D;
+ columnDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition28.Width = 100D;
+ columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition29.Width = 100D;
+ columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition30.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition11,
- columnDefinition12,
- columnDefinition13,
- columnDefinition14,
- columnDefinition15});
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition26,
+ columnDefinition27,
+ columnDefinition28,
+ columnDefinition29,
+ columnDefinition30});
+ rowDefinition16.Height = 100D;
+ rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition8});
- this.layoutControlGroup2.Size = new System.Drawing.Size(1124, 48);
+ rowDefinition16});
+ this.layoutControlGroup2.Size = new System.Drawing.Size(1124, 54);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem30
@@ -2606,7 +2601,7 @@
this.layoutControlItem30.Control = this.txt_yQty98;
this.layoutControlItem30.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem30.Name = "layoutControlItem30";
- this.layoutControlItem30.Size = new System.Drawing.Size(220, 28);
+ this.layoutControlItem30.Size = new System.Drawing.Size(220, 34);
this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�";
this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
//
@@ -2616,7 +2611,7 @@
this.layoutControlItem31.Location = new System.Drawing.Point(220, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem31.Size = new System.Drawing.Size(221, 28);
+ this.layoutControlItem31.Size = new System.Drawing.Size(221, 34);
this.layoutControlItem31.Text = "鍙墦鍗版暟閲�";
this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
//
@@ -2626,7 +2621,7 @@
this.layoutControlItem32.Location = new System.Drawing.Point(441, 0);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem32.Size = new System.Drawing.Size(221, 28);
+ this.layoutControlItem32.Size = new System.Drawing.Size(221, 34);
this.layoutControlItem32.Text = "鎵撳嵃澶囨敞";
this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
//
@@ -2636,7 +2631,7 @@
this.layoutControlItem33.Location = new System.Drawing.Point(662, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem33.Size = new System.Drawing.Size(221, 28);
+ this.layoutControlItem33.Size = new System.Drawing.Size(221, 34);
this.layoutControlItem33.Text = "鏈鎵撳嵃寮犳暟";
this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
//
@@ -2646,7 +2641,9 @@
this.layoutControlItem34.Location = new System.Drawing.Point(883, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem34.Size = new System.Drawing.Size(221, 28);
+ this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
+ this.layoutControlItem34.Size = new System.Drawing.Size(221, 34);
+ this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem34.TextVisible = false;
//
@@ -2750,7 +2747,6 @@
this.xtraTabPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
this.panMx98.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutMx98)).EndInit();
this.layoutMx98.ResumeLayout(false);
@@ -2941,7 +2937,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn42;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn43;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
private System.Windows.Forms.Panel panMx98;
private DevExpress.XtraLayout.LayoutControl layoutMx98;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
index 1c0036e..521027a 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
@@ -167,17 +167,26 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
- string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1);
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_daa001, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(rowGuid);
+ }
+ else
+ {
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
+ }
+
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
index 5c79944..104b889 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
@@ -221,17 +221,28 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
- string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_hNo, gridView1);
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_hNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
+
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(rowGuid);
+
+ }
+ else
+ {
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
+ }
+
}
/// <summary>
/// 鏂板浜嬩欢
@@ -373,15 +384,11 @@
private void getModel(string strGuid)
{
bool isEdit = false;
- if (toolBarMenu1.currentAction == "add")
- {
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
- return;
- };
+ if (toolBarMenu1.currentAction == "add") return;
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
index 9800d75..ab9c7f3 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
@@ -311,13 +311,14 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 1);
lbGuid.Text = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gridViews.Add(gvMx1);
gridViews.Add(gvMx2);
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+
}
/// <summary>
/// 淇濆瓨浜嬩欢
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
index f93c242..9e36d21 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
@@ -248,7 +248,7 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- getModel(lbGuid.Text.Trim());
+ getModel(rowGuid);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 35e098a..0cc2888 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -29,19 +29,19 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+ 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -50,17 +50,20 @@
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_depotsCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -151,9 +154,6 @@
this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -280,7 +280,6 @@
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
@@ -293,7 +292,6 @@
//
this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Appearance.ViewCaption.Options.UseTextOptions = true;
this.gridView1.Appearance.ViewCaption.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
@@ -335,7 +333,6 @@
//
// gv_urgentFlag
//
-
this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
this.gv_urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
this.gv_urgentFlag.FieldName = "urgentFlag";
@@ -348,22 +345,18 @@
this.gv_urgentFlag.VisibleIndex = 1;
this.gv_urgentFlag.Width = 50;
//
- // gv_fstatus
+ // gridColumn25
//
-
- this.gv_fstatus.AppearanceCell.Options.UseFont = true;
- this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
- this.gv_fstatus.FieldName = "fstatus";
- this.gv_fstatus.MaxWidth = 50;
- this.gv_fstatus.MinWidth = 50;
- this.gv_fstatus.Name = "gv_fstatus";
- this.gv_fstatus.OptionsColumn.AllowEdit = false;
- this.gv_fstatus.Tag = "query_a.fstatus";
- this.gv_fstatus.Width = 50;
+ this.gridColumn25.Caption = "濮斿鏍囪瘑";
+ this.gridColumn25.FieldName = "fType";
+ this.gridColumn25.MinWidth = 25;
+ this.gridColumn25.Name = "gridColumn25";
+ this.gridColumn25.Visible = true;
+ this.gridColumn25.VisibleIndex = 2;
+ this.gridColumn25.Width = 94;
//
// gv_status
//
-
this.gv_status.AppearanceCell.Options.UseFont = true;
this.gv_status.Caption = "鍏ュ簱";
this.gv_status.FieldName = "statusChk";
@@ -378,7 +371,6 @@
//
// gv_billNo
//
-
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鍒拌揣鍗曞彿";
this.gv_billNo.FieldName = "billNo";
@@ -404,7 +396,6 @@
//
// gv_createBy
//
-
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
this.gv_createBy.FieldName = "createBy";
@@ -416,23 +407,18 @@
this.gv_createBy.VisibleIndex = 6;
this.gv_createBy.Width = 94;
//
- // gv_checkDate
+ // gridColumn26
//
-
- this.gv_checkDate.AppearanceCell.Options.UseFont = true;
- this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
- this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 50;
- this.gv_checkDate.Name = "gv_checkDate";
- this.gv_checkDate.OptionsColumn.AllowEdit = false;
- this.gv_checkDate.Tag = "query_a.check_date";
- this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 15;
- this.gv_checkDate.Width = 180;
+ this.gridColumn26.Caption = "鍒涘缓鏃ユ湡";
+ this.gridColumn26.FieldName = "createDate";
+ this.gridColumn26.MinWidth = 25;
+ this.gridColumn26.Name = "gridColumn26";
+ this.gridColumn26.Visible = true;
+ this.gridColumn26.VisibleIndex = 7;
+ this.gridColumn26.Width = 94;
//
// gv_suppNo
//
-
this.gv_suppNo.AppearanceCell.Options.UseFont = true;
this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮�";
this.gv_suppNo.FieldName = "suppNo";
@@ -441,7 +427,7 @@
this.gv_suppNo.OptionsColumn.AllowEdit = false;
this.gv_suppNo.Tag = "query_a.supp_no";
this.gv_suppNo.Visible = true;
- this.gv_suppNo.VisibleIndex = 9;
+ this.gv_suppNo.VisibleIndex = 8;
this.gv_suppNo.Width = 94;
//
// gridColumn2
@@ -452,12 +438,11 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 10;
+ this.gridColumn2.VisibleIndex = 9;
this.gridColumn2.Width = 200;
//
// gv_depotsCode
//
-
this.gv_depotsCode.AppearanceCell.Options.UseFont = true;
this.gv_depotsCode.Caption = "鏀惰揣浠撳簱缂栫爜";
this.gv_depotsCode.FieldName = "depotsCode";
@@ -466,7 +451,7 @@
this.gv_depotsCode.OptionsColumn.AllowEdit = false;
this.gv_depotsCode.Tag = "query_a.depots_code";
this.gv_depotsCode.Visible = true;
- this.gv_depotsCode.VisibleIndex = 11;
+ this.gv_depotsCode.VisibleIndex = 10;
this.gv_depotsCode.Width = 94;
//
// gridColumn3
@@ -477,12 +462,11 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.AllowEdit = false;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 12;
+ this.gridColumn3.VisibleIndex = 11;
this.gridColumn3.Width = 94;
//
// gv_remark
//
-
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "澶囨敞";
this.gv_remark.FieldName = "remark";
@@ -491,8 +475,43 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 13;
+ this.gv_remark.VisibleIndex = 12;
this.gv_remark.Width = 94;
+ //
+ // gv_fstatus
+ //
+ this.gv_fstatus.AppearanceCell.Options.UseFont = true;
+ this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
+ this.gv_fstatus.FieldName = "fstatus";
+ this.gv_fstatus.MaxWidth = 50;
+ this.gv_fstatus.MinWidth = 50;
+ this.gv_fstatus.Name = "gv_fstatus";
+ this.gv_fstatus.OptionsColumn.AllowEdit = false;
+ this.gv_fstatus.Tag = "query_a.fstatus";
+ this.gv_fstatus.Width = 50;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "瀹℃牳浜�";
+ this.gridColumn11.FieldName = "checkUser";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 13;
+ this.gridColumn11.Width = 94;
+ //
+ // gv_checkDate
+ //
+ this.gv_checkDate.AppearanceCell.Options.UseFont = true;
+ this.gv_checkDate.Caption = "瀹℃牳鏃堕棿";
+ this.gv_checkDate.FieldName = "checkDate";
+ this.gv_checkDate.MinWidth = 50;
+ this.gv_checkDate.Name = "gv_checkDate";
+ this.gv_checkDate.OptionsColumn.AllowEdit = false;
+ this.gv_checkDate.Tag = "query_a.check_date";
+ this.gv_checkDate.Visible = true;
+ this.gv_checkDate.VisibleIndex = 14;
+ this.gv_checkDate.Width = 180;
//
// pageBar1
//
@@ -570,41 +589,37 @@
//
// txt_dptName
//
- this.txt_dptName.Location = new System.Drawing.Point(445, 44);
+ this.txt_dptName.Location = new System.Drawing.Point(445, 42);
this.txt_dptName.Name = "txt_dptName";
-
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
- this.txt_dptName.Size = new System.Drawing.Size(225, 28);
+ this.txt_dptName.Size = new System.Drawing.Size(225, 24);
this.txt_dptName.StyleController = this.layoutMx1;
this.txt_dptName.TabIndex = 468;
//
// txt_gysNo
//
- this.txt_gysNo.Location = new System.Drawing.Point(114, 76);
+ this.txt_gysNo.Location = new System.Drawing.Point(114, 72);
this.txt_gysNo.Name = "txt_gysNo";
-
this.txt_gysNo.Properties.Appearance.Options.UseFont = true;
- this.txt_gysNo.Size = new System.Drawing.Size(225, 28);
+ this.txt_gysNo.Size = new System.Drawing.Size(225, 24);
this.txt_gysNo.StyleController = this.layoutMx1;
this.txt_gysNo.TabIndex = 467;
//
// txt_depotsCode
//
- this.txt_depotsCode.Location = new System.Drawing.Point(445, 76);
+ this.txt_depotsCode.Location = new System.Drawing.Point(445, 72);
this.txt_depotsCode.Name = "txt_depotsCode";
-
this.txt_depotsCode.Properties.Appearance.Options.UseFont = true;
- this.txt_depotsCode.Size = new System.Drawing.Size(225, 28);
+ this.txt_depotsCode.Size = new System.Drawing.Size(225, 24);
this.txt_depotsCode.StyleController = this.layoutMx1;
this.txt_depotsCode.TabIndex = 462;
//
// txt_barcodeProgress
//
- this.txt_barcodeProgress.Location = new System.Drawing.Point(776, 108);
+ this.txt_barcodeProgress.Location = new System.Drawing.Point(776, 102);
this.txt_barcodeProgress.Name = "txt_barcodeProgress";
-
this.txt_barcodeProgress.Properties.Appearance.Options.UseFont = true;
- this.txt_barcodeProgress.Size = new System.Drawing.Size(225, 28);
+ this.txt_barcodeProgress.Size = new System.Drawing.Size(225, 24);
this.txt_barcodeProgress.StyleController = this.layoutMx1;
this.txt_barcodeProgress.TabIndex = 342;
//
@@ -612,9 +627,8 @@
//
this.txt_paperBillNo.Location = new System.Drawing.Point(445, 12);
this.txt_paperBillNo.Name = "txt_paperBillNo";
-
this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_paperBillNo.Size = new System.Drawing.Size(225, 28);
+ this.txt_paperBillNo.Size = new System.Drawing.Size(225, 24);
this.txt_paperBillNo.StyleController = this.layoutMx1;
this.txt_paperBillNo.TabIndex = 463;
//
@@ -622,19 +636,17 @@
//
this.txt_billNo.Location = new System.Drawing.Point(114, 12);
this.txt_billNo.Name = "txt_billNo";
-
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(225, 28);
+ this.txt_billNo.Size = new System.Drawing.Size(225, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
//
// txt_gysName
//
- this.txt_gysName.Location = new System.Drawing.Point(114, 44);
+ this.txt_gysName.Location = new System.Drawing.Point(114, 42);
this.txt_gysName.Name = "txt_gysName";
-
this.txt_gysName.Properties.Appearance.Options.UseFont = true;
- this.txt_gysName.Size = new System.Drawing.Size(225, 28);
+ this.txt_gysName.Size = new System.Drawing.Size(225, 24);
this.txt_gysName.StyleController = this.layoutMx1;
this.txt_gysName.TabIndex = 459;
//
@@ -642,29 +654,26 @@
//
this.txt_createBy.Location = new System.Drawing.Point(776, 12);
this.txt_createBy.Name = "txt_createBy";
-
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(225, 28);
+ this.txt_createBy.Size = new System.Drawing.Size(225, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 217;
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(114, 108);
+ this.txt_remark.Location = new System.Drawing.Point(114, 102);
this.txt_remark.Name = "txt_remark";
-
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(556, 28);
+ this.txt_remark.Size = new System.Drawing.Size(556, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 235;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(776, 44);
+ this.txt_createDate.Location = new System.Drawing.Point(776, 42);
this.txt_createDate.Name = "txt_createDate";
-
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(225, 28);
+ this.txt_createDate.Size = new System.Drawing.Size(225, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 252;
//
@@ -679,7 +688,7 @@
//
// txt_urgentFlag
//
- this.txt_urgentFlag.Location = new System.Drawing.Point(1005, 44);
+ this.txt_urgentFlag.Location = new System.Drawing.Point(1005, 42);
this.txt_urgentFlag.Name = "txt_urgentFlag";
this.txt_urgentFlag.Properties.Caption = "鎬ユ枡鏍囪瘑";
this.txt_urgentFlag.Size = new System.Drawing.Size(327, 24);
@@ -688,7 +697,7 @@
//
// txt_insDate
//
- this.txt_insDate.Location = new System.Drawing.Point(776, 76);
+ this.txt_insDate.Location = new System.Drawing.Point(776, 72);
this.txt_insDate.Name = "txt_insDate";
this.txt_insDate.Size = new System.Drawing.Size(225, 24);
this.txt_insDate.StyleController = this.layoutMx1;
@@ -726,33 +735,33 @@
this.layoutControlItem11});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition17.Width = 100D;
- columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition18.Width = 100D;
- columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition19.Width = 100D;
- columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition20.Width = 100D;
+ 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[] {
- columnDefinition17,
- columnDefinition18,
- columnDefinition19,
- columnDefinition20});
- rowDefinition17.Height = 100D;
- rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition18.Height = 100D;
- rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition19.Height = 100D;
- rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition20.Height = 100D;
- rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+ 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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition17,
- rowDefinition18,
- rowDefinition19,
- rowDefinition20});
- this.Root.Size = new System.Drawing.Size(1344, 148);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
+ this.Root.Size = new System.Drawing.Size(1344, 140);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -760,27 +769,27 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(331, 32);
+ this.layoutControlItem1.Size = new System.Drawing.Size(331, 30);
this.layoutControlItem1.Text = "鍒拌揣鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_gysName;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 30);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(331, 32);
+ this.layoutControlItem2.Size = new System.Drawing.Size(331, 30);
this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_gysNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 60);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(331, 32);
+ this.layoutControlItem3.Size = new System.Drawing.Size(331, 30);
this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
@@ -790,29 +799,29 @@
this.layoutControlItem4.Location = new System.Drawing.Point(331, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(331, 32);
+ this.layoutControlItem4.Size = new System.Drawing.Size(331, 30);
this.layoutControlItem4.Text = "閫佽揣鍗曞彿";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_dptName;
- this.layoutControlItem5.Location = new System.Drawing.Point(331, 32);
+ this.layoutControlItem5.Location = new System.Drawing.Point(331, 30);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(331, 32);
+ this.layoutControlItem5.Size = new System.Drawing.Size(331, 30);
this.layoutControlItem5.Text = "浠撳簱鍚嶇О";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_depotsCode;
- this.layoutControlItem6.Location = new System.Drawing.Point(331, 64);
+ this.layoutControlItem6.Location = new System.Drawing.Point(331, 60);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(331, 32);
+ this.layoutControlItem6.Size = new System.Drawing.Size(331, 30);
this.layoutControlItem6.Text = "浠撳簱缂栧彿";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
@@ -822,7 +831,7 @@
this.layoutControlItem7.Location = new System.Drawing.Point(662, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(331, 32);
+ this.layoutControlItem7.Size = new System.Drawing.Size(331, 30);
this.layoutControlItem7.Text = "鍒涘缓浜哄憳";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
@@ -830,44 +839,44 @@
//
this.layoutControlItem8.Control = this.txt_createDate;
this.layoutControlItem8.CustomizationFormText = "鍒涘缓鏃ユ湡";
- this.layoutControlItem8.Location = new System.Drawing.Point(662, 32);
+ this.layoutControlItem8.Location = new System.Drawing.Point(662, 30);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(331, 32);
+ this.layoutControlItem8.Size = new System.Drawing.Size(331, 30);
this.layoutControlItem8.Text = "鍒涘缓鏃ユ湡";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_remark;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 90);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(662, 32);
+ this.layoutControlItem12.Size = new System.Drawing.Size(662, 30);
this.layoutControlItem12.Text = "澶囨敞";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_barcodeProgress;
- this.layoutControlItem13.Location = new System.Drawing.Point(662, 96);
+ this.layoutControlItem13.Location = new System.Drawing.Point(662, 90);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(331, 32);
+ this.layoutControlItem13.Size = new System.Drawing.Size(331, 30);
this.layoutControlItem13.Text = "鏉＄爜鎵撳嵃姣旂巼";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_insDate;
- this.layoutControlItem9.Location = new System.Drawing.Point(662, 64);
+ this.layoutControlItem9.Location = new System.Drawing.Point(662, 60);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(331, 32);
+ this.layoutControlItem9.Size = new System.Drawing.Size(331, 30);
this.layoutControlItem9.Text = "鍒拌揣鏃ユ湡";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
@@ -877,7 +886,7 @@
this.layoutControlItem10.Location = new System.Drawing.Point(993, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(331, 32);
+ this.layoutControlItem10.Size = new System.Drawing.Size(331, 30);
this.layoutControlItem10.Text = "鎻愪氦鐘舵��";
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
@@ -885,11 +894,11 @@
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_urgentFlag;
- this.layoutControlItem11.Location = new System.Drawing.Point(993, 32);
+ this.layoutControlItem11.Location = new System.Drawing.Point(993, 30);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(331, 32);
+ this.layoutControlItem11.Size = new System.Drawing.Size(331, 30);
this.layoutControlItem11.Text = "鎬ユ枡鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -927,7 +936,6 @@
//
// gvMx1
//
-
this.gvMx1.Appearance.Row.Options.UseFont = true;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvAbtGuid,
@@ -965,7 +973,6 @@
//
// gvMx1guid
//
-
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎";
this.gvMx1guid.FieldName = "guid";
@@ -977,7 +984,6 @@
//
// gvMx1urgentFlag
//
-
this.gvMx1urgentFlag.AppearanceCell.Options.UseFont = true;
this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
this.gvMx1urgentFlag.FieldName = "urgentFlag";
@@ -991,7 +997,6 @@
//
// gvMx1ebeln
//
-
this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
this.gvMx1ebeln.Caption = "ERP閲囪喘鍗曞彿";
this.gvMx1ebeln.FieldName = "ebeln";
@@ -1016,7 +1021,6 @@
//
// gvMx1boardStyle
//
-
this.gvMx1boardStyle.AppearanceCell.Options.UseFont = true;
this.gvMx1boardStyle.Caption = "鐗╂枡鍚嶇О";
this.gvMx1boardStyle.FieldName = "itemName";
@@ -1050,7 +1054,6 @@
//
// gvMx1okRkqty
//
-
this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
this.gvMx1okRkqty.Caption = "宸插叆搴撴暟閲�";
this.gvMx1okRkqty.FieldName = "okRkqty";
@@ -1064,7 +1067,6 @@
//
// gvMx1ebelnQty
//
-
this.gvMx1ebelnQty.AppearanceCell.Options.UseFont = true;
this.gvMx1ebelnQty.Caption = "宸叉墦鍗版暟閲�";
this.gvMx1ebelnQty.FieldName = "yQty";
@@ -1173,10 +1175,9 @@
//
this.txt_iCount_1.Location = new System.Drawing.Point(656, 4);
this.txt_iCount_1.Name = "txt_iCount_1";
-
this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(94, 28);
+ this.txt_iCount_1.Size = new System.Drawing.Size(94, 24);
this.txt_iCount_1.TabIndex = 264;
this.txt_iCount_1.Tag = "ReadOnly";
this.txt_iCount_1.ToolTip = "璇疯緭鍏ユ潯鐮佸紶鏁�";
@@ -1185,10 +1186,9 @@
//
this.txt_psnQty_1.Location = new System.Drawing.Point(656, 34);
this.txt_psnQty_1.Name = "txt_psnQty_1";
-
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(94, 28);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(94, 24);
this.txt_psnQty_1.TabIndex = 263;
this.txt_psnQty_1.Tag = "ReadOnly";
this.txt_psnQty_1.ToolTip = "璇疯緭鍏ユ瘡寮犳潯鐮佺殑鏁伴噺";
@@ -1232,12 +1232,11 @@
//
this.txtKdy.Location = new System.Drawing.Point(430, 65);
this.txtKdy.Name = "txtKdy";
-
this.txtKdy.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txtKdy.Properties.Appearance.Options.UseFont = true;
this.txtKdy.Properties.Appearance.Options.UseForeColor = true;
this.txtKdy.Properties.ReadOnly = true;
- this.txtKdy.Size = new System.Drawing.Size(96, 28);
+ this.txtKdy.Size = new System.Drawing.Size(96, 24);
this.txtKdy.TabIndex = 224;
//
// labelControl13
@@ -1252,10 +1251,9 @@
//
this.txtYdy.Location = new System.Drawing.Point(430, 34);
this.txtYdy.Name = "txtYdy";
-
this.txtYdy.Properties.Appearance.Options.UseFont = true;
this.txtYdy.Properties.ReadOnly = true;
- this.txtYdy.Size = new System.Drawing.Size(96, 28);
+ this.txtYdy.Size = new System.Drawing.Size(96, 24);
this.txtYdy.TabIndex = 222;
//
// labelControl11
@@ -1270,10 +1268,9 @@
//
this.txtQuantity.Location = new System.Drawing.Point(430, 4);
this.txtQuantity.Name = "txtQuantity";
-
this.txtQuantity.Properties.Appearance.Options.UseFont = true;
this.txtQuantity.Properties.ReadOnly = true;
- this.txtQuantity.Size = new System.Drawing.Size(96, 28);
+ this.txtQuantity.Size = new System.Drawing.Size(96, 24);
this.txtQuantity.TabIndex = 220;
//
// labelControl10
@@ -1288,10 +1285,9 @@
//
this.txtWlgg.Location = new System.Drawing.Point(90, 65);
this.txtWlgg.Name = "txtWlgg";
-
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
- this.txtWlgg.Size = new System.Drawing.Size(215, 28);
+ this.txtWlgg.Size = new System.Drawing.Size(215, 24);
this.txtWlgg.TabIndex = 218;
//
// labelControl9
@@ -1306,10 +1302,9 @@
//
this.txtWlmc.Location = new System.Drawing.Point(90, 34);
this.txtWlmc.Name = "txtWlmc";
-
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
- this.txtWlmc.Size = new System.Drawing.Size(215, 28);
+ this.txtWlmc.Size = new System.Drawing.Size(215, 24);
this.txtWlmc.TabIndex = 216;
//
// labelControl8
@@ -1324,10 +1319,9 @@
//
this.txtWlid.Location = new System.Drawing.Point(90, 4);
this.txtWlid.Name = "txtWlid";
-
this.txtWlid.Properties.Appearance.Options.UseFont = true;
this.txtWlid.Properties.ReadOnly = true;
- this.txtWlid.Size = new System.Drawing.Size(215, 28);
+ this.txtWlid.Size = new System.Drawing.Size(215, 24);
this.txtWlid.TabIndex = 214;
//
// labelControl7
@@ -1362,7 +1356,6 @@
//
this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-
this.gvMx2.Appearance.Row.Options.UseFont = true;
this.gvMx2.ColumnPanelRowHeight = 50;
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -1388,7 +1381,6 @@
//
// gvMx2guid
//
-
this.gvMx2guid.AppearanceCell.Options.UseFont = true;
this.gvMx2guid.Caption = "guid ";
this.gvMx2guid.FieldName = "guid";
@@ -1410,7 +1402,6 @@
//
// gvMx2itemBarcode
//
-
this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx2itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx2itemBarcode.FieldName = "itemBarcode";
@@ -1423,7 +1414,6 @@
//
// gvMx2itemNo
//
-
this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜 ";
this.gvMx2itemNo.FieldName = "itemNo";
@@ -1456,7 +1446,6 @@
//
// gvMx2oldqty
//
-
this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
this.gvMx2oldqty.Caption = "鏁伴噺";
this.gvMx2oldqty.FieldName = "quantity";
@@ -1540,43 +1529,13 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
- //
- // gridColumn25
- //
- this.gridColumn25.Caption = "濮斿鏍囪瘑";
- this.gridColumn25.FieldName = "fType";
- this.gridColumn25.MinWidth = 25;
- this.gridColumn25.Name = "gridColumn25";
- this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 2;
- this.gridColumn25.Width = 94;
- //
- // gridColumn26
- //
- this.gridColumn26.Caption = "鍒涘缓鏃ユ湡";
- this.gridColumn26.FieldName = "createDate";
- this.gridColumn26.MinWidth = 25;
- this.gridColumn26.Name = "gridColumn26";
- this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 7;
- this.gridColumn26.Width = 94;
- //
- // gridColumn11
- //
- this.gridColumn11.Caption = "瀹℃牳浜�";
- this.gridColumn11.FieldName = "checkUser";
- this.gridColumn11.MinWidth = 25;
- this.gridColumn11.Name = "gridColumn11";
- this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 15;
- this.gridColumn11.Width = 94;
//
// Frm_ArrivalBarcode
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
index b5124e6..211bfe1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_InitialBarcode.Designer.cs
@@ -29,14 +29,14 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -203,7 +203,6 @@
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
@@ -214,7 +213,6 @@
//
// gridView1
//
-
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn4,
@@ -244,7 +242,6 @@
//
// gv_id
//
-
this.gv_id.AppearanceCell.Options.UseFont = true;
this.gv_id.Caption = "鐗╂枡ID ";
this.gv_id.FieldName = "id";
@@ -258,7 +255,6 @@
//
// gv_itemNo
//
-
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
this.gv_itemNo.FieldName = "itemNo";
@@ -272,7 +268,6 @@
//
// gv_itemName
//
-
this.gv_itemName.AppearanceCell.Options.UseFont = true;
this.gv_itemName.Caption = "鐗╂枡鍚嶇О";
this.gv_itemName.FieldName = "itemName";
@@ -286,7 +281,6 @@
//
// gv_itemModel
//
-
this.gv_itemModel.AppearanceCell.Options.UseFont = true;
this.gv_itemModel.Caption = "瑙勬牸鍨嬪彿";
this.gv_itemModel.FieldName = "itemModel";
@@ -300,7 +294,6 @@
//
// gv_itemUnit
//
-
this.gv_itemUnit.AppearanceCell.Options.UseFont = true;
this.gv_itemUnit.Caption = "鐗╂枡鍗曚綅";
this.gv_itemUnit.FieldName = "itemUnit";
@@ -371,7 +364,7 @@
this.layoutControlItem12});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(624, 536, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(471, 509, 812, 500);
this.layoutMx1.Root = this.Root;
this.layoutMx1.Size = new System.Drawing.Size(1126, 139);
this.layoutMx1.TabIndex = 0;
@@ -387,9 +380,9 @@
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(656, 76);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(666, 71);
this.txt_psnQty_1.Name = "txt_psnQty_1";
- this.txt_psnQty_1.Size = new System.Drawing.Size(165, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(170, 24);
this.txt_psnQty_1.StyleController = this.layoutMx1;
this.txt_psnQty_1.TabIndex = 273;
this.txt_psnQty_1.Tag = "readOnly-1";
@@ -397,18 +390,18 @@
// ucBtnPrint1
//
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(554, 108);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(563, 99);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(196, 28);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(274, 30);
this.ucBtnPrint1.TabIndex = 266;
//
// txt_iCount_1
//
- this.txt_iCount_1.Location = new System.Drawing.Point(656, 44);
+ this.txt_iCount_1.Location = new System.Drawing.Point(666, 41);
this.txt_iCount_1.Name = "txt_iCount_1";
- this.txt_iCount_1.Size = new System.Drawing.Size(165, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(170, 24);
this.txt_iCount_1.StyleController = this.layoutMx1;
this.txt_iCount_1.TabIndex = 272;
this.txt_iCount_1.Tag = "readOnly-1";
@@ -417,9 +410,8 @@
//
this.txt_fSubsidiary.Location = new System.Drawing.Point(114, 12);
this.txt_fSubsidiary.Name = "txt_fSubsidiary";
-
this.txt_fSubsidiary.Properties.Appearance.Options.UseFont = true;
- this.txt_fSubsidiary.Size = new System.Drawing.Size(165, 28);
+ this.txt_fSubsidiary.Size = new System.Drawing.Size(170, 24);
this.txt_fSubsidiary.StyleController = this.layoutMx1;
this.txt_fSubsidiary.TabIndex = 270;
this.txt_fSubsidiary.Tag = "";
@@ -427,84 +419,78 @@
// txt_suppNo_1
//
this.txt_suppNo_1.IsReadly = false;
- this.txt_suppNo_1.Location = new System.Drawing.Point(656, 12);
+ this.txt_suppNo_1.Location = new System.Drawing.Point(666, 12);
this.txt_suppNo_1.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppNo_1.Name = "txt_suppNo_1";
- this.txt_suppNo_1.Size = new System.Drawing.Size(165, 28);
+ this.txt_suppNo_1.Size = new System.Drawing.Size(170, 24);
this.txt_suppNo_1.TabIndex = 264;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(114, 44);
+ this.txt_itemNo.Location = new System.Drawing.Point(114, 41);
this.txt_itemNo.Name = "txt_itemNo";
-
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(165, 28);
+ this.txt_itemNo.Size = new System.Drawing.Size(170, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 217;
this.txt_itemNo.Tag = "";
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(114, 76);
+ this.txt_itemName.Location = new System.Drawing.Point(114, 71);
this.txt_itemName.Name = "txt_itemName";
-
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(165, 28);
+ this.txt_itemName.Size = new System.Drawing.Size(170, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 219;
this.txt_itemName.Tag = "";
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(114, 108);
+ this.txt_itemModel.Location = new System.Drawing.Point(114, 101);
this.txt_itemModel.Name = "txt_itemModel";
-
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(436, 28);
+ this.txt_itemModel.Size = new System.Drawing.Size(446, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 226;
this.txt_itemModel.Tag = "";
//
// txt_suppId
//
- this.txt_suppId.Location = new System.Drawing.Point(385, 12);
+ this.txt_suppId.Location = new System.Drawing.Point(390, 12);
this.txt_suppId.Name = "txt_suppId";
-
this.txt_suppId.Properties.Appearance.Options.UseFont = true;
- this.txt_suppId.Size = new System.Drawing.Size(165, 28);
+ this.txt_suppId.Size = new System.Drawing.Size(170, 24);
this.txt_suppId.StyleController = this.layoutMx1;
this.txt_suppId.TabIndex = 256;
this.txt_suppId.Tag = "";
//
// txt_createDate1
//
- this.txt_createDate1.Location = new System.Drawing.Point(385, 44);
+ this.txt_createDate1.Location = new System.Drawing.Point(390, 41);
this.txt_createDate1.Name = "txt_createDate1";
-
this.txt_createDate1.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate1.Size = new System.Drawing.Size(165, 28);
+ this.txt_createDate1.Size = new System.Drawing.Size(170, 24);
this.txt_createDate1.StyleController = this.layoutMx1;
this.txt_createDate1.TabIndex = 252;
this.txt_createDate1.Tag = "";
//
// txt_itemUnit
//
- this.txt_itemUnit.Location = new System.Drawing.Point(385, 76);
+ this.txt_itemUnit.Location = new System.Drawing.Point(390, 71);
this.txt_itemUnit.Name = "txt_itemUnit";
-
this.txt_itemUnit.Properties.Appearance.Options.UseFont = true;
- this.txt_itemUnit.Size = new System.Drawing.Size(165, 28);
+ this.txt_itemUnit.Size = new System.Drawing.Size(170, 24);
this.txt_itemUnit.StyleController = this.layoutMx1;
this.txt_itemUnit.TabIndex = 231;
this.txt_itemUnit.Tag = "";
//
// txt_tc_1
//
- this.txt_tc_1.Location = new System.Drawing.Point(825, 12);
+ this.txt_tc_1.Location = new System.Drawing.Point(840, 12);
this.txt_tc_1.Name = "txt_tc_1";
this.txt_tc_1.Properties.Caption = "鐗归噰鏍囪瘑";
- this.txt_tc_1.Size = new System.Drawing.Size(268, 24);
+ this.txt_tc_1.Size = new System.Drawing.Size(274, 24);
this.txt_tc_1.StyleController = this.layoutMx1;
this.txt_tc_1.TabIndex = 276;
//
@@ -539,33 +525,33 @@
this.txt_tc_1123});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ 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[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- 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;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ 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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5,
- rowDefinition6,
- rowDefinition7,
- rowDefinition8});
- this.Root.Size = new System.Drawing.Size(1105, 148);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
+ this.Root.Size = new System.Drawing.Size(1126, 139);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -573,115 +559,115 @@
this.layoutControlItem1.Control = this.txt_fSubsidiary;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem1.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem1.Text = "浣跨敤缁勭粐";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_itemNo;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 29);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem2.Text = "鐗╂枡缂栫爜";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_itemName;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 59);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem3.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem3.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_itemModel;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 89);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(542, 32);
+ this.layoutControlItem4.Size = new System.Drawing.Size(552, 30);
this.layoutControlItem4.Text = "瑙勬牸鍨嬪彿";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_suppId;
- this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem5.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鍙�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_createDate1;
- this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);
+ this.layoutControlItem6.Location = new System.Drawing.Point(276, 29);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem6.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem6.Text = "鍏ュ簱鏃堕棿";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_itemUnit;
- this.layoutControlItem7.Location = new System.Drawing.Point(271, 64);
+ this.layoutControlItem7.Location = new System.Drawing.Point(276, 59);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem7.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem7.Text = "鐗╂枡鍗曚綅";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_suppNo_1;
- this.layoutControlItem8.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem8.Location = new System.Drawing.Point(552, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem8.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem8.Text = "鍏堥�夋嫨渚涘簲鍟�";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_iCount_1;
- this.layoutControlItem9.Location = new System.Drawing.Point(542, 32);
+ this.layoutControlItem9.Location = new System.Drawing.Point(552, 29);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem9.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem9.Text = "鎵撳嵃鏉＄爜寮犳暟";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_psnQty_1;
- this.layoutControlItem10.Location = new System.Drawing.Point(542, 64);
+ this.layoutControlItem10.Location = new System.Drawing.Point(552, 59);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem10.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem10.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.ucBtnPrint1;
- this.layoutControlItem11.Location = new System.Drawing.Point(542, 96);
- this.layoutControlItem11.MaxSize = new System.Drawing.Size(200, 0);
- this.layoutControlItem11.MinSize = new System.Drawing.Size(5, 5);
+ this.layoutControlItem11.Location = new System.Drawing.Point(552, 89);
+ this.layoutControlItem11.MinSize = new System.Drawing.Size(1, 5);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem11.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
+ this.layoutControlItem11.Size = new System.Drawing.Size(276, 30);
this.layoutControlItem11.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem11.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
@@ -690,10 +676,10 @@
// txt_tc_1123
//
this.txt_tc_1123.Control = this.txt_tc_1;
- this.txt_tc_1123.Location = new System.Drawing.Point(813, 0);
+ this.txt_tc_1123.Location = new System.Drawing.Point(828, 0);
this.txt_tc_1123.Name = "txt_tc_1123";
this.txt_tc_1123.OptionsTableLayoutItem.ColumnIndex = 3;
- this.txt_tc_1123.Size = new System.Drawing.Size(272, 32);
+ this.txt_tc_1123.Size = new System.Drawing.Size(278, 29);
this.txt_tc_1123.Text = "鐗归噰鏍囪瘑";
this.txt_tc_1123.TextSize = new System.Drawing.Size(0, 0);
this.txt_tc_1123.TextVisible = false;
@@ -731,7 +717,6 @@
//
this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-
this.gvMx1.Appearance.Row.Options.UseFont = true;
this.gvMx1.ColumnPanelRowHeight = 50;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -754,7 +739,6 @@
//
// gvMx1guid
//
-
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid ";
this.gvMx1guid.FieldName = "guid";
@@ -776,7 +760,6 @@
//
// gvMx1itemBarcode
//
-
this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜 ";
this.gvMx1itemBarcode.FieldName = "itemBarcode";
@@ -789,7 +772,6 @@
//
// gvMx1quantity
//
-
this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
this.gvMx1quantity.Caption = "鏁伴噺 ";
this.gvMx1quantity.FieldName = "quantity";
@@ -802,7 +784,6 @@
//
// gvMx1trLotno
//
-
this.gvMx1trLotno.AppearanceCell.Options.UseFont = true;
this.gvMx1trLotno.Caption = "渚涘簲鍟�";
this.gvMx1trLotno.FieldName = "suppID";
@@ -815,7 +796,6 @@
//
// gvMx1createBy
//
-
this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
this.gvMx1createBy.Caption = "鍒涘缓浜� ";
this.gvMx1createBy.FieldName = "createBy";
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 54509dd..144e0a0 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -194,18 +194,6 @@
<Compile Include="DevFrm\BasicData\Frm_Department.Designer.cs">
<DependentUpon>Frm_Department.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\BasicData\Frm_Holidy.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\BasicData\Frm_Holidy.Designer.cs">
- <DependentUpon>Frm_Holidy.cs</DependentUpon>
- </Compile>
- <Compile Include="DevFrm\BasicData\Frm_MesDaaDirectOut.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\BasicData\Frm_MesDaaDirectOut.Designer.cs">
- <DependentUpon>Frm_MesDaaDirectOut.cs</DependentUpon>
- </Compile>
<Compile Include="DevFrm\BasicData\Frm_MesItems.cs">
<SubType>Form</SubType>
</Compile>
@@ -217,12 +205,6 @@
</Compile>
<Compile Include="DevFrm\BasicData\Frm_MesItemType.Designer.cs">
<DependentUpon>Frm_MesItemType.cs</DependentUpon>
- </Compile>
- <Compile Include="DevFrm\BasicData\Frm_MesPosition.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\BasicData\Frm_MesPosition.Designer.cs">
- <DependentUpon>Frm_MesPosition.cs</DependentUpon>
</Compile>
<Compile Include="DevFrm\BasicData\Frm_MesWorkshopLine.cs">
<SubType>Form</SubType>
@@ -789,12 +771,6 @@
<Compile Include="DevFrm\WW\Frm_WwTbl.Designer.cs">
<DependentUpon>Frm_WwTbl.cs</DependentUpon>
</Compile>
- <Compile Include="DevFrm\WOM\Frm_MesWomdaahb.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\WOM\Frm_MesWomdaahb.Designer.cs">
- <DependentUpon>Frm_MesWomdaahb.cs</DependentUpon>
- </Compile>
<Compile Include="DevFrm\WOM\Frm_Womcaa.cs">
<SubType>Form</SubType>
</Compile>
@@ -1153,20 +1129,11 @@
<EmbeddedResource Include="DevFrm\BasicData\Frm_Department.resx">
<DependentUpon>Frm_Department.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="DevFrm\BasicData\Frm_Holidy.resx">
- <DependentUpon>Frm_Holidy.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DevFrm\BasicData\Frm_MesDaaDirectOut.resx">
- <DependentUpon>Frm_MesDaaDirectOut.cs</DependentUpon>
- </EmbeddedResource>
<EmbeddedResource Include="DevFrm\BasicData\Frm_MesItems.resx">
<DependentUpon>Frm_MesItems.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\BasicData\Frm_MesItemType.resx">
<DependentUpon>Frm_MesItemType.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DevFrm\BasicData\Frm_MesPosition.resx">
- <DependentUpon>Frm_MesPosition.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\BasicData\Frm_MesWorkshopLine.resx">
<DependentUpon>Frm_MesWorkshopLine.cs</DependentUpon>
@@ -1433,9 +1400,6 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\WW\Frm_WwTbl.resx">
<DependentUpon>Frm_WwTbl.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DevFrm\WOM\Frm_MesWomdaahb.resx">
- <DependentUpon>Frm_MesWomdaahb.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\WOM\Frm_Womcaa.resx">
<DependentUpon>Frm_Womcaa.cs</DependentUpon>
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj.user b/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
index 78c201e..ea14450 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj.user
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ProjectView>ShowAllFiles</ProjectView>
+ <ProjectView>ProjectFiles</ProjectView>
<PublishUrlHistory>publish\</PublishUrlHistory>
<InstallUrlHistory />
<SupportUrlHistory />
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index f65be3c..11b86c0 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -283,8 +283,8 @@
if (colmn.Name.ToString().Contains("gvMxDel") || colmn.Name.ToString().Contains("gvMxTui"))
{
colmn.Visible = !isEdt;
- if (colmn.Visible==true)
- colmn.VisibleIndex = 99999;
+ if (colmn.Visible == true)
+ colmn.VisibleIndex = 99999;
}
else
{
@@ -674,7 +674,7 @@
if (colType is UcDictionary)
{
var txt = colType as UcDictionary;
- txt.TextTxt=(strVal);
+ txt.TextTxt = (strVal);
//if (txt.IsReadly == false)
// txt.Enabled = !isEdt;
//else
@@ -1233,26 +1233,6 @@
}
return isEdt;
}
- /// <summary>
- /// 鍒囨崲閫夐」鍗�
- /// </summary>
- /// <param name="tabControl">閫夐」鍗″鍣�</param>
- /// <param name="idx">浠�0寮�濮嬶紝濡傛灉鏄�999锛屽垯鍏ㄩ儴鍙敤</param>
- public static void JumpToTab(XtraTabControl tabControl, int idx)
- {
- if (idx == 999)
- {
- for (var i = 0; i < tabControl.TabPages.Count; i++)
- tabControl.TabPages[i].PageEnabled = true;
- tabControl.SelectedTabPageIndex = tabControl.TabPages.Count - 1;
- return;
- }
-
- for (var i = 0; i < tabControl.TabPages.Count; i++)
- tabControl.TabPages[i].PageEnabled = false;
- tabControl.TabPages[idx].PageEnabled = true;
- tabControl.SelectedTabPageIndex = idx;
- }
/// <summary>
@@ -1303,6 +1283,13 @@
tabControl.TabPages[0].PageEnabled = true;
tabControl.TabPages[1].PageEnabled = true;
tabControl.SelectedTabPageIndex = 1;
+ return;
+ }
+
+ if (action == 6)
+ {
+ tabControl.TabPages[0].PageEnabled = true;
+ tabControl.TabPages[1].PageEnabled = true;
return;
}
}
@@ -1802,7 +1789,7 @@
};
gridView1.OptionsView.ShowGroupPanel = false;
gridView1.OptionsCustomization.AllowGroup = false;
- // gridView1.Appearance.HeaderPanel.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.ControlText;
+ // gridView1.Appearance.HeaderPanel.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.ControlText;
gridView1.OptionsView.ColumnAutoWidth = false;//鑷姩璋冩暣鍒楀
foreach (GridColumn column in gridView1.Columns)
{
@@ -1964,7 +1951,9 @@
}
if (xtraTabControl1.SelectedTabPageIndex == 0)
{
- // page(pageBar1.CurrentPage);
+ //int _handle = gridView1.FocusedRowHandle;
+ //page(pageBar1.CurrentPage);
+ //gridView1.FocusedRowHandle= _handle;
}
};
}
diff --git a/DevApp/Gs.DevApp/UserControl/SelectFont.cs b/DevApp/Gs.DevApp/UserControl/SelectFont.cs
index 0e45666..6f732a2 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectFont.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectFont.cs
@@ -39,6 +39,7 @@
#endregion
Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璁剧疆鎴愬姛锛�");
+ this.Close();
}
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UcBtnPrint.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcBtnPrint.Designer.cs
index 80942ee..bd05385 100644
--- a/DevApp/Gs.DevApp/UserControl/UcBtnPrint.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcBtnPrint.Designer.cs
@@ -28,41 +28,120 @@
/// </summary>
private void InitializeComponent()
{
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
this.btnReport = new DevExpress.XtraEditors.SimpleButton();
+ this.layoutControl2 = new DevExpress.XtraLayout.LayoutControl();
this.btnDesign = new DevExpress.XtraEditors.SimpleButton();
+ this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControl2)).BeginInit();
+ this.layoutControl2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
this.SuspendLayout();
//
// btnReport
//
- this.btnReport.Dock = System.Windows.Forms.DockStyle.Right;
this.btnReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
- this.btnReport.Location = new System.Drawing.Point(138, 0);
- this.btnReport.Margin = new System.Windows.Forms.Padding(0);
+ this.btnReport.Location = new System.Drawing.Point(102, 2);
+ this.btnReport.Margin = new System.Windows.Forms.Padding(10, 0, 0, 0);
this.btnReport.Name = "btnReport";
- this.btnReport.Size = new System.Drawing.Size(94, 36);
+ this.btnReport.Size = new System.Drawing.Size(96, 27);
+ this.btnReport.StyleController = this.layoutControl2;
this.btnReport.TabIndex = 3;
this.btnReport.Text = "纭畾鎵撳嵃";
//
+ // layoutControl2
+ //
+ this.layoutControl2.Controls.Add(this.btnReport);
+ this.layoutControl2.Controls.Add(this.btnDesign);
+ this.layoutControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutControl2.Location = new System.Drawing.Point(0, 0);
+ this.layoutControl2.Margin = new System.Windows.Forms.Padding(0);
+ this.layoutControl2.Name = "layoutControl2";
+ this.layoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(803, 337, 812, 500);
+ this.layoutControl2.Root = this.layoutControlGroup1;
+ this.layoutControl2.Size = new System.Drawing.Size(232, 32);
+ this.layoutControl2.TabIndex = 6;
+ this.layoutControl2.Text = "layoutControl2";
+ //
// btnDesign
//
- this.btnDesign.Dock = System.Windows.Forms.DockStyle.Left;
this.btnDesign.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.richeditcleartablestyle_16x16;
- this.btnDesign.Location = new System.Drawing.Point(0, 0);
+ this.btnDesign.Location = new System.Drawing.Point(2, 2);
this.btnDesign.Margin = new System.Windows.Forms.Padding(0);
this.btnDesign.Name = "btnDesign";
- this.btnDesign.Size = new System.Drawing.Size(94, 36);
+ this.btnDesign.Size = new System.Drawing.Size(96, 27);
+ this.btnDesign.StyleController = this.layoutControl2;
this.btnDesign.TabIndex = 2;
this.btnDesign.Text = "鎵撳嵃璁捐";
+ //
+ // layoutControlGroup1
+ //
+ this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup1.GroupBordersVisible = false;
+ this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem1,
+ this.layoutControlItem2});
+ this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup1.Name = "Root";
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ columnDefinition2.Width = 132D;
+ this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition1,
+ columnDefinition2});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition1});
+ this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(232, 32);
+ this.layoutControlGroup1.TextVisible = false;
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.btnDesign;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.MaxSize = new System.Drawing.Size(100, 31);
+ this.layoutControlItem1.MinSize = new System.Drawing.Size(90, 31);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(100, 32);
+ this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem1.TextVisible = false;
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.btnReport;
+ this.layoutControlItem2.Location = new System.Drawing.Point(100, 0);
+ this.layoutControlItem2.MaxSize = new System.Drawing.Size(100, 31);
+ this.layoutControlItem2.MinSize = new System.Drawing.Size(90, 31);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(132, 32);
+ this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem2.TextVisible = false;
//
// UcBtnPrint
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Controls.Add(this.btnReport);
- this.Controls.Add(this.btnDesign);
+ this.Controls.Add(this.layoutControl2);
this.Margin = new System.Windows.Forms.Padding(0);
this.Name = "UcBtnPrint";
- this.Size = new System.Drawing.Size(232, 36);
+ this.Size = new System.Drawing.Size(232, 32);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControl2)).EndInit();
+ this.layoutControl2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
this.ResumeLayout(false);
}
@@ -71,5 +150,9 @@
private DevExpress.XtraEditors.SimpleButton btnReport;
private DevExpress.XtraEditors.SimpleButton btnDesign;
+ private DevExpress.XtraLayout.LayoutControl layoutControl2;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
}
}
--
Gitblit v1.9.3