From 7735387e1b7a45b7866da1920d84f47789665e12 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 08 九月 2025 15:05:47 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 53 ++-
DevApp/Gs.DevApp/Gs.DevApp.csproj | 6
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 36 +
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs | 292 ++++++++++--------
DevApp/Gs.DevApp/UserControl/SelectDaa.cs | 3
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 261 ++++++++-------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs | 47 +-
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.Designer.cs | 38 ++
DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs | 21
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs | 49 +-
DevApp/Gs.DevApp/UserControl/SelectDaa.Designer.cs | 114 +++---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 3
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.cs | 21 +
14 files changed, 560 insertions(+), 388 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 7074e85..3168274 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -37,8 +37,8 @@
<appSettings>
<!--<add key="webapiurl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:8081/" />
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index 10d55fa..1703f53 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -74,6 +74,7 @@
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -326,7 +327,8 @@
this.gridColumn6,
this.gridColumn13,
this.gridColumn14,
- this.gridColumn15});
+ this.gridColumn15,
+ this.gridColumn20});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -393,7 +395,7 @@
this.gv_qt020.OptionsColumn.AllowEdit = false;
this.gv_qt020.Tag = "query_a.qt020";
this.gv_qt020.Visible = true;
- this.gv_qt020.VisibleIndex = 5;
+ this.gv_qt020.VisibleIndex = 6;
this.gv_qt020.Width = 94;
//
// gridColumn4
@@ -403,7 +405,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 11;
+ this.gridColumn4.VisibleIndex = 12;
this.gridColumn4.Width = 94;
//
// gv_qt005
@@ -416,7 +418,7 @@
this.gv_qt005.OptionsColumn.AllowEdit = false;
this.gv_qt005.Tag = "query_a.qt005";
this.gv_qt005.Visible = true;
- this.gv_qt005.VisibleIndex = 6;
+ this.gv_qt005.VisibleIndex = 7;
this.gv_qt005.Width = 94;
//
// gv_qt001
@@ -429,7 +431,7 @@
this.gv_qt001.OptionsColumn.AllowEdit = false;
this.gv_qt001.Tag = "query_a.qt001";
this.gv_qt001.Visible = true;
- this.gv_qt001.VisibleIndex = 7;
+ this.gv_qt001.VisibleIndex = 8;
this.gv_qt001.Width = 180;
//
// gv_qt010
@@ -442,7 +444,7 @@
this.gv_qt010.OptionsColumn.AllowEdit = false;
this.gv_qt010.Tag = "query_a.qt010";
this.gv_qt010.Visible = true;
- this.gv_qt010.VisibleIndex = 8;
+ this.gv_qt010.VisibleIndex = 9;
this.gv_qt010.Width = 94;
//
// gv_qt016
@@ -455,7 +457,7 @@
this.gv_qt016.OptionsColumn.AllowEdit = false;
this.gv_qt016.Tag = "query_a.qt016";
this.gv_qt016.Visible = true;
- this.gv_qt016.VisibleIndex = 9;
+ this.gv_qt016.VisibleIndex = 10;
this.gv_qt016.Width = 94;
//
// gv_qt002
@@ -468,7 +470,7 @@
this.gv_qt002.OptionsColumn.AllowEdit = false;
this.gv_qt002.Tag = "query_a.qt002";
this.gv_qt002.Visible = true;
- this.gv_qt002.VisibleIndex = 10;
+ this.gv_qt002.VisibleIndex = 11;
this.gv_qt002.Width = 94;
//
// gridColumn5
@@ -478,7 +480,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 12;
+ this.gridColumn5.VisibleIndex = 13;
this.gridColumn5.Width = 94;
//
// gridColumn6
@@ -488,7 +490,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 13;
+ this.gridColumn6.VisibleIndex = 14;
this.gridColumn6.Width = 94;
//
// gridColumn13
@@ -526,6 +528,16 @@
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 2;
this.gridColumn15.Width = 94;
+ //
+ // gridColumn20
+ //
+ this.gridColumn20.Caption = "鍑哄簱绫诲瀷";
+ this.gridColumn20.FieldName = "qtlx";
+ this.gridColumn20.MinWidth = 25;
+ this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.Visible = true;
+ this.gridColumn20.VisibleIndex = 5;
+ this.gridColumn20.Width = 94;
//
// pageBar1
//
@@ -857,7 +869,8 @@
"3:娴嬭瘯閮ㄩ棬鍝佽川宸ヨ壓",
"4:瀹㈡埛璧犻��",
"5:鎶ュ簾鍑哄簱",
- "6:鏍锋満鍑哄簱"});
+ "6:鏍锋満鍑哄簱",
+ "7:鏃犳簮鍗曞澶栭��鏂�"});
this.txt_qtlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_qtlx.Size = new System.Drawing.Size(165, 24);
this.txt_qtlx.StyleController = this.layoutMx1;
@@ -1773,5 +1786,6 @@
private DevExpress.XtraEditors.SimpleButton btnCopyXls;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index 2cc91db..f368b8f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -500,7 +500,8 @@
{
gcMain1.DataSource = dt;
gcMain1.ForceInitialize();
- gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ gridView1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
UtilityHelper.SetDefaultTable(gcMain1, gridView1);
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
index 5b97f88..ed5b909 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQtDj.Designer.cs
@@ -67,6 +67,7 @@
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -298,7 +299,8 @@
this.gridColumn12,
this.gridColumn13,
this.gridColumn7,
- this.gridColumn14});
+ this.gridColumn14,
+ this.gridColumn9});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -356,7 +358,7 @@
this.gv_outDate.OptionsColumn.AllowEdit = false;
this.gv_outDate.Tag = "query_a.out_date";
this.gv_outDate.Visible = true;
- this.gv_outDate.VisibleIndex = 5;
+ this.gv_outDate.VisibleIndex = 6;
this.gv_outDate.Width = 120;
//
// gv_outType
@@ -369,7 +371,7 @@
this.gv_outType.OptionsColumn.AllowEdit = false;
this.gv_outType.Tag = "query_a.out_type";
this.gv_outType.Visible = true;
- this.gv_outType.VisibleIndex = 6;
+ this.gv_outType.VisibleIndex = 7;
this.gv_outType.Width = 94;
//
// gv_checkUser
@@ -382,7 +384,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.check_user";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 7;
+ this.gv_checkUser.VisibleIndex = 8;
this.gv_checkUser.Width = 94;
//
// gv_checkDate
@@ -395,7 +397,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.check_date";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 8;
+ this.gv_checkDate.VisibleIndex = 9;
this.gv_checkDate.Width = 120;
//
// gv_receiver
@@ -408,7 +410,7 @@
this.gv_receiver.OptionsColumn.AllowEdit = false;
this.gv_receiver.Tag = "query_a.receiver";
this.gv_receiver.Visible = true;
- this.gv_receiver.VisibleIndex = 9;
+ this.gv_receiver.VisibleIndex = 10;
this.gv_receiver.Width = 94;
//
// gv_outPart
@@ -421,7 +423,7 @@
this.gv_outPart.OptionsColumn.AllowEdit = false;
this.gv_outPart.Tag = "query_a.out_part";
this.gv_outPart.Visible = true;
- this.gv_outPart.VisibleIndex = 10;
+ this.gv_outPart.VisibleIndex = 11;
this.gv_outPart.Width = 94;
//
// gv_createBy
@@ -434,7 +436,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 11;
+ this.gv_createBy.VisibleIndex = 12;
this.gv_createBy.Width = 94;
//
// gv_createDate
@@ -447,7 +449,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 12;
+ this.gv_createDate.VisibleIndex = 13;
this.gv_createDate.Width = 94;
//
// gv_remark
@@ -460,7 +462,7 @@
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 = 14;
this.gv_remark.Width = 94;
//
// gridColumn1
@@ -478,7 +480,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 14;
+ this.gridColumn6.VisibleIndex = 15;
this.gridColumn6.Width = 94;
//
// gridColumn8
@@ -488,7 +490,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 15;
+ this.gridColumn8.VisibleIndex = 16;
this.gridColumn8.Width = 94;
//
// gridColumn10
@@ -498,7 +500,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 16;
+ this.gridColumn10.VisibleIndex = 17;
this.gridColumn10.Width = 94;
//
// gridColumn11
@@ -508,7 +510,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 17;
+ this.gridColumn11.VisibleIndex = 18;
this.gridColumn11.Width = 94;
//
// gridColumn12
@@ -518,7 +520,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 18;
+ this.gridColumn12.VisibleIndex = 19;
this.gridColumn12.Width = 94;
//
// gridColumn13
@@ -528,7 +530,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 19;
+ this.gridColumn13.VisibleIndex = 20;
this.gridColumn13.Width = 94;
//
// gridColumn7
@@ -538,7 +540,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 3;
+ this.gridColumn7.VisibleIndex = 4;
this.gridColumn7.Width = 94;
//
// gridColumn14
@@ -548,8 +550,18 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 4;
+ this.gridColumn14.VisibleIndex = 5;
this.gridColumn14.Width = 94;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "鍑哄簱绫诲瀷";
+ this.gridColumn9.FieldName = "qtlx";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 3;
+ this.gridColumn9.Width = 94;
//
// pageBar1
//
@@ -1532,5 +1544,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 9e06e3d..107801e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -31,36 +31,36 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesItemQtrk));
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- 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 rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition10 = 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.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.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.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
+ 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 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 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();
+ 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -180,11 +180,11 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd002 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd004 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -218,6 +218,7 @@
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -420,7 +421,8 @@
this.gridColumn24,
this.gridColumn25,
this.gridColumn26,
- this.gridColumn27});
+ this.gridColumn27,
+ this.gridColumn28});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -477,7 +479,7 @@
this.gv_qt003.OptionsColumn.AllowEdit = false;
this.gv_qt003.Tag = "query_a.qt003";
this.gv_qt003.Visible = true;
- this.gv_qt003.VisibleIndex = 12;
+ this.gv_qt003.VisibleIndex = 13;
this.gv_qt003.Width = 94;
//
// gv_qt019
@@ -490,7 +492,7 @@
this.gv_qt019.OptionsColumn.AllowEdit = false;
this.gv_qt019.Tag = "query_a.qt019";
this.gv_qt019.Visible = true;
- this.gv_qt019.VisibleIndex = 13;
+ this.gv_qt019.VisibleIndex = 14;
this.gv_qt019.Width = 94;
//
// gv_qt005
@@ -503,7 +505,7 @@
this.gv_qt005.OptionsColumn.AllowEdit = false;
this.gv_qt005.Tag = "query_a.qt005";
this.gv_qt005.Visible = true;
- this.gv_qt005.VisibleIndex = 4;
+ this.gv_qt005.VisibleIndex = 5;
this.gv_qt005.Width = 94;
//
// gv_qt001
@@ -516,7 +518,7 @@
this.gv_qt001.OptionsColumn.AllowEdit = false;
this.gv_qt001.Tag = "query_a.qt001";
this.gv_qt001.Visible = true;
- this.gv_qt001.VisibleIndex = 5;
+ this.gv_qt001.VisibleIndex = 6;
this.gv_qt001.Width = 200;
//
// gv_qt016
@@ -529,7 +531,7 @@
this.gv_qt016.OptionsColumn.AllowEdit = false;
this.gv_qt016.Tag = "query_a.qt016";
this.gv_qt016.Visible = true;
- this.gv_qt016.VisibleIndex = 9;
+ this.gv_qt016.VisibleIndex = 10;
this.gv_qt016.Width = 94;
//
// gv_qt002
@@ -542,7 +544,7 @@
this.gv_qt002.OptionsColumn.AllowEdit = false;
this.gv_qt002.Tag = "query_a.qt002";
this.gv_qt002.Visible = true;
- this.gv_qt002.VisibleIndex = 10;
+ this.gv_qt002.VisibleIndex = 11;
this.gv_qt002.Width = 180;
//
// gv_qt010
@@ -555,7 +557,7 @@
this.gv_qt010.OptionsColumn.AllowEdit = false;
this.gv_qt010.Tag = "query_a.qt010";
this.gv_qt010.Visible = true;
- this.gv_qt010.VisibleIndex = 11;
+ this.gv_qt010.VisibleIndex = 12;
this.gv_qt010.Width = 94;
//
// gridColumn13
@@ -565,7 +567,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 14;
+ this.gridColumn13.VisibleIndex = 15;
this.gridColumn13.Width = 94;
//
// gridColumn14
@@ -575,7 +577,7 @@
this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 15;
+ this.gridColumn14.VisibleIndex = 16;
this.gridColumn14.Width = 94;
//
// gridColumn21
@@ -585,7 +587,7 @@
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 16;
+ this.gridColumn21.VisibleIndex = 17;
this.gridColumn21.Width = 94;
//
// gridColumn22
@@ -595,7 +597,7 @@
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 6;
+ this.gridColumn22.VisibleIndex = 7;
this.gridColumn22.Width = 94;
//
// gridColumn23
@@ -605,7 +607,7 @@
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 7;
+ this.gridColumn23.VisibleIndex = 8;
this.gridColumn23.Width = 94;
//
// gridColumn24
@@ -615,7 +617,7 @@
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 8;
+ this.gridColumn24.VisibleIndex = 9;
this.gridColumn24.Width = 94;
//
// gridColumn25
@@ -971,9 +973,11 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_qtlx.Properties.Items.AddRange(new object[] {
"璇烽�夋嫨",
- "1:渚涘簲鍟嗚禒閫�",
- "2:鍞悗缁翠慨",
- "3:鎷嗗嵏鍏ュ簱"});
+ "1:鍞悗缁翠慨",
+ "2:鎷嗗嵏鍏ュ簱",
+ "3:渚涘簲鍟嗚禒閫�",
+ "4:鏃犳簮鍗曞澶栭��鏉愭枡",
+ "5:鐩樼泩"});
this.txt_qtlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_qtlx.Size = new System.Drawing.Size(222, 24);
this.txt_qtlx.StyleController = this.layoutMx1;
@@ -1054,38 +1058,38 @@
this.layoutControlItem3});
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;
+ 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;
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;
+ columnDefinition11,
+ columnDefinition12,
+ columnDefinition13,
+ columnDefinition14});
+ 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;
+ rowDefinition15.Height = 100D;
+ rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition16.Height = 100D;
+ rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6});
+ rowDefinition11,
+ rowDefinition12,
+ rowDefinition13,
+ rowDefinition14,
+ rowDefinition15,
+ rowDefinition16});
this.Root.Size = new System.Drawing.Size(1332, 207);
this.Root.TextVisible = false;
//
@@ -1459,17 +1463,17 @@
this.layoutControlItem34});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "layoutControlGroup2";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
+ columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition15.Width = 100D;
+ columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition16.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6});
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition15,
+ columnDefinition16});
+ rowDefinition17.Height = 100D;
+ rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition7});
+ rowDefinition17});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
this.layoutControlGroup2.Size = new System.Drawing.Size(336, 32);
this.layoutControlGroup2.TextVisible = false;
@@ -1593,29 +1597,29 @@
this.layoutControlItem31});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- 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;
+ 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;
this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition7,
- columnDefinition8,
- columnDefinition9,
- columnDefinition10});
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition10.Height = 100D;
- rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition17,
+ columnDefinition18,
+ columnDefinition19,
+ columnDefinition20});
+ 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;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition8,
- rowDefinition9,
- rowDefinition10});
+ rowDefinition18,
+ rowDefinition19,
+ rowDefinition20});
this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 128);
this.layoutControlGroup1.TextVisible = false;
//
@@ -1845,16 +1849,6 @@
this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
this.gridView2.OptionsView.ShowGroupPanel = false;
//
- // gridColumn7
- //
- this.gridColumn7.Caption = "浣跨敤缁勭粐";
- this.gridColumn7.FieldName = "fSubsidiary";
- this.gridColumn7.MinWidth = 200;
- this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 0;
- this.gridColumn7.Width = 200;
- //
// gridColumn8
//
this.gridColumn8.Caption = "鐗╂枡ID";
@@ -1892,6 +1886,16 @@
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 3;
this.gridColumn11.Width = 120;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "浣跨敤缁勭粐";
+ this.gridColumn7.FieldName = "fSubsidiary";
+ this.gridColumn7.MinWidth = 200;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 0;
+ this.gridColumn7.Width = 200;
//
// gvMx1qd002
//
@@ -2028,10 +2032,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.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, 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, 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);
@@ -2055,9 +2059,9 @@
// rptBl
//
this.rptBl.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptBl.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)});
+ 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)});
this.rptBl.Name = "rptBl";
this.rptBl.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBl_ButtonClick);
//
@@ -2262,6 +2266,16 @@
this.picCheckBox.TabIndex = 5;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
+ //
+ // gridColumn28
+ //
+ this.gridColumn28.Caption = "鍏ュ簱绫诲瀷";
+ this.gridColumn28.FieldName = "qtlx";
+ this.gridColumn28.MinWidth = 25;
+ this.gridColumn28.Name = "gridColumn28";
+ this.gridColumn28.Visible = true;
+ this.gridColumn28.VisibleIndex = 4;
+ this.gridColumn28.Width = 94;
//
// Frm_MesItemQtrk
//
@@ -2545,5 +2559,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
index a2b45e1..aeb42ca 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
@@ -137,6 +137,7 @@
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -297,7 +298,8 @@
this.gridColumn7,
this.gridColumn8,
this.gridColumn9,
- this.gridColumn10});
+ this.gridColumn10,
+ this.gridColumn13});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -365,7 +367,7 @@
this.gv_depotsId.OptionsColumn.AllowEdit = false;
this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
this.gv_depotsId.Visible = true;
- this.gv_depotsId.VisibleIndex = 3;
+ this.gv_depotsId.VisibleIndex = 4;
this.gv_depotsId.Width = 89;
//
// bandedGridColumn1
@@ -375,7 +377,7 @@
this.bandedGridColumn1.MinWidth = 25;
this.bandedGridColumn1.Name = "bandedGridColumn1";
this.bandedGridColumn1.Visible = true;
- this.bandedGridColumn1.VisibleIndex = 4;
+ this.bandedGridColumn1.VisibleIndex = 5;
this.bandedGridColumn1.Width = 94;
//
// gv_createBy
@@ -388,7 +390,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.CREATE_BY";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 5;
+ this.gv_createBy.VisibleIndex = 6;
this.gv_createBy.Width = 66;
//
// gv_createDate
@@ -401,7 +403,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.CREATE_DATE";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 6;
+ this.gv_createDate.VisibleIndex = 7;
this.gv_createDate.Width = 146;
//
// gv_lastupdateBy
@@ -414,7 +416,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 7;
+ this.gv_lastupdateBy.VisibleIndex = 8;
this.gv_lastupdateBy.Width = 94;
//
// gv_lastupdateDate
@@ -427,7 +429,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 8;
+ this.gv_lastupdateDate.VisibleIndex = 9;
this.gv_lastupdateDate.Width = 94;
//
// gv_remark
@@ -440,7 +442,7 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.REMARK";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 9;
+ this.gv_remark.VisibleIndex = 10;
this.gv_remark.Width = 119;
//
// bandedGridColumn4
@@ -450,7 +452,7 @@
this.bandedGridColumn4.MinWidth = 25;
this.bandedGridColumn4.Name = "bandedGridColumn4";
this.bandedGridColumn4.Visible = true;
- this.bandedGridColumn4.VisibleIndex = 10;
+ this.bandedGridColumn4.VisibleIndex = 11;
this.bandedGridColumn4.Width = 94;
//
// gv_checkUser
@@ -463,7 +465,7 @@
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.CHECK_USER";
this.gv_checkUser.Visible = true;
- this.gv_checkUser.VisibleIndex = 11;
+ this.gv_checkUser.VisibleIndex = 12;
this.gv_checkUser.Width = 94;
//
// gv_checkDate
@@ -476,7 +478,7 @@
this.gv_checkDate.OptionsColumn.AllowEdit = false;
this.gv_checkDate.Tag = "query_a.CHECK_DATE";
this.gv_checkDate.Visible = true;
- this.gv_checkDate.VisibleIndex = 12;
+ this.gv_checkDate.VisibleIndex = 13;
this.gv_checkDate.Width = 94;
//
// bandedGridColumn3
@@ -486,7 +488,7 @@
this.bandedGridColumn3.MinWidth = 25;
this.bandedGridColumn3.Name = "bandedGridColumn3";
this.bandedGridColumn3.Visible = true;
- this.bandedGridColumn3.VisibleIndex = 13;
+ this.bandedGridColumn3.VisibleIndex = 14;
this.bandedGridColumn3.Width = 94;
//
// bandedGridColumn5
@@ -496,7 +498,7 @@
this.bandedGridColumn5.MinWidth = 25;
this.bandedGridColumn5.Name = "bandedGridColumn5";
this.bandedGridColumn5.Visible = true;
- this.bandedGridColumn5.VisibleIndex = 14;
+ this.bandedGridColumn5.VisibleIndex = 15;
this.bandedGridColumn5.Width = 94;
//
// gv_guid
@@ -517,7 +519,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 15;
+ this.gridColumn7.VisibleIndex = 16;
this.gridColumn7.Width = 94;
//
// gridColumn8
@@ -527,7 +529,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 16;
+ this.gridColumn8.VisibleIndex = 17;
this.gridColumn8.Width = 94;
//
// gridColumn9
@@ -537,7 +539,7 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 17;
+ this.gridColumn9.VisibleIndex = 18;
this.gridColumn9.Width = 94;
//
// gridColumn10
@@ -547,7 +549,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 18;
+ this.gridColumn10.VisibleIndex = 19;
this.gridColumn10.Width = 94;
//
// pageBar1
@@ -1364,6 +1366,16 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "鍏ュ簱绫诲瀷";
+ this.gridColumn13.FieldName = "qtlx";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 3;
+ this.gridColumn13.Width = 94;
+ //
// Frm_MesItemQtrkDj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1542,5 +1554,6 @@
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index 6820a70..20792ff 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -84,6 +84,7 @@
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -422,7 +423,8 @@
this.gv_tbl012,
this.gridColumn11,
this.gridColumn12,
- this.gridColumn21});
+ this.gridColumn21,
+ this.gridColumn24});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -433,7 +435,7 @@
// gv_tbl013
//
this.gv_tbl013.AppearanceCell.Options.UseFont = true;
- this.gv_tbl013.Caption = "瀹℃牳鐘舵�� ";
+ this.gv_tbl013.Caption = "鍒跺崟瀹℃牳";
this.gv_tbl013.FieldName = "isChk";
this.gv_tbl013.MaxWidth = 50;
this.gv_tbl013.MinWidth = 50;
@@ -464,7 +466,7 @@
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Tag = "org.fnamber";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 2;
+ this.gridColumn5.VisibleIndex = 3;
this.gridColumn5.Width = 94;
//
// gv_billNo
@@ -477,7 +479,7 @@
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.bill_no";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 3;
+ this.gv_billNo.VisibleIndex = 4;
this.gv_billNo.Width = 94;
//
// gv_tbl003
@@ -490,7 +492,7 @@
this.gv_tbl003.OptionsColumn.AllowEdit = false;
this.gv_tbl003.Tag = "query_a.tbl003";
this.gv_tbl003.Visible = true;
- this.gv_tbl003.VisibleIndex = 4;
+ this.gv_tbl003.VisibleIndex = 5;
this.gv_tbl003.Width = 94;
//
// gv_tbl002
@@ -503,7 +505,7 @@
this.gv_tbl002.OptionsColumn.AllowEdit = false;
this.gv_tbl002.Tag = "query_a.tbl002";
this.gv_tbl002.Visible = true;
- this.gv_tbl002.VisibleIndex = 5;
+ this.gv_tbl002.VisibleIndex = 6;
this.gv_tbl002.Width = 94;
//
// gv_tbl021
@@ -516,7 +518,7 @@
this.gv_tbl021.OptionsColumn.AllowEdit = false;
this.gv_tbl021.Tag = "query_a.tbl021";
this.gv_tbl021.Visible = true;
- this.gv_tbl021.VisibleIndex = 6;
+ this.gv_tbl021.VisibleIndex = 7;
this.gv_tbl021.Width = 94;
//
// gridColumn6
@@ -526,7 +528,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 7;
+ this.gridColumn6.VisibleIndex = 8;
this.gridColumn6.Width = 94;
//
// gridColumn10
@@ -536,7 +538,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 8;
+ this.gridColumn10.VisibleIndex = 9;
this.gridColumn10.Width = 94;
//
// gv_tbl004
@@ -549,7 +551,7 @@
this.gv_tbl004.OptionsColumn.AllowEdit = false;
this.gv_tbl004.Tag = "query_a.tbl004";
this.gv_tbl004.Visible = true;
- this.gv_tbl004.VisibleIndex = 9;
+ this.gv_tbl004.VisibleIndex = 10;
this.gv_tbl004.Width = 94;
//
// gv_tbl005
@@ -562,7 +564,7 @@
this.gv_tbl005.OptionsColumn.AllowEdit = false;
this.gv_tbl005.Tag = "query_a.tbl005";
this.gv_tbl005.Visible = true;
- this.gv_tbl005.VisibleIndex = 10;
+ this.gv_tbl005.VisibleIndex = 11;
this.gv_tbl005.Width = 94;
//
// gv_tbl009
@@ -575,7 +577,7 @@
this.gv_tbl009.OptionsColumn.AllowEdit = false;
this.gv_tbl009.Tag = "query_a.tbl009";
this.gv_tbl009.Visible = true;
- this.gv_tbl009.VisibleIndex = 11;
+ this.gv_tbl009.VisibleIndex = 12;
this.gv_tbl009.Width = 94;
//
// gv_tbl010
@@ -588,7 +590,7 @@
this.gv_tbl010.OptionsColumn.AllowEdit = false;
this.gv_tbl010.Tag = "query_a.tbl010";
this.gv_tbl010.Visible = true;
- this.gv_tbl010.VisibleIndex = 12;
+ this.gv_tbl010.VisibleIndex = 13;
this.gv_tbl010.Width = 94;
//
// gv_tbl011
@@ -601,7 +603,7 @@
this.gv_tbl011.OptionsColumn.AllowEdit = false;
this.gv_tbl011.Tag = "query_a.tbl011";
this.gv_tbl011.Visible = true;
- this.gv_tbl011.VisibleIndex = 13;
+ this.gv_tbl011.VisibleIndex = 14;
this.gv_tbl011.Width = 94;
//
// gv_tbl012
@@ -614,7 +616,7 @@
this.gv_tbl012.OptionsColumn.AllowEdit = false;
this.gv_tbl012.Tag = "query_a.tbl012";
this.gv_tbl012.Visible = true;
- this.gv_tbl012.VisibleIndex = 14;
+ this.gv_tbl012.VisibleIndex = 15;
this.gv_tbl012.Width = 94;
//
// gridColumn11
@@ -632,18 +634,30 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 15;
+ this.gridColumn12.VisibleIndex = 16;
this.gridColumn12.Width = 94;
//
// gridColumn21
//
- this.gridColumn21.Caption = "鎵瑰噯";
+ this.gridColumn21.Caption = "閲囪喘鎵瑰噯";
this.gridColumn21.FieldName = "tbl024Chk";
- this.gridColumn21.MinWidth = 25;
+ this.gridColumn21.MaxWidth = 50;
+ this.gridColumn21.MinWidth = 50;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 1;
- this.gridColumn21.Width = 94;
+ this.gridColumn21.Width = 50;
+ //
+ // gridColumn24
+ //
+ this.gridColumn24.Caption = "鍝佽川瀹℃牳";
+ this.gridColumn24.FieldName = "tbl027Chk";
+ this.gridColumn24.MaxWidth = 50;
+ this.gridColumn24.MinWidth = 50;
+ this.gridColumn24.Name = "gridColumn24";
+ this.gridColumn24.Visible = true;
+ this.gridColumn24.VisibleIndex = 2;
+ this.gridColumn24.Width = 50;
//
// pageBar1
//
@@ -2517,5 +2531,6 @@
private DevExpress.XtraLayout.LayoutControlItem lab_daa014;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs
index cf8e8c5..64f146a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.Designer.cs
@@ -157,7 +157,6 @@
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
- this.gridView1.OptionsView.ShowFooter = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
// AboutGuid
@@ -166,6 +165,8 @@
this.AboutGuid.FieldName = "AboutGuid";
this.AboutGuid.MinWidth = 30;
this.AboutGuid.Name = "AboutGuid";
+ this.AboutGuid.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Max, "AboutGuid", "MAX={0}")});
this.AboutGuid.Tag = "AboutGuid";
this.AboutGuid.Width = 112;
//
@@ -194,6 +195,8 @@
this.name.MinWidth = 30;
this.name.Name = "name";
this.name.Tag = "name";
+ this.name.Visible = true;
+ this.name.VisibleIndex = 8;
this.name.Width = 112;
//
// fNumber
@@ -213,7 +216,7 @@
this.barCode.Name = "barCode";
this.barCode.Tag = "barCode";
this.barCode.Visible = true;
- this.barCode.VisibleIndex = 5;
+ this.barCode.VisibleIndex = 0;
this.barCode.Width = 112;
//
// daa001
@@ -224,7 +227,7 @@
this.daa001.Name = "daa001";
this.daa001.Tag = "daa001";
this.daa001.Visible = true;
- this.daa001.VisibleIndex = 6;
+ this.daa001.VisibleIndex = 1;
this.daa001.Width = 112;
//
// lineNo1
@@ -235,7 +238,7 @@
this.lineNo1.Name = "lineNo1";
this.lineNo1.Tag = "lineNo1";
this.lineNo1.Visible = true;
- this.lineNo1.VisibleIndex = 7;
+ this.lineNo1.VisibleIndex = 2;
this.lineNo1.Width = 112;
//
// daa029
@@ -246,7 +249,7 @@
this.daa029.Name = "daa029";
this.daa029.Tag = "daa029";
this.daa029.Visible = true;
- this.daa029.VisibleIndex = 8;
+ this.daa029.VisibleIndex = 3;
this.daa029.Width = 112;
//
// daa003
@@ -257,7 +260,7 @@
this.daa003.Name = "daa003";
this.daa003.Tag = "daa003";
this.daa003.Visible = true;
- this.daa003.VisibleIndex = 9;
+ this.daa003.VisibleIndex = 4;
this.daa003.Width = 112;
//
// daa004
@@ -268,7 +271,7 @@
this.daa004.Name = "daa004";
this.daa004.Tag = "daa004";
this.daa004.Visible = true;
- this.daa004.VisibleIndex = 10;
+ this.daa004.VisibleIndex = 5;
this.daa004.Width = 112;
//
// processNo
@@ -279,7 +282,7 @@
this.processNo.Name = "processNo";
this.processNo.Tag = "processNo";
this.processNo.Visible = true;
- this.processNo.VisibleIndex = 11;
+ this.processNo.VisibleIndex = 6;
this.processNo.Width = 112;
//
// nextProcessNo
@@ -290,7 +293,7 @@
this.nextProcessNo.Name = "nextProcessNo";
this.nextProcessNo.Tag = "nextProcessNo";
this.nextProcessNo.Visible = true;
- this.nextProcessNo.VisibleIndex = 12;
+ this.nextProcessNo.VisibleIndex = 7;
this.nextProcessNo.Width = 112;
//
// pageBar1
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
index 5f7eb43..b7e16fb 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.Designer.cs
@@ -73,6 +73,7 @@
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_chkStatus = new DevExpress.XtraEditors.CheckEdit();
this.txt_id = new DevExpress.XtraEditors.TextEdit();
@@ -95,25 +96,26 @@
this.txt_qt029 = new DevExpress.XtraEditors.CheckEdit();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -203,25 +205,26 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -591,6 +594,7 @@
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.btnSelect);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_chkStatus);
this.layoutMx1.Controls.Add(this.txt_id);
@@ -614,7 +618,9 @@
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
- this.layoutControlItem16});
+ this.layoutControlItem16,
+ this.layoutControlItem12,
+ this.layoutControlItem21});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(552, 472, 812, 500);
@@ -622,6 +628,16 @@
this.layoutMx1.Size = new System.Drawing.Size(1360, 174);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // btnSelect
+ //
+ this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.btnSelect.Location = new System.Drawing.Point(12, 136);
+ this.btnSelect.Name = "btnSelect";
+ this.btnSelect.Size = new System.Drawing.Size(116, 27);
+ this.btnSelect.StyleController = this.layoutMx1;
+ this.btnSelect.TabIndex = 444;
+ this.btnSelect.Text = "閫夋嫨鐗╂枡 ";
//
// lbGuid
//
@@ -705,7 +721,7 @@
//
// txt_fCreatorId
//
- this.txt_fCreatorId.Location = new System.Drawing.Point(784, 104);
+ this.txt_fCreatorId.Location = new System.Drawing.Point(1119, 104);
this.txt_fCreatorId.Name = "txt_fCreatorId";
this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
this.txt_fCreatorId.Size = new System.Drawing.Size(229, 24);
@@ -728,13 +744,13 @@
this.txt_fNote.Location = new System.Drawing.Point(114, 104);
this.txt_fNote.Name = "txt_fNote";
this.txt_fNote.Properties.Appearance.Options.UseFont = true;
- this.txt_fNote.Size = new System.Drawing.Size(564, 24);
+ this.txt_fNote.Size = new System.Drawing.Size(229, 24);
this.txt_fNote.StyleController = this.layoutMx1;
this.txt_fNote.TabIndex = 243;
//
// txt_fSalesManIDTxt
//
- this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(114, 135);
+ this.txt_fSalesManIDTxt.Location = new System.Drawing.Point(784, 104);
this.txt_fSalesManIDTxt.Name = "txt_fSalesManIDTxt";
this.txt_fSalesManIDTxt.Properties.Appearance.Options.UseFont = true;
this.txt_fSalesManIDTxt.Size = new System.Drawing.Size(229, 24);
@@ -744,7 +760,7 @@
//
// txt_fCreateDate
//
- this.txt_fCreateDate.Location = new System.Drawing.Point(784, 135);
+ this.txt_fCreateDate.Location = new System.Drawing.Point(1119, 135);
this.txt_fCreateDate.Name = "txt_fCreateDate";
this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
this.txt_fCreateDate.Size = new System.Drawing.Size(229, 24);
@@ -773,7 +789,7 @@
//
// txt_shName
//
- this.txt_shName.Location = new System.Drawing.Point(449, 135);
+ this.txt_shName.Location = new System.Drawing.Point(449, 104);
this.txt_shName.Name = "txt_shName";
this.txt_shName.Size = new System.Drawing.Size(229, 24);
this.txt_shName.StyleController = this.layoutMx1;
@@ -846,29 +862,42 @@
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem16.TextVisible = false;
//
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_wjStatus;
+ this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem12.CustomizationFormText = "瀹岀粨鏍囪瘑";
+ this.layoutControlItem12.Location = new System.Drawing.Point(1005, 92);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem12.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem12.TextVisible = false;
+ //
// layoutControlGroup1
//
this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.layoutControlGroup1.GroupBordersVisible = false;
this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem2,
this.layoutControlItem13,
this.layoutControlItem5,
this.layoutControlItem14,
this.layoutControlItem8,
this.layoutControlItem4,
- this.layoutControlItem3,
- this.layoutControlItem12,
- this.layoutControlItem9,
- this.layoutControlItem17,
this.layoutControlItem10,
this.layoutControlItem11,
this.layoutControlItem15,
this.layoutControlItem18,
- this.layoutControlItem6,
this.layoutControlItem19,
+ this.layoutControlItem20,
+ this.layoutControlItem6,
this.layoutControlItem7,
- this.layoutControlItem20});
+ this.layoutControlItem17,
+ this.layoutControlItem9,
+ this.layoutControlItem3,
+ this.layoutControlItem2});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -902,17 +931,6 @@
rowDefinition5});
this.layoutControlGroup1.Size = new System.Drawing.Size(1360, 174);
this.layoutControlGroup1.TextVisible = false;
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_billNo;
- this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem2.CustomizationFormText = "鐢宠缂栧彿";
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(335, 30);
- this.layoutControlItem2.Text = "鐢宠缂栧彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem13
//
@@ -959,9 +977,8 @@
this.layoutControlItem8.CustomizationFormText = "鐢宠澶囨敞";
this.layoutControlItem8.Location = new System.Drawing.Point(0, 92);
this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(670, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem8.Text = "鐢宠澶囨敞";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
@@ -976,57 +993,6 @@
this.layoutControlItem4.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem4.Text = "閿�鍞鍗�";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_fBillTypeID;
- this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem3.CustomizationFormText = "鍗曟嵁绫诲瀷";
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 30);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(335, 31);
- this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_wjStatus;
- this.layoutControlItem12.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem12.CustomizationFormText = "瀹岀粨鏍囪瘑";
- this.layoutControlItem12.Location = new System.Drawing.Point(1005, 92);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(335, 31);
- this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem12.TextVisible = false;
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_fSalesManIDTxt;
- this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem9.CustomizationFormText = "閿�鍞憳";
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 123);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem9.Size = new System.Drawing.Size(335, 31);
- this.layoutControlItem9.Text = "閿�鍞汉鍛�";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_shName;
- this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem17.CustomizationFormText = "鏀惰揣浜哄鍚�";
- this.layoutControlItem17.Location = new System.Drawing.Point(335, 123);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(335, 31);
- this.layoutControlItem17.Text = "鏀惰揣浜哄鍚�";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
@@ -1075,19 +1041,6 @@
this.layoutControlItem18.Text = "璐㈠姟瀹℃牳浜哄憳";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_fCreatorId;
- this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem6.CustomizationFormText = "鍒涘缓浜�";
- this.layoutControlItem6.Location = new System.Drawing.Point(670, 92);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(335, 31);
- this.layoutControlItem6.Text = "鍒涘缓浜哄憳";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
- //
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_qt030;
@@ -1098,19 +1051,6 @@
this.layoutControlItem19.Size = new System.Drawing.Size(335, 31);
this.layoutControlItem19.Text = "璐㈠姟瀹℃牳鏃ユ湡";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_fCreateDate;
- this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem7.CustomizationFormText = "鍒涘缓鏃ユ湡";
- this.layoutControlItem7.Location = new System.Drawing.Point(670, 123);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem7.Size = new System.Drawing.Size(335, 31);
- this.layoutControlItem7.Text = "鍒涘缓鏃ユ湡";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem20
//
@@ -1123,6 +1063,95 @@
this.layoutControlItem20.Text = "璐㈠姟瀹℃牳鐘舵��";
this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem20.TextVisible = false;
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_fCreatorId;
+ this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem6.CustomizationFormText = "鍒涘缓浜�";
+ this.layoutControlItem6.Location = new System.Drawing.Point(1005, 92);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem6.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem6.Text = "鍒涘缓浜哄憳";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_fCreateDate;
+ this.layoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem7.CustomizationFormText = "鍒涘缓鏃ユ湡";
+ this.layoutControlItem7.Location = new System.Drawing.Point(1005, 123);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem7.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem7.Text = "鍒涘缓鏃ユ湡";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_shName;
+ this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem17.CustomizationFormText = "鏀惰揣浜哄鍚�";
+ this.layoutControlItem17.Location = new System.Drawing.Point(335, 92);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem17.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem17.Text = "鏀惰揣浜哄鍚�";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_fSalesManIDTxt;
+ this.layoutControlItem9.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem9.CustomizationFormText = "閿�鍞憳";
+ this.layoutControlItem9.Location = new System.Drawing.Point(670, 92);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem9.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem9.Text = "閿�鍞汉鍛�";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_fBillTypeID;
+ this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem3.CustomizationFormText = "鍗曟嵁绫诲瀷";
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 30);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem3.Size = new System.Drawing.Size(335, 31);
+ this.layoutControlItem3.Text = "鍗曟嵁绫诲瀷";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_billNo;
+ this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem2.CustomizationFormText = "鐢宠缂栧彿";
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.Size = new System.Drawing.Size(335, 30);
+ this.layoutControlItem2.Text = "鐢宠缂栧彿";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem21
+ //
+ this.layoutControlItem21.Control = this.btnSelect;
+ this.layoutControlItem21.CustomizationFormText = "閫夋嫨鐗╂枡";
+ this.layoutControlItem21.Location = new System.Drawing.Point(0, 124);
+ this.layoutControlItem21.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem21.MinSize = new System.Drawing.Size(95, 31);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem21.Size = new System.Drawing.Size(329, 31);
+ this.layoutControlItem21.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem21.TextVisible = false;
//
// tabMx
//
@@ -1702,25 +1731,26 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qt029.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1827,13 +1857,11 @@
private DevExpress.XtraEditors.TextEdit txt_shName;
private DevExpress.XtraEditors.CheckEdit txt_wjStatus;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.Utils.ToolTipController tips;
@@ -1842,19 +1870,23 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
private DevExpress.XtraEditors.TextEdit txt_qt031;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraEditors.TextEdit txt_qt030;
private DevExpress.XtraEditors.CheckEdit txt_qt029;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn39;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn40;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraEditors.SimpleButton btnSelect;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.Designer.cs
new file mode 100644
index 0000000..419e149
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.Designer.cs
@@ -0,0 +1,38 @@
+锘縩amespace Gs.DevApp.DevFrm.Sales
+{
+ partial class Frm_SalesDeliverSelect
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Text = "Frm_SalesDeliverSelect";
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.cs
new file mode 100644
index 0000000..691cd4a
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.cs
@@ -0,0 +1,21 @@
+锘縰sing DevExpress.XtraEditors;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.Sales
+{
+ public partial class Frm_SalesDeliverSelect : DevExpress.XtraEditors.XtraForm
+ {
+ public Frm_SalesDeliverSelect()
+ {
+ InitializeComponent();
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 74e30c4..950f63f 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -836,6 +836,12 @@
<Compile Include="DevFrm\Sales\Frm_SalesDeliver.Designer.cs">
<DependentUpon>Frm_SalesDeliver.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Sales\Frm_SalesDeliverSelect.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Sales\Frm_SalesDeliverSelect.Designer.cs">
+ <DependentUpon>Frm_SalesDeliverSelect.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Sales\Frm_SalesOrder.cs">
<SubType>Form</SubType>
</Compile>
diff --git a/DevApp/Gs.DevApp/UserControl/SelectDaa.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectDaa.Designer.cs
index 6902af0..f957bdc 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectDaa.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectDaa.Designer.cs
@@ -38,13 +38,13 @@
this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -87,26 +87,26 @@
this.gv_operationTime.AppearanceCell.Options.UseFont = true;
this.gv_operationTime.Caption = "鐢熶骇绾垮埆";
this.gv_operationTime.FieldName = "xb";
- this.gv_operationTime.MinWidth = 10;
+ this.gv_operationTime.MinWidth = 50;
this.gv_operationTime.Name = "gv_operationTime";
this.gv_operationTime.OptionsColumn.AllowEdit = false;
this.gv_operationTime.Tag = "query_OPERATION_TIME";
this.gv_operationTime.Visible = true;
this.gv_operationTime.VisibleIndex = 1;
- this.gv_operationTime.Width = 48;
+ this.gv_operationTime.Width = 50;
//
// gv_operationTable
//
this.gv_operationTable.AppearanceCell.Options.UseFont = true;
this.gv_operationTable.Caption = "鐢熶骇杞﹂棿";
this.gv_operationTable.FieldName = "dptnName";
- this.gv_operationTable.MinWidth = 10;
+ this.gv_operationTable.MinWidth = 50;
this.gv_operationTable.Name = "gv_operationTable";
this.gv_operationTable.OptionsColumn.AllowEdit = false;
this.gv_operationTable.Tag = "query_OPERATION_TABLE";
this.gv_operationTable.Visible = true;
this.gv_operationTable.VisibleIndex = 2;
- this.gv_operationTable.Width = 48;
+ this.gv_operationTable.Width = 50;
//
// gv_userName
//
@@ -114,13 +114,63 @@
this.gv_userName.Caption = "宸ュ崟鍙�";
this.gv_userName.FieldName = "daa001";
this.gv_userName.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
- this.gv_userName.MinWidth = 10;
+ this.gv_userName.MinWidth = 50;
this.gv_userName.Name = "gv_userName";
this.gv_userName.OptionsColumn.AllowEdit = false;
this.gv_userName.Tag = "query_USER_NAME";
this.gv_userName.Visible = true;
this.gv_userName.VisibleIndex = 0;
this.gv_userName.Width = 50;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鎶曟枡鍗曞彿";
+ this.gridColumn1.FieldName = "daa014";
+ this.gridColumn1.MinWidth = 50;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 3;
+ this.gridColumn1.Width = 50;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "浠诲姟鍗曞彿";
+ this.gridColumn2.FieldName = "daa021";
+ this.gridColumn2.MinWidth = 50;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 4;
+ this.gridColumn2.Width = 50;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "浜у搧缂栫爜";
+ this.gridColumn3.FieldName = "itemNo";
+ this.gridColumn3.MinWidth = 50;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 5;
+ this.gridColumn3.Width = 50;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "浜у搧鍚嶇О";
+ this.gridColumn4.FieldName = "itemName";
+ this.gridColumn4.MinWidth = 50;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 6;
+ this.gridColumn4.Width = 50;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "瑙勬牸鍨嬪彿";
+ this.gridColumn5.FieldName = "itemModel";
+ this.gridColumn5.MinWidth = 50;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 7;
+ this.gridColumn5.Width = 50;
//
// gv_Btn
//
@@ -143,56 +193,6 @@
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
- //
- // gridColumn1
- //
- this.gridColumn1.Caption = "鎶曟枡鍗曞彿";
- this.gridColumn1.FieldName = "daa014";
- this.gridColumn1.MinWidth = 25;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 3;
- this.gridColumn1.Width = 50;
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "浠诲姟鍗曞彿";
- this.gridColumn2.FieldName = "daa021";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 4;
- this.gridColumn2.Width = 50;
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "浜у搧缂栫爜";
- this.gridColumn3.FieldName = "itemNo";
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 5;
- this.gridColumn3.Width = 50;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "浜у搧鍚嶇О";
- this.gridColumn4.FieldName = "itemName";
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 6;
- this.gridColumn4.Width = 50;
- //
- // gridColumn5
- //
- this.gridColumn5.Caption = "瑙勬牸鍨嬪彿";
- this.gridColumn5.FieldName = "itemModel";
- this.gridColumn5.MinWidth = 25;
- this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 7;
- this.gridColumn5.Width = 50;
//
// SelectDaa
//
diff --git a/DevApp/Gs.DevApp/UserControl/SelectDaa.cs b/DevApp/Gs.DevApp/UserControl/SelectDaa.cs
index 3e97c96..12f0706 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectDaa.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectDaa.cs
@@ -46,6 +46,7 @@
gcMain.ForceInitialize();
gridView1.BestFitColumns();
Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
@@ -57,7 +58,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
--
Gitblit v1.9.3