From d4e0269da1cc87d42918cdda6afaa005b6c47a0e Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期三, 19 十一月 2025 13:40:46 +0800
Subject: [PATCH] 按大类维护
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs | 295 +-
DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.cs | 48
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.Designer.cs | 36
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs | 602 ++---
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.Designer.cs | 60
DevApp/Gs.DevApp/DevFrm/QC/JyxmByLeiBie.Designer.cs | 1265 +++++++++++
DevApp/Gs.DevApp/DevFrm/QC/JyxmShowByLeiBie.resx | 120 +
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDtByLeiBie.Designer.cs | 59
DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.Designer.cs | 995 ++++----
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs | 501 ++--
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs | 252 -
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs | 64
DevApp/Gs.DevApp/DevFrm/QC/JyxmByLeiBie.cs | 871 +++++++
DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs | 70
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs | 68
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDtByLeiBie.cs | 23
DevApp/Gs.DevApp/DevFrm/QC/JyxmShowByLeiBie.cs | 144 +
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs | 51
DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs | 254 -
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs | 2
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.resx | 22
DevApp/Gs.DevApp/Gs.DevApp.csproj | 36
DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs | 22
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs | 105
DevApp/Gs.DevApp/DevFrm/QC/JyxmShowByLeiBie.Designer.cs | 210 +
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs | 82
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs | 66
DevApp/Gs.DevApp/DevFrm/QC/JyxmByLeiBie.resx | 123 +
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDtByLeiBie.resx | 120 +
30 files changed, 4,533 insertions(+), 2,037 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 432ab84..c31e074 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -36,9 +36,9 @@
</runtime>
<appSettings>
- <!--<add key="webapiurl" value="http://localhost:5263/" />-->
+ <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: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/BasicData/Frm_MesItemType.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
index 724def6..1fe1680 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
@@ -30,12 +30,18 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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 rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = 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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesItemType));
+ 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();
@@ -69,6 +75,8 @@
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -101,6 +109,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -114,7 +123,7 @@
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(938, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1109, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -125,7 +134,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(938, 401);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1109, 401);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -135,7 +144,7 @@
//
this.xtraTabPage1.Controls.Add(this.split1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(936, 369);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1107, 369);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -156,7 +165,7 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(936, 369);
+ this.split1.Size = new System.Drawing.Size(1107, 369);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
@@ -166,7 +175,9 @@
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(936, 318);
+ this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1});
+ this.gcMain1.Size = new System.Drawing.Size(1107, 318);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -181,7 +192,8 @@
this.gv_pgroup,
this.gv_description,
this.gridColumn1,
- this.gridColumn2});
+ this.gridColumn2,
+ this.gridColumn3});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -251,7 +263,7 @@
this.gv_description.OptionsColumn.AllowEdit = false;
this.gv_description.Tag = "query_a.description";
this.gv_description.Visible = true;
- this.gv_description.VisibleIndex = 3;
+ this.gv_description.VisibleIndex = 4;
this.gv_description.Width = 147;
//
// gridColumn1
@@ -262,7 +274,7 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "query_a.lastupdate_date";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 4;
+ this.gridColumn1.VisibleIndex = 5;
this.gridColumn1.Width = 180;
//
// gridColumn2
@@ -272,7 +284,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 5;
+ this.gridColumn2.VisibleIndex = 6;
this.gridColumn2.Width = 94;
//
// pageBar1
@@ -283,7 +295,7 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(936, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1107, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
@@ -422,26 +434,26 @@
this.layoutControlItem6});
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});
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5,
- rowDefinition6});
+ rowDefinition1,
+ rowDefinition2});
this.Root.Size = new System.Drawing.Size(936, 87);
this.Root.TextVisible = false;
//
@@ -506,11 +518,31 @@
this.layoutControlItem6.Text = "鍚屾鏃堕棿";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "缁存姢妫�楠岀被鍒�";
+ this.gridColumn3.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 7;
+ this.gridColumn3.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
+ 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, 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;
+ //
// Frm_MesItemType
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(938, 481);
+ this.ClientSize = new System.Drawing.Size(1109, 481);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesItemType";
@@ -547,6 +579,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.ResumeLayout(false);
}
@@ -584,5 +617,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
index 8d615f5..4511d0a 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
@@ -107,7 +107,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.resx b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.resx
index a4826a3..9af4002 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.resx
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.resx
@@ -117,6 +117,28 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="editorButtonImageOptions1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAsdEVYdFRpdGxlAE9wdGlvbnM7Q3VzdG9taXo7QmFycztSaWJib247U3RhbmRhcmQ7ZTTRegAA
+ A0NJREFUOE9Nk3tMjWEcx1/m0o3cyW3G/MU/jc3K5o+mMbk1tqYtZjLkciSKKI5JK6eLczqFYjmFEitF
+ uqCIzkGXZS1Ro5Jy6nTOqc717Zy+fs9ztHm2z/vueZ/n93l+v+d9HoHa5Iz8xtrMh81gKB82QfnARUZ+
+ M9EIRV4TFKoGyFWNxGek5NS/o7hpAFi8MEWZ34Rx6nHo4WKc45zA6cJBpN77yCLdJwRTb+Y18CCrzQEL
+ YbY6MGoWMTxqc2ESMWJxYNgyBvuYEzfuqFmkB4+mNi313icuMFnHYKJJIyY7kpRPIIm7hYTUBygur8eA
+ wQIDfbeJTiRmvmcCz5CDcS6BjIws3VGLyFc20kRFdhHOxKahtOoTslTlkMry8Edn4hleldcxgdee/Re4
+ YHpi1geqzQk9pWsYtdNKInRGK25mFeDMJQXau/SQ55Qgt6CSyrEjPq2WCWYEh0Zzgdu1jDrYRREXr99F
+ SYUaA0YLdMM2dHYPYEdIJOpb+1FR+wXHomQYMpoRm/KKC3aGRHGB+2UyWqw2HI6U4bbqJR4V16C7T4/7
+ j6shzy5GXUsf1F/6sC88HtqhEcQkVzPBzG17T7sEsbLXXHA0KhVPyzW4lfscEdFpUFDaNZp21DT9RlFl
+ C8KOXMVvrQHJt/kmem8NPskFHueTqugXipDfeYIrybn41q1H/5AZHb1GaNq0eN3QQ5IePlb07A3KqtuY
+ YHbgzuNc4HnuegVE0YEOqvlghBSSWAVyCmtQpfkBVYkaFZouvFT/RPN3LS4mZCMxrYAJFhGTmMAr8hoJ
+ 6ID0DprxvXsQSekqBO2JwJp1QfALCEG4JAGlbztR8q4TDV8HECPNwjr/XRKKdeMCifQFP2Ej5jF+BgYN
+ ZvQPDuNXvx5dvTrcVT1FaPgFPK5uRwGhbu3DieiUcV+/3WFM4HY0pqj2RHwZIuLKwN7H40px7FIp9Z9B
+ mv6GNrYFMfEZ2LXvJO6XtxGtqFR3YGPgAR0TTCbciZmENzHrH7P/Yy6xeN6C5Wc3bw8bVxZqkFn4kcoL
+ 0wrsRk3cqmWrNwlLVvkLPis2CAuXrxfmL/UVtgafEhb4rGTDbMM8vOcsOuS/+YDOL2C/bq3vltC/pJl/
+ VsY45MMAAAAASUVORK5CYII=
+</value>
+ </data>
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs
index 41a9f62..f51b060 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs
@@ -128,6 +128,7 @@
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -135,6 +136,11 @@
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -176,15 +182,6 @@
this.repositoryItemSearchLookUpEdit2View = new DevExpress.XtraGrid.Views.Grid.GridView();
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_lineName = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -250,6 +247,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
@@ -257,6 +255,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
@@ -272,14 +275,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit2View)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -367,7 +362,6 @@
this.gridColumn2,
this.gridColumn4,
this.gridColumn5,
- this.gridColumn6,
this.gridColumn7,
this.gridColumn8,
this.gridColumn17,
@@ -688,7 +682,6 @@
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_checkResult);
this.layoutMx1.Controls.Add(this.txt_jyDATE);
- this.layoutMx1.Controls.Add(this.txt_lineName);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem9});
@@ -713,7 +706,7 @@
//
// txt_jyNAME
//
- this.txt_jyNAME.Location = new System.Drawing.Point(1155, 47);
+ this.txt_jyNAME.Location = new System.Drawing.Point(1155, 12);
this.txt_jyNAME.Margin = new System.Windows.Forms.Padding(4);
this.txt_jyNAME.Name = "txt_jyNAME";
this.txt_jyNAME.Properties.Appearance.Options.UseFont = true;
@@ -724,7 +717,7 @@
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(1155, 152);
+ this.txt_checkUser.Location = new System.Drawing.Point(1155, 117);
this.txt_checkUser.Margin = new System.Windows.Forms.Padding(4);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Size = new System.Drawing.Size(241, 28);
@@ -1010,7 +1003,7 @@
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(1155, 187);
+ this.txt_checkDate.Location = new System.Drawing.Point(1155, 152);
this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
@@ -1022,7 +1015,7 @@
//
// txt_checkResult
//
- this.txt_checkResult.Location = new System.Drawing.Point(1155, 117);
+ this.txt_checkResult.Location = new System.Drawing.Point(1155, 82);
this.txt_checkResult.Margin = new System.Windows.Forms.Padding(4);
this.txt_checkResult.Name = "txt_checkResult";
this.txt_checkResult.Properties.Appearance.Options.UseFont = true;
@@ -1033,7 +1026,7 @@
//
// txt_jyDATE
//
- this.txt_jyDATE.Location = new System.Drawing.Point(1155, 82);
+ this.txt_jyDATE.Location = new System.Drawing.Point(1155, 47);
this.txt_jyDATE.Margin = new System.Windows.Forms.Padding(4);
this.txt_jyDATE.Name = "txt_jyDATE";
this.txt_jyDATE.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
@@ -1073,6 +1066,7 @@
this.layoutControlItem24,
this.layoutControlItem25,
this.layoutControlItem13,
+ this.layoutControlItem17,
this.layoutControlItem29,
this.layoutControlItem28,
this.layoutControlItem4,
@@ -1080,16 +1074,14 @@
this.layoutControlItem22,
this.layoutControlItem14,
this.layoutControlItem15,
+ this.layoutControlItem6,
+ this.layoutControlItem27,
+ this.layoutControlItem5,
+ this.layoutControlItem7,
+ this.layoutControlItem8,
this.layoutControlItem26,
this.layoutControlItem30,
- this.layoutControlItem10,
- this.layoutControlItem8,
- this.layoutControlItem7,
- this.layoutControlItem5,
- this.layoutControlItem27,
- this.layoutControlItem6,
- this.layoutControlItem31,
- this.layoutControlItem17});
+ this.layoutControlItem10});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1298,6 +1290,17 @@
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 22);
this.layoutControlItem13.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
//
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_FQCNo;
+ this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem17.CustomizationFormText = "妫�楠屽崟鍙�";
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.Size = new System.Drawing.Size(347, 35);
+ this.layoutControlItem17.Text = "妫�楠屽崟鍙�";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 22);
+ //
// layoutControlItem29
//
this.layoutControlItem29.Control = this.txt_SP_DATE;
@@ -1392,6 +1395,62 @@
this.layoutControlItem15.Size = new System.Drawing.Size(347, 35);
this.layoutControlItem15.Text = "鎵归噺";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 22);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_jyNAME;
+ this.layoutControlItem6.Location = new System.Drawing.Point(1041, 0);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem6.Size = new System.Drawing.Size(347, 35);
+ this.layoutControlItem6.Text = "妫�楠屼汉";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 22);
+ //
+ // layoutControlItem27
+ //
+ this.layoutControlItem27.Control = this.txt_jyDATE;
+ this.layoutControlItem27.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+ this.layoutControlItem27.CustomizationFormText = "妫�楠屾棩鏈�";
+ this.layoutControlItem27.Location = new System.Drawing.Point(1041, 35);
+ this.layoutControlItem27.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem27.Size = new System.Drawing.Size(347, 35);
+ this.layoutControlItem27.Text = "妫�楠屾棩鏈�";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 22);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_checkResult;
+ this.layoutControlItem5.Location = new System.Drawing.Point(1041, 70);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem5.Size = new System.Drawing.Size(347, 35);
+ this.layoutControlItem5.Text = "妫�楠岀粨鏋�";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 22);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_checkUser;
+ this.layoutControlItem7.Location = new System.Drawing.Point(1041, 105);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem7.Size = new System.Drawing.Size(347, 35);
+ this.layoutControlItem7.Text = "瀹℃牳鑰�";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 22);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_checkDate;
+ this.layoutControlItem8.Location = new System.Drawing.Point(1041, 140);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem8.Size = new System.Drawing.Size(347, 35);
+ this.layoutControlItem8.Text = "瀹℃牳鏃堕棿";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 22);
//
// layoutControlItem26
//
@@ -1847,106 +1906,6 @@
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
- // gridColumn6
- //
- this.gridColumn6.Caption = "绾垮悕";
- this.gridColumn6.FieldName = "lineName";
- this.gridColumn6.MinWidth = 30;
- this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 22;
- this.gridColumn6.Width = 112;
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_checkDate;
- this.layoutControlItem8.Location = new System.Drawing.Point(1041, 175);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem8.Size = new System.Drawing.Size(347, 35);
- this.layoutControlItem8.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 22);
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_checkUser;
- this.layoutControlItem7.Location = new System.Drawing.Point(1041, 140);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem7.Size = new System.Drawing.Size(347, 35);
- this.layoutControlItem7.Text = "瀹℃牳鑰�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 22);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_checkResult;
- this.layoutControlItem5.Location = new System.Drawing.Point(1041, 105);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem5.Size = new System.Drawing.Size(347, 35);
- this.layoutControlItem5.Text = "妫�楠岀粨鏋�";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 22);
- //
- // layoutControlItem27
- //
- this.layoutControlItem27.Control = this.txt_jyDATE;
- this.layoutControlItem27.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem27.CustomizationFormText = "妫�楠屾棩鏈�";
- this.layoutControlItem27.Location = new System.Drawing.Point(1041, 70);
- this.layoutControlItem27.Name = "layoutControlItem27";
- this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem27.Size = new System.Drawing.Size(347, 35);
- this.layoutControlItem27.Text = "妫�楠屾棩鏈�";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 22);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_jyNAME;
- this.layoutControlItem6.Location = new System.Drawing.Point(1041, 35);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(347, 35);
- this.layoutControlItem6.Text = "妫�楠屼汉";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 22);
- //
- // txt_lineName
- //
- this.txt_lineName.Location = new System.Drawing.Point(1155, 12);
- this.txt_lineName.Margin = new System.Windows.Forms.Padding(4);
- this.txt_lineName.Name = "txt_lineName";
- this.txt_lineName.Size = new System.Drawing.Size(241, 28);
- this.txt_lineName.StyleController = this.layoutMx1;
- this.txt_lineName.TabIndex = 250;
- this.txt_lineName.Tag = "readonly";
- //
- // layoutControlItem31
- //
- this.layoutControlItem31.Control = this.txt_lineName;
- this.layoutControlItem31.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem31.CustomizationFormText = "绾垮悕";
- this.layoutControlItem31.Location = new System.Drawing.Point(1041, 0);
- this.layoutControlItem31.Name = "layoutControlItem31";
- this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem31.Size = new System.Drawing.Size(347, 35);
- this.layoutControlItem31.Text = "绾垮悕";
- this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 22);
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_FQCNo;
- this.layoutControlItem17.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
- this.layoutControlItem17.CustomizationFormText = "妫�楠屽崟鍙�";
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.Size = new System.Drawing.Size(347, 35);
- this.layoutControlItem17.Text = "妫�楠屽崟鍙�";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 22);
- //
// Frm_FQCItem
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
@@ -2022,6 +1981,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
@@ -2029,6 +1989,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
@@ -2044,14 +2009,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit2View)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
this.ResumeLayout(false);
}
@@ -2168,6 +2125,7 @@
private DevExpress.XtraEditors.DateEdit txt_SP_DATE;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn52;
private DevExpress.XtraEditors.TextEdit txt_OrgName;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
@@ -2175,6 +2133,11 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
@@ -2182,14 +2145,5 @@
private DevExpress.XtraEditors.TextEdit txt_jyDATE;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraEditors.TextEdit txt_lineName;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
index 4579e41..2337ced 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -7,10 +7,8 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.Configuration;
using System.Data;
using System.Data.SqlTypes;
-using System.Net;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -35,7 +33,6 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnBaoGaoClick += ToolBarMenu1_btnBaoGaoClick;
- toolBarMenu1.btnOutClick += ToolBarMenu1_btnOutClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
@@ -1087,54 +1084,6 @@
catch (Exception ex)
{
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
- }
- }
-
- private void ToolBarMenu1_btnOutClick(object sender, EventArgs e)
- {
- using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
- {
- folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
- DialogResult dialogResult = folderBrowserDialog.ShowDialog();
- System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- _sbSqlWhere.Append(" and daa.erp_sczz in");
- _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
- _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
- if (dialogResult == DialogResult.OK)
- {
- string _folder = folderBrowserDialog.SelectedPath;
- var _params = new
- {
- inSortName = "",
- inSortOrder = "",
- inQueryWhere = _sbSqlWhere.ToString()
- };
- var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOut_fqclst", "", "", "", _params);
- try
- {
- string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView_NEW", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- string _file = _rtn.rtnData.fileUrl.ToString();
- string _folderName = _folder + "\\" + _file.Replace("down/", "");
- string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
- using (WebClient client = new WebClient())
- {
- client.DownloadFile(_url, _folderName);
- }
- ToolBox.MsgHelper.ShowInformation("瀵煎嚭鎴愬姛锛�");
- }
- else
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
index ea6cdff..61917b0 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.Designer.cs
@@ -68,8 +68,8 @@
this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_createByName = new DevExpress.XtraEditors.TextEdit();
- this.txt_checkUserName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
this.txt_Remark = new DevExpress.XtraEditors.TextEdit();
@@ -141,8 +141,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).BeginInit();
@@ -288,11 +288,11 @@
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "寤虹珛鑰�";
- this.gv_createBy.FieldName = "createByName";
+ this.gv_createBy.FieldName = "createBy";
this.gv_createBy.MinWidth = 62;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
- this.gv_createBy.Tag = "cj.USER_NAME";
+ this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 1;
this.gv_createBy.Width = 100;
@@ -305,7 +305,7 @@
this.gv_createDate.MinWidth = 225;
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
- this.gv_createDate.Tag = "a.create_date";
+ this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
this.gv_createDate.VisibleIndex = 2;
this.gv_createDate.Width = 286;
@@ -379,10 +379,10 @@
// gridColumn7
//
this.gridColumn7.Caption = "宸ュ崟鍙�";
- this.gridColumn7.FieldName = "daa001";
+ this.gridColumn7.FieldName = "dAA001";
this.gridColumn7.MinWidth = 30;
this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Tag = "daa001";
+ this.gridColumn7.Tag = "dAA001";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 8;
this.gridColumn7.Width = 112;
@@ -457,8 +457,8 @@
this.layoutMx1.Controls.Add(this.btnSelect);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_createDate);
- this.layoutMx1.Controls.Add(this.txt_createByName);
- this.layoutMx1.Controls.Add(this.txt_checkUserName);
+ this.layoutMx1.Controls.Add(this.txt_createBy);
+ this.layoutMx1.Controls.Add(this.txt_checkBy);
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_checkStatus);
this.layoutMx1.Controls.Add(this.txt_Remark);
@@ -525,26 +525,26 @@
this.txt_createDate.TabIndex = 231;
this.txt_createDate.Tag = "readonly";
//
- // txt_createByName
+ // txt_createBy
//
- this.txt_createByName.Location = new System.Drawing.Point(96, 179);
- this.txt_createByName.Margin = new System.Windows.Forms.Padding(4);
- this.txt_createByName.Name = "txt_createByName";
- this.txt_createByName.Properties.Appearance.Options.UseFont = true;
- this.txt_createByName.Size = new System.Drawing.Size(259, 28);
- this.txt_createByName.StyleController = this.layoutMx1;
- this.txt_createByName.TabIndex = 228;
- this.txt_createByName.Tag = "readonly";
+ this.txt_createBy.Location = new System.Drawing.Point(96, 179);
+ this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_createBy.Name = "txt_createBy";
+ this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+ this.txt_createBy.Size = new System.Drawing.Size(259, 28);
+ this.txt_createBy.StyleController = this.layoutMx1;
+ this.txt_createBy.TabIndex = 228;
+ this.txt_createBy.Tag = "readonly";
//
- // txt_checkUserName
+ // txt_checkBy
//
- this.txt_checkUserName.Location = new System.Drawing.Point(790, 123);
- this.txt_checkUserName.Margin = new System.Windows.Forms.Padding(4);
- this.txt_checkUserName.Name = "txt_checkUserName";
- this.txt_checkUserName.Size = new System.Drawing.Size(259, 28);
- this.txt_checkUserName.StyleController = this.layoutMx1;
- this.txt_checkUserName.TabIndex = 247;
- this.txt_checkUserName.Tag = "readonly";
+ this.txt_checkBy.Location = new System.Drawing.Point(790, 123);
+ this.txt_checkBy.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_checkBy.Name = "txt_checkBy";
+ this.txt_checkBy.Size = new System.Drawing.Size(259, 28);
+ this.txt_checkBy.StyleController = this.layoutMx1;
+ this.txt_checkBy.TabIndex = 247;
+ this.txt_checkBy.Tag = "readonly";
//
// txt_checkDate
//
@@ -831,7 +831,7 @@
//
// layoutControlItem5
//
- this.layoutControlItem5.Control = this.txt_createByName;
+ this.layoutControlItem5.Control = this.txt_createBy;
this.layoutControlItem5.Location = new System.Drawing.Point(0, 167);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
@@ -852,7 +852,7 @@
//
// layoutControlItem7
//
- this.layoutControlItem7.Control = this.txt_checkUserName;
+ this.layoutControlItem7.Control = this.txt_checkBy;
this.layoutControlItem7.Location = new System.Drawing.Point(694, 111);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -1199,8 +1199,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).EndInit();
@@ -1257,12 +1257,12 @@
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraEditors.TextEdit txt_createByName;
+ private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.Utils.ToolTipController tips;
- private DevExpress.XtraEditors.TextEdit txt_checkUserName;
+ private DevExpress.XtraEditors.TextEdit txt_checkBy;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
private System.Windows.Forms.PictureBox picCheckBox;
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs
index 2ba2633..125ad2e 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesDeToLine.Designer.cs
@@ -57,8 +57,8 @@
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_createByName = new DevExpress.XtraEditors.TextEdit();
- this.txt_checkUserName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
this.txt_Guid = new DevExpress.XtraEditors.TextEdit();
@@ -103,8 +103,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).BeginInit();
@@ -231,12 +231,12 @@
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "寤虹珛鑰�";
- this.gv_createBy.FieldName = "createByName";
+ this.gv_createBy.FieldName = "createBy";
this.gv_createBy.MinWidth = 62;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.OptionsColumn.ReadOnly = true;
- this.gv_createBy.Tag = "cj.USER_NAME";
+ this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 1;
this.gv_createBy.Width = 100;
@@ -250,7 +250,7 @@
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.OptionsColumn.ReadOnly = true;
- this.gv_createDate.Tag = "a.CREATE_DATE";
+ this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
this.gv_createDate.VisibleIndex = 2;
this.gv_createDate.Width = 286;
@@ -273,7 +273,7 @@
this.gridColumn5.FieldName = "orgName";
this.gridColumn5.MinWidth = 30;
this.gridColumn5.Name = "gridColumn5";
- this.gridColumn5.Tag = "b.Name";
+ this.gridColumn5.Tag = "orgName";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 3;
this.gridColumn5.Width = 112;
@@ -375,8 +375,8 @@
//
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_createDate);
- this.layoutMx1.Controls.Add(this.txt_createByName);
- this.layoutMx1.Controls.Add(this.txt_checkUserName);
+ this.layoutMx1.Controls.Add(this.txt_createBy);
+ this.layoutMx1.Controls.Add(this.txt_checkBy);
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_checkStatus);
this.layoutMx1.Controls.Add(this.txt_Guid);
@@ -418,26 +418,26 @@
this.txt_createDate.TabIndex = 231;
this.txt_createDate.Tag = "readonly";
//
- // txt_createByName
+ // txt_createBy
//
- this.txt_createByName.Location = new System.Drawing.Point(1137, 81);
- this.txt_createByName.Margin = new System.Windows.Forms.Padding(4);
- this.txt_createByName.Name = "txt_createByName";
- this.txt_createByName.Properties.Appearance.Options.UseFont = true;
- this.txt_createByName.Size = new System.Drawing.Size(259, 28);
- this.txt_createByName.StyleController = this.layoutMx1;
- this.txt_createByName.TabIndex = 228;
- this.txt_createByName.Tag = "readonly";
+ this.txt_createBy.Location = new System.Drawing.Point(1137, 81);
+ this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_createBy.Name = "txt_createBy";
+ this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+ this.txt_createBy.Size = new System.Drawing.Size(259, 28);
+ this.txt_createBy.StyleController = this.layoutMx1;
+ this.txt_createBy.TabIndex = 228;
+ this.txt_createBy.Tag = "readonly";
//
- // txt_checkUserName
+ // txt_checkBy
//
- this.txt_checkUserName.Location = new System.Drawing.Point(443, 81);
- this.txt_checkUserName.Margin = new System.Windows.Forms.Padding(4);
- this.txt_checkUserName.Name = "txt_checkUserName";
- this.txt_checkUserName.Size = new System.Drawing.Size(259, 28);
- this.txt_checkUserName.StyleController = this.layoutMx1;
- this.txt_checkUserName.TabIndex = 247;
- this.txt_checkUserName.Tag = "readonly";
+ this.txt_checkBy.Location = new System.Drawing.Point(443, 81);
+ this.txt_checkBy.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_checkBy.Name = "txt_checkBy";
+ this.txt_checkBy.Size = new System.Drawing.Size(259, 28);
+ this.txt_checkBy.StyleController = this.layoutMx1;
+ this.txt_checkBy.TabIndex = 247;
+ this.txt_checkBy.Tag = "readonly";
//
// txt_checkDate
//
@@ -650,7 +650,7 @@
//
// layoutControlItem7
//
- this.layoutControlItem7.Control = this.txt_checkUserName;
+ this.layoutControlItem7.Control = this.txt_checkBy;
this.layoutControlItem7.Location = new System.Drawing.Point(347, 69);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -672,7 +672,7 @@
//
// layoutControlItem5
//
- this.layoutControlItem5.Control = this.txt_createByName;
+ this.layoutControlItem5.Control = this.txt_createBy;
this.layoutControlItem5.Location = new System.Drawing.Point(1041, 69);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -766,8 +766,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).EndInit();
@@ -808,12 +808,12 @@
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraEditors.TextEdit txt_createByName;
+ private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.Utils.ToolTipController tips;
- private DevExpress.XtraEditors.TextEdit txt_checkUserName;
+ private DevExpress.XtraEditors.TextEdit txt_checkBy;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
private System.Windows.Forms.PictureBox picCheckBox;
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs
index 6966c69..5fa2d9a 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.Designer.cs
@@ -58,8 +58,8 @@
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_createByName = new DevExpress.XtraEditors.TextEdit();
- this.txt_checkUserName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
this.txt_Remark = new DevExpress.XtraEditors.TextEdit();
@@ -104,8 +104,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).BeginInit();
@@ -236,12 +236,12 @@
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "寤虹珛鑰�";
- this.gv_createBy.FieldName = "createByName";
+ this.gv_createBy.FieldName = "createBy";
this.gv_createBy.MinWidth = 62;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.OptionsColumn.ReadOnly = true;
- this.gv_createBy.Tag = "cj.USER_NAME";
+ this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 1;
this.gv_createBy.Width = 100;
@@ -255,7 +255,7 @@
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.OptionsColumn.ReadOnly = true;
- this.gv_createDate.Tag = "a.CREATE_DATE";
+ this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
this.gv_createDate.VisibleIndex = 2;
this.gv_createDate.Width = 286;
@@ -395,8 +395,8 @@
//
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_createDate);
- this.layoutMx1.Controls.Add(this.txt_createByName);
- this.layoutMx1.Controls.Add(this.txt_checkUserName);
+ this.layoutMx1.Controls.Add(this.txt_createBy);
+ this.layoutMx1.Controls.Add(this.txt_checkBy);
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_checkStatus);
this.layoutMx1.Controls.Add(this.txt_Remark);
@@ -439,26 +439,26 @@
this.txt_createDate.TabIndex = 231;
this.txt_createDate.Tag = "readonly";
//
- // txt_createByName
+ // txt_createBy
//
- this.txt_createByName.Location = new System.Drawing.Point(1137, 81);
- this.txt_createByName.Margin = new System.Windows.Forms.Padding(4);
- this.txt_createByName.Name = "txt_createByName";
- this.txt_createByName.Properties.Appearance.Options.UseFont = true;
- this.txt_createByName.Size = new System.Drawing.Size(259, 28);
- this.txt_createByName.StyleController = this.layoutMx1;
- this.txt_createByName.TabIndex = 228;
- this.txt_createByName.Tag = "readonly";
+ this.txt_createBy.Location = new System.Drawing.Point(1137, 81);
+ this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_createBy.Name = "txt_createBy";
+ this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+ this.txt_createBy.Size = new System.Drawing.Size(259, 28);
+ this.txt_createBy.StyleController = this.layoutMx1;
+ this.txt_createBy.TabIndex = 228;
+ this.txt_createBy.Tag = "readonly";
//
- // txt_checkUserName
+ // txt_checkBy
//
- this.txt_checkUserName.Location = new System.Drawing.Point(443, 81);
- this.txt_checkUserName.Margin = new System.Windows.Forms.Padding(4);
- this.txt_checkUserName.Name = "txt_checkUserName";
- this.txt_checkUserName.Size = new System.Drawing.Size(259, 28);
- this.txt_checkUserName.StyleController = this.layoutMx1;
- this.txt_checkUserName.TabIndex = 247;
- this.txt_checkUserName.Tag = "readonly";
+ this.txt_checkBy.Location = new System.Drawing.Point(443, 81);
+ this.txt_checkBy.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_checkBy.Name = "txt_checkBy";
+ this.txt_checkBy.Size = new System.Drawing.Size(259, 28);
+ this.txt_checkBy.StyleController = this.layoutMx1;
+ this.txt_checkBy.TabIndex = 247;
+ this.txt_checkBy.Tag = "readonly";
//
// txt_checkDate
//
@@ -752,7 +752,7 @@
//
// layoutControlItem7
//
- this.layoutControlItem7.Control = this.txt_checkUserName;
+ this.layoutControlItem7.Control = this.txt_checkBy;
this.layoutControlItem7.Location = new System.Drawing.Point(347, 69);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
@@ -774,7 +774,7 @@
//
// layoutControlItem5
//
- this.layoutControlItem5.Control = this.txt_createByName;
+ this.layoutControlItem5.Control = this.txt_createBy;
this.layoutControlItem5.Location = new System.Drawing.Point(1041, 69);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -825,8 +825,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).EndInit();
@@ -870,12 +870,12 @@
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraEditors.TextEdit txt_createByName;
+ private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.Utils.ToolTipController tips;
- private DevExpress.XtraEditors.TextEdit txt_checkUserName;
+ private DevExpress.XtraEditors.TextEdit txt_checkBy;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
private System.Windows.Forms.PictureBox picCheckBox;
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.Designer.cs
index d4870a9..5936633 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJjgzSchedule.Designer.cs
@@ -63,7 +63,7 @@
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_createByName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
this.txt_Guid = new DevExpress.XtraEditors.TextEdit();
this.txt_BeginTime = new DevExpress.XtraEditors.DateEdit();
@@ -113,7 +113,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_BeginTime.Properties)).BeginInit();
@@ -254,12 +254,12 @@
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "寤虹珛鑰�";
- this.gv_createBy.FieldName = "createByName";
+ this.gv_createBy.FieldName = "createBy";
this.gv_createBy.MinWidth = 62;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.OptionsColumn.ReadOnly = true;
- this.gv_createBy.Tag = "cj.USER_NAME";
+ this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 1;
this.gv_createBy.Width = 100;
@@ -460,7 +460,7 @@
//
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_createDate);
- this.layoutMx1.Controls.Add(this.txt_createByName);
+ this.layoutMx1.Controls.Add(this.txt_createBy);
this.layoutMx1.Controls.Add(this.txt_checkStatus);
this.layoutMx1.Controls.Add(this.txt_Guid);
this.layoutMx1.Controls.Add(this.txt_BeginTime);
@@ -506,16 +506,16 @@
this.txt_createDate.TabIndex = 231;
this.txt_createDate.Tag = "readonly";
//
- // txt_createByName
+ // txt_createBy
//
- this.txt_createByName.Location = new System.Drawing.Point(1173, 99);
- this.txt_createByName.Margin = new System.Windows.Forms.Padding(4);
- this.txt_createByName.Name = "txt_createByName";
- this.txt_createByName.Properties.Appearance.Options.UseFont = true;
- this.txt_createByName.Size = new System.Drawing.Size(223, 28);
- this.txt_createByName.StyleController = this.layoutMx1;
- this.txt_createByName.TabIndex = 228;
- this.txt_createByName.Tag = "readonly";
+ this.txt_createBy.Location = new System.Drawing.Point(1173, 99);
+ this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_createBy.Name = "txt_createBy";
+ this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+ this.txt_createBy.Size = new System.Drawing.Size(223, 28);
+ this.txt_createBy.StyleController = this.layoutMx1;
+ this.txt_createBy.TabIndex = 228;
+ this.txt_createBy.Tag = "readonly";
//
// txt_checkStatus
//
@@ -779,7 +779,7 @@
//
// layoutControlItem5
//
- this.layoutControlItem5.Control = this.txt_createByName;
+ this.layoutControlItem5.Control = this.txt_createBy;
this.layoutControlItem5.Location = new System.Drawing.Point(1041, 87);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -943,7 +943,7 @@
this.Controls.Add(this.toolBarMenu1);
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Frm_MesJjgzSchedule";
- this.Text = "鎺掔彮绠＄悊";
+ this.Text = "璁′欢鍗曚环";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
@@ -963,7 +963,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_BeginTime.Properties.CalendarTimeProperties)).EndInit();
@@ -1011,7 +1011,7 @@
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraEditors.TextEdit txt_createByName;
+ private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.Designer.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.Designer.cs
index e462969..daa5390 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesTimeType.Designer.cs
@@ -52,8 +52,8 @@
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
- this.txt_createByName = new DevExpress.XtraEditors.TextEdit();
- this.txt_checkUserName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_checkStatus = new DevExpress.XtraEditors.CheckEdit();
this.txt_Name = new DevExpress.XtraEditors.TextEdit();
@@ -88,8 +88,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_Name.Properties)).BeginInit();
@@ -202,7 +202,7 @@
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "寤虹珛鑰�";
- this.gv_createBy.FieldName = "createByName";
+ this.gv_createBy.FieldName = "createBy";
this.gv_createBy.MinWidth = 62;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
@@ -283,8 +283,8 @@
//
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_createDate);
- this.layoutMx1.Controls.Add(this.txt_createByName);
- this.layoutMx1.Controls.Add(this.txt_checkUserName);
+ this.layoutMx1.Controls.Add(this.txt_createBy);
+ this.layoutMx1.Controls.Add(this.txt_checkBy);
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_checkStatus);
this.layoutMx1.Controls.Add(this.txt_Name);
@@ -322,26 +322,26 @@
this.txt_createDate.TabIndex = 231;
this.txt_createDate.Tag = "readonly";
//
- // txt_createByName
+ // txt_createBy
//
- this.txt_createByName.Location = new System.Drawing.Point(790, 12);
- this.txt_createByName.Margin = new System.Windows.Forms.Padding(4);
- this.txt_createByName.Name = "txt_createByName";
- this.txt_createByName.Properties.Appearance.Options.UseFont = true;
- this.txt_createByName.Size = new System.Drawing.Size(259, 28);
- this.txt_createByName.StyleController = this.layoutMx1;
- this.txt_createByName.TabIndex = 228;
- this.txt_createByName.Tag = "readonly";
+ this.txt_createBy.Location = new System.Drawing.Point(790, 12);
+ this.txt_createBy.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_createBy.Name = "txt_createBy";
+ this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+ this.txt_createBy.Size = new System.Drawing.Size(259, 28);
+ this.txt_createBy.StyleController = this.layoutMx1;
+ this.txt_createBy.TabIndex = 228;
+ this.txt_createBy.Tag = "readonly";
//
- // txt_checkUserName
+ // txt_checkBy
//
- this.txt_checkUserName.Location = new System.Drawing.Point(1137, 12);
- this.txt_checkUserName.Margin = new System.Windows.Forms.Padding(4);
- this.txt_checkUserName.Name = "txt_checkUserName";
- this.txt_checkUserName.Size = new System.Drawing.Size(259, 28);
- this.txt_checkUserName.StyleController = this.layoutMx1;
- this.txt_checkUserName.TabIndex = 247;
- this.txt_checkUserName.Tag = "readonly";
+ this.txt_checkBy.Location = new System.Drawing.Point(1137, 12);
+ this.txt_checkBy.Margin = new System.Windows.Forms.Padding(4);
+ this.txt_checkBy.Name = "txt_checkBy";
+ this.txt_checkBy.Size = new System.Drawing.Size(259, 28);
+ this.txt_checkBy.StyleController = this.layoutMx1;
+ this.txt_checkBy.TabIndex = 247;
+ this.txt_checkBy.Tag = "readonly";
//
// txt_checkDate
//
@@ -441,7 +441,7 @@
//
// layoutControlItem7
//
- this.layoutControlItem7.Control = this.txt_checkUserName;
+ this.layoutControlItem7.Control = this.txt_checkBy;
this.layoutControlItem7.Location = new System.Drawing.Point(1041, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -462,7 +462,7 @@
//
// layoutControlItem5
//
- this.layoutControlItem5.Control = this.txt_createByName;
+ this.layoutControlItem5.Control = this.txt_createBy;
this.layoutControlItem5.Location = new System.Drawing.Point(694, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -558,8 +558,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkStatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_Name.Properties)).EndInit();
@@ -590,12 +590,12 @@
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_createDate;
- private DevExpress.XtraEditors.TextEdit txt_createByName;
+ private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.Utils.ToolTipController tips;
- private DevExpress.XtraEditors.TextEdit txt_checkUserName;
+ private DevExpress.XtraEditors.TextEdit txt_checkBy;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
private DevExpress.XtraEditors.CheckEdit txt_checkStatus;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index ea2c3d2..b3463fe 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -1,5 +1,4 @@
using Gs.DevApp.DevFrm.QC;
-using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -432,39 +431,6 @@
/// <exception cref="NotImplementedException"></exception>
private void ToolBarMenu1_btnOutClick(object sender, EventArgs e)
{
-
- var frm = new SelOutType();
- var type = 0;
- //璧嬪�肩粰鏄庣粏琛�
- frm.UpdateParent += (ss, ee) =>
- {
- var lst = new List<string>();
- lst = ee.StringList;
- if (!string.IsNullOrEmpty(lst[0]))
- {
- if(lst[0] == "鍒楄〃瀵煎嚭")
- {
- type = 1;
- }
- else if (lst[0] == "鏄庣粏瀵煎嚭")
- {
- type = 2;
- }
- }
- };
- frm.ShowDialog();
- if(type == 1)
- {
- LstOutput();
- }
- if(type == 2)
- {
- MxOutput();
- }
- }
-
- private void MxOutput()
- {
string rowGuid = "", rowName = "";
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
lbGuid, txt_releaseNo, gridView1, "releaseNo");
@@ -510,54 +476,6 @@
catch (Exception ex)
{
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
- }
- }
- }
- }
-
- private void LstOutput()
- {
- using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
- {
- folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
- DialogResult dialogResult = folderBrowserDialog.ShowDialog();
- System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
- _sbSqlWhere.Append(" and a.ReceiveOrgId in");
- _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
- _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
- if (dialogResult == DialogResult.OK)
- {
- string _folder = folderBrowserDialog.SelectedPath;
- var _params = new
- {
- inSortName = "",
- inSortOrder = "",
- inQueryWhere = _sbSqlWhere.ToString()
- };
- var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOut_iqcdetect01lst", "", "", "", _params);
- try
- {
- string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView_NEW", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- string _file = _rtn.rtnData.fileUrl.ToString();
- string _folderName = _folder + "\\" + _file.Replace("down/", "");
- string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
- using (WebClient client = new WebClient())
- {
- client.DownloadFile(_url, _folderName);
- }
- ToolBox.MsgHelper.ShowInformation("瀵煎嚭鎴愬姛锛�");
- }
- else
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDtByLeiBie.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDtByLeiBie.Designer.cs
new file mode 100644
index 0000000..0de025b
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDtByLeiBie.Designer.cs
@@ -0,0 +1,59 @@
+锘縩amespace Gs.DevApp.DevFrm.QC
+{
+ partial class Frm_MesQmCheckitemDtByLeiBie
+ {
+ /// <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.jyxm1 = new QC.JyxmByLeiBie("澶х被iqc");
+ this.SuspendLayout();
+ //
+ // jyxm1
+ //
+ this.jyxm1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.jyxm1.Location = new System.Drawing.Point(0, 0);
+ this.jyxm1.Name = "jyxm1";
+ this.jyxm1.Size = new System.Drawing.Size(1044, 711);
+ this.jyxm1.TabIndex = 0;
+
+ //
+ // Frm_MesQmCheckitemDtByLeiBie
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1044, 711);
+ this.Controls.Add(this.jyxm1);
+ this.Name = "Frm_MesQmCheckitemDtByLeiBie";
+ this.Text = "iqc鐗╂枡绫诲瀷妫�楠岄」鐩�";
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private QC.JyxmByLeiBie jyxm1;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDtByLeiBie.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDtByLeiBie.cs
new file mode 100644
index 0000000..42eff15
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDtByLeiBie.cs
@@ -0,0 +1,23 @@
+锘縰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.QC
+{
+ public partial class Frm_MesQmCheckitemDtByLeiBie : DevExpress.XtraEditors.XtraForm
+ {
+ public Frm_MesQmCheckitemDtByLeiBie()
+ {
+ InitializeComponent();
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDtByLeiBie.resx b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDtByLeiBie.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDtByLeiBie.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmByLeiBie.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmByLeiBie.Designer.cs
new file mode 100644
index 0000000..c5f6b8e
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmByLeiBie.Designer.cs
@@ -0,0 +1,1265 @@
+锘縩amespace Gs.DevApp.DevFrm.QC
+{
+ partial class JyxmByLeiBie
+ {
+ /// <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();
+ 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.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();
+ this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_isenabled = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_foneChecked = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_foneCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_foneCheckdate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx1 = new DevExpress.XtraDataLayout.DataLayoutControl();
+ this.lbGuid = new System.Windows.Forms.Label();
+ this.txt_foneCheckdate = new DevExpress.XtraEditors.TextEdit();
+ this.txt_foneCheckor = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_memo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_foneChecked = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_ftype = new DevExpress.XtraEditors.TextEdit();
+ this.txt_isenabled = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_itemId = new DevExpress.XtraEditors.ButtonEdit();
+ this.txt_mc = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.tabMx = new DevExpress.XtraTab.XtraTabControl();
+ this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fcheckItem = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptJYXM = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gvMx1forder = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptShunXui = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fcheckTool = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptJYGJ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.sampleSizeName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptJYSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptJSSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gvMx1fupAllow = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fstand = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx1fdownAllow = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptStation = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.rptGroup = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+ this.split1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+ this.split1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ this.xtraTabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+ this.splitMx1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+ this.splitMx1.Panel2.SuspendLayout();
+ this.splitMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+ this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckdate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckor.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ftype.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mc.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
+ this.tabMx.SuspendLayout();
+ this.tabMxPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptShunXui)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptStation)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptGroup)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ this.SuspendLayout();
+ //
+ // toolBarMenu1
+ //
+ this.toolBarMenu1.chkParameter = " 0,0,0,0,000chk_mes_CHECKITEM";
+ this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
+ this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.toolBarMenu1.guidKey = null;
+ this.toolBarMenu1.isSetBtn = false;
+ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4);
+ this.toolBarMenu1.Name = "toolBarMenu1";
+ this.toolBarMenu1.rptParameter = null;
+ this.toolBarMenu1.Size = new System.Drawing.Size(1129, 80);
+ this.toolBarMenu1.TabIndex = 0;
+ this.toolBarMenu1.xlsInService = null;
+ this.toolBarMenu1.xlsOutParameter = null;
+ //
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(1129, 602);
+ this.xtraTabControl1.TabIndex = 3;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1,
+ this.xtraTabPage2});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1127, 570);
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+ //
+ // split1
+ //
+ this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+ this.split1.Horizontal = false;
+ this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Name = "split1";
+ //
+ // split1.Panel1
+ //
+ this.split1.Panel1.Controls.Add(this.gcMain1);
+ this.split1.Panel1.Controls.Add(this.pageBar1);
+ this.split1.Panel1.Text = "Panel1";
+ //
+ // split1.Panel2
+ //
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Size = new System.Drawing.Size(1127, 570);
+ this.split1.SplitterPosition = 0;
+ this.split1.TabIndex = 0;
+ //
+ // 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";
+ this.gcMain1.Size = new System.Drawing.Size(1127, 519);
+ this.gcMain1.TabIndex = 2;
+ this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ 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.ColumnPanelRowHeight = 50;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_isenabled,
+ this.gv_foneChecked,
+ this.gridColumn7,
+ this.gv_itemNo,
+ this.gridColumn3,
+ this.gv_foneCheckor,
+ this.gv_foneCheckdate,
+ this.gridColumn1,
+ this.gridColumn4,
+ this.gv_memo,
+ this.gridColumn16,
+ this.gridColumn18});
+ this.gridView1.GridControl = this.gcMain1;
+ this.gridView1.IndicatorWidth = 50;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_isenabled
+ //
+ this.gv_isenabled.AppearanceCell.Options.UseFont = true;
+ this.gv_isenabled.Caption = "鏄惁鍙敤";
+ this.gv_isenabled.FieldName = "isenabled";
+ this.gv_isenabled.MaxWidth = 50;
+ this.gv_isenabled.MinWidth = 50;
+ this.gv_isenabled.Name = "gv_isenabled";
+ this.gv_isenabled.OptionsColumn.AllowEdit = false;
+ this.gv_isenabled.Tag = "query_a.ISENABLED";
+ this.gv_isenabled.UnboundDataType = typeof(bool);
+ this.gv_isenabled.Width = 50;
+ //
+ // gv_foneChecked
+ //
+ this.gv_foneChecked.AppearanceCell.Options.UseFont = true;
+ this.gv_foneChecked.Caption = "瀹℃牳鏍囪";
+ this.gv_foneChecked.FieldName = "foneChecked";
+ this.gv_foneChecked.MaxWidth = 50;
+ this.gv_foneChecked.MinWidth = 50;
+ this.gv_foneChecked.Name = "gv_foneChecked";
+ this.gv_foneChecked.OptionsColumn.AllowEdit = false;
+ this.gv_foneChecked.Tag = "query_a.FONE_CHECKED";
+ this.gv_foneChecked.UnboundDataType = typeof(bool);
+ this.gv_foneChecked.Visible = true;
+ this.gv_foneChecked.VisibleIndex = 0;
+ this.gv_foneChecked.Width = 50;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "绫诲埆ID";
+ this.gridColumn7.FieldName = "itemId";
+ this.gridColumn7.MinWidth = 50;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.OptionsColumn.AllowEdit = false;
+ this.gridColumn7.Tag = "query_a.ITEM_ID";
+ this.gridColumn7.Width = 94;
+ //
+ // gv_itemNo
+ //
+ this.gv_itemNo.AppearanceCell.Options.UseFont = true;
+ this.gv_itemNo.Caption = "绫诲埆缂栫爜";
+ this.gv_itemNo.FieldName = "itemNo";
+ this.gv_itemNo.MinWidth = 50;
+ this.gv_itemNo.Name = "gv_itemNo";
+ this.gv_itemNo.OptionsColumn.AllowEdit = false;
+ this.gv_itemNo.Tag = "query_b.item_no";
+ this.gv_itemNo.Visible = true;
+ this.gv_itemNo.VisibleIndex = 1;
+ this.gv_itemNo.Width = 150;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "绫诲埆鍚嶇О";
+ this.gridColumn3.FieldName = "mc";
+ this.gridColumn3.MinWidth = 50;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.OptionsColumn.AllowEdit = false;
+ this.gridColumn3.Tag = "query_b.item_name";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 2;
+ this.gridColumn3.Width = 250;
+ //
+ // gv_foneCheckor
+ //
+ this.gv_foneCheckor.AppearanceCell.Options.UseFont = true;
+ this.gv_foneCheckor.Caption = "瀹℃牳浜�";
+ this.gv_foneCheckor.FieldName = "foneCheckor";
+ this.gv_foneCheckor.MinWidth = 50;
+ this.gv_foneCheckor.Name = "gv_foneCheckor";
+ this.gv_foneCheckor.OptionsColumn.AllowEdit = false;
+ this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR";
+ this.gv_foneCheckor.Visible = true;
+ this.gv_foneCheckor.VisibleIndex = 3;
+ this.gv_foneCheckor.Width = 94;
+ //
+ // gv_foneCheckdate
+ //
+ this.gv_foneCheckdate.AppearanceCell.Options.UseFont = true;
+ this.gv_foneCheckdate.Caption = "瀹℃牳鏃堕棿";
+ this.gv_foneCheckdate.FieldName = "foneCheckdate";
+ this.gv_foneCheckdate.MinWidth = 50;
+ this.gv_foneCheckdate.Name = "gv_foneCheckdate";
+ this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
+ this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE";
+ this.gv_foneCheckdate.Visible = true;
+ this.gv_foneCheckdate.VisibleIndex = 4;
+ this.gv_foneCheckdate.Width = 120;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鍒朵綔浜�";
+ this.gridColumn1.FieldName = "createBy";
+ this.gridColumn1.MinWidth = 50;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.OptionsColumn.AllowEdit = false;
+ this.gridColumn1.Tag = "query_a.CREATE_BY";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 5;
+ this.gridColumn1.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鍒朵綔鏃堕棿";
+ this.gridColumn4.FieldName = "createDate";
+ this.gridColumn4.MinWidth = 50;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.AllowEdit = false;
+ this.gridColumn4.Tag = "query_a.CREATE_DATE";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 6;
+ this.gridColumn4.Width = 180;
+ //
+ // gv_memo
+ //
+ this.gv_memo.AppearanceCell.Options.UseFont = true;
+ this.gv_memo.Caption = "澶囨敞";
+ this.gv_memo.FieldName = "memo";
+ this.gv_memo.MinWidth = 50;
+ this.gv_memo.Name = "gv_memo";
+ this.gv_memo.OptionsColumn.AllowEdit = false;
+ this.gv_memo.Tag = "query_a.MEMO";
+ this.gv_memo.Visible = true;
+ this.gv_memo.VisibleIndex = 7;
+ this.gv_memo.Width = 150;
+ //
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "涓婚敭GUID";
+ this.gridColumn16.FieldName = "guid";
+ this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Width = 94;
+ //
+ // gridColumn18
+ //
+ this.gridColumn18.Caption = "绫诲埆";
+ this.gridColumn18.FieldName = "ftype";
+ this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Visible = true;
+ this.gridColumn18.VisibleIndex = 8;
+ this.gridColumn18.Width = 94;
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.Size = new System.Drawing.Size(1127, 39);
+ this.pageBar1.TabIndex = 4;
+ this.pageBar1.TotalPages = 0;
+ //
+ // xtraTabPage2
+ //
+ this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.Size = new System.Drawing.Size(1127, 570);
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+ //
+ // splitMx1
+ //
+ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitMx1.Horizontal = false;
+ this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Name = "splitMx1";
+ //
+ // splitMx1.Panel1
+ //
+ this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+ this.splitMx1.Panel1.Text = "Panel1";
+ //
+ // splitMx1.Panel2
+ //
+ this.splitMx1.Panel2.Controls.Add(this.tabMx);
+ this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Size = new System.Drawing.Size(1127, 570);
+ this.splitMx1.SplitterPosition = 113;
+ this.splitMx1.TabIndex = 0;
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.lbGuid);
+ this.layoutMx1.Controls.Add(this.txt_foneCheckdate);
+ this.layoutMx1.Controls.Add(this.txt_foneCheckor);
+ this.layoutMx1.Controls.Add(this.txt_itemNo);
+ this.layoutMx1.Controls.Add(this.txt_memo);
+ this.layoutMx1.Controls.Add(this.txt_foneChecked);
+ this.layoutMx1.Controls.Add(this.txt_ftype);
+ this.layoutMx1.Controls.Add(this.txt_isenabled);
+ this.layoutMx1.Controls.Add(this.txt_itemId);
+ this.layoutMx1.Controls.Add(this.txt_mc);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem13});
+ this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Name = "layoutMx1";
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(599, 447, 812, 500);
+ this.layoutMx1.Root = this.Root;
+ this.layoutMx1.Size = new System.Drawing.Size(1127, 113);
+ this.layoutMx1.TabIndex = 0;
+ this.layoutMx1.Text = "dataLayoutControl1";
+ //
+ // lbGuid
+ //
+ this.lbGuid.Location = new System.Drawing.Point(825, 102);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(269, 28);
+ this.lbGuid.TabIndex = 387;
+ this.lbGuid.Text = "label1";
+ //
+ // txt_foneCheckdate
+ //
+ this.txt_foneCheckdate.Location = new System.Drawing.Point(914, 43);
+ this.txt_foneCheckdate.Name = "txt_foneCheckdate";
+ this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
+ this.txt_foneCheckdate.Size = new System.Drawing.Size(201, 24);
+ this.txt_foneCheckdate.StyleController = this.layoutMx1;
+ this.txt_foneCheckdate.TabIndex = 267;
+ this.txt_foneCheckdate.Tag = "readOnly";
+ //
+ // txt_foneCheckor
+ //
+ this.txt_foneCheckor.Location = new System.Drawing.Point(914, 12);
+ this.txt_foneCheckor.Name = "txt_foneCheckor";
+ this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
+ this.txt_foneCheckor.Size = new System.Drawing.Size(201, 24);
+ this.txt_foneCheckor.StyleController = this.layoutMx1;
+ this.txt_foneCheckor.TabIndex = 262;
+ this.txt_foneCheckor.Tag = "readOnly";
+ //
+ // txt_itemNo
+ //
+ this.txt_itemNo.Location = new System.Drawing.Point(360, 12);
+ this.txt_itemNo.Name = "txt_itemNo";
+ this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
+ this.txt_itemNo.Size = new System.Drawing.Size(201, 24);
+ this.txt_itemNo.StyleController = this.layoutMx1;
+ this.txt_itemNo.TabIndex = 370;
+ this.txt_itemNo.Tag = "readOnly";
+ //
+ // txt_memo
+ //
+ this.txt_memo.Location = new System.Drawing.Point(84, 74);
+ this.txt_memo.Name = "txt_memo";
+ this.txt_memo.Properties.Appearance.Options.UseFont = true;
+ this.txt_memo.Size = new System.Drawing.Size(200, 24);
+ this.txt_memo.StyleController = this.layoutMx1;
+ this.txt_memo.TabIndex = 219;
+ //
+ // txt_foneChecked
+ //
+ this.txt_foneChecked.Location = new System.Drawing.Point(565, 43);
+ this.txt_foneChecked.Name = "txt_foneChecked";
+ this.txt_foneChecked.Properties.Caption = "瀹℃牳鏍囪瘑";
+ this.txt_foneChecked.Size = new System.Drawing.Size(273, 24);
+ this.txt_foneChecked.StyleController = this.layoutMx1;
+ this.txt_foneChecked.TabIndex = 386;
+ this.txt_foneChecked.Tag = "readOnly";
+ //
+ // txt_ftype
+ //
+ this.txt_ftype.Location = new System.Drawing.Point(637, 12);
+ this.txt_ftype.Name = "txt_ftype";
+ this.txt_ftype.Size = new System.Drawing.Size(201, 24);
+ this.txt_ftype.StyleController = this.layoutMx1;
+ this.txt_ftype.TabIndex = 389;
+ this.txt_ftype.Tag = "readOnly";
+ //
+ // txt_isenabled
+ //
+ this.txt_isenabled.Location = new System.Drawing.Point(288, 43);
+ this.txt_isenabled.Name = "txt_isenabled";
+ this.txt_isenabled.Properties.Caption = "鍙敤鏍囪瘑";
+ this.txt_isenabled.Size = new System.Drawing.Size(273, 24);
+ this.txt_isenabled.StyleController = this.layoutMx1;
+ this.txt_isenabled.TabIndex = 390;
+ this.txt_isenabled.Tag = "readOnly";
+ //
+ // txt_itemId
+ //
+ this.txt_itemId.Location = new System.Drawing.Point(84, 12);
+ this.txt_itemId.Name = "txt_itemId";
+ this.txt_itemId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.txt_itemId.Properties.ReadOnly = true;
+ this.txt_itemId.Size = new System.Drawing.Size(200, 24);
+ this.txt_itemId.StyleController = this.layoutMx1;
+ this.txt_itemId.TabIndex = 391;
+ //
+ // txt_mc
+ //
+ this.txt_mc.Location = new System.Drawing.Point(84, 43);
+ this.txt_mc.Name = "txt_mc";
+ this.txt_mc.Size = new System.Drawing.Size(200, 24);
+ this.txt_mc.StyleController = this.layoutMx1;
+ this.txt_mc.TabIndex = 392;
+ this.txt_mc.Tag = "readOnly";
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.lbGuid;
+ this.layoutControlItem13.Location = new System.Drawing.Point(813, 96);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem13.Size = new System.Drawing.Size(273, 32);
+ this.layoutControlItem13.Text = "lbGuid";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem13.TextVisible = false;
+ //
+ // Root
+ //
+ this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.Root.GroupBordersVisible = false;
+ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem10,
+ this.layoutControlItem11,
+ this.layoutControlItem3,
+ this.layoutControlItem7,
+ this.layoutControlItem1,
+ this.layoutControlItem4,
+ this.layoutControlItem2,
+ this.layoutControlItem5,
+ this.layoutControlItem12});
+ this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.Root.Name = "Root";
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
+ this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3});
+ this.Root.Size = new System.Drawing.Size(1127, 113);
+ this.Root.TextVisible = false;
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_foneCheckor;
+ this.layoutControlItem10.Location = new System.Drawing.Point(830, 0);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem10.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem10.Text = "瀹℃牳浜哄憳";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_foneCheckdate;
+ this.layoutControlItem11.Location = new System.Drawing.Point(830, 31);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem11.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem11.Text = "瀹℃牳鏃堕棿";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_ftype;
+ this.layoutControlItem3.Location = new System.Drawing.Point(553, 0);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem3.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem3.Text = "椤圭洰鍒嗙被";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_itemNo;
+ this.layoutControlItem7.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem7.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem7.Text = "绫诲瀷缂栫爜";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_itemId;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem1.Text = "閫夋嫨绫诲埆";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_mc;
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem4.Text = "绫诲瀷鍚嶇О";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_memo;
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem2.Text = "澶囨敞";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_isenabled;
+ this.layoutControlItem5.Location = new System.Drawing.Point(276, 31);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem5.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem5.Text = "鍙敤鏍囪瘑";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem5.TextVisible = false;
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_foneChecked;
+ this.layoutControlItem12.Location = new System.Drawing.Point(553, 31);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem12.Size = new System.Drawing.Size(277, 31);
+ this.layoutControlItem12.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem12.TextVisible = false;
+ //
+ // tabMx
+ //
+ this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.tabMx.Location = new System.Drawing.Point(0, 0);
+ this.tabMx.Name = "tabMx";
+ this.tabMx.SelectedTabPage = this.tabMxPage1;
+ this.tabMx.Size = new System.Drawing.Size(1127, 445);
+ this.tabMx.TabIndex = 3;
+ this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.tabMxPage1});
+ //
+ // tabMxPage1
+ //
+ this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Name = "tabMxPage1";
+ this.tabMxPage1.Size = new System.Drawing.Size(1125, 413);
+ this.tabMxPage1.Text = "妫�楠岄」鐩槑缁�";
+ //
+ // gcMx1
+ //
+ this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.Location = new System.Drawing.Point(0, 0);
+ this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Name = "gcMx1";
+ this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.rptJYXM,
+ this.rptJYGJ,
+ this.rptJYBZ,
+ this.rptJSSP,
+ this.rptJYSP,
+ this.repositoryItemButtonEdit1,
+ this.rptShunXui,
+ this.rptStation,
+ this.repositoryItemCheckEdit1,
+ this.rptGroup});
+ this.gcMx1.Size = new System.Drawing.Size(1125, 413);
+ this.gcMx1.TabIndex = 0;
+ this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx1});
+ //
+ // gvMx1
+ //
+ this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gvMx1guid,
+ this.gvMx1pid,
+ this.gvMx1fcheckItem,
+ this.gvMx1forder,
+ this.gridColumn5,
+ this.gvMx1memo,
+ this.gvMx1fcheckTool,
+ this.gvMx1sampleSizeNo,
+ this.sampleSizeName,
+ this.gvMx1fcheckLevel,
+ this.gvMx1facLevel,
+ this.gvMx1fupAllow,
+ this.gvMx1fstand,
+ this.gvMx1fdownAllow,
+ this.gridColumn19,
+ this.gvMxDel,
+ this.gridColumn11,
+ this.gridColumn6,
+ this.gridColumn9,
+ this.gridColumn10});
+ this.gvMx1.GridControl = this.gcMx1;
+ this.gvMx1.Name = "gvMx1";
+ this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
+ this.gvMx1.OptionsView.ShowGroupPanel = false;
+ //
+ // gvMx1guid
+ //
+ this.gvMx1guid.AppearanceCell.Options.UseFont = true;
+ this.gvMx1guid.Caption = "瀛愯〃涓婚敭GUID";
+ this.gvMx1guid.FieldName = "guid";
+ this.gvMx1guid.Name = "gvMx1guid";
+ this.gvMx1guid.OptionsColumn.ReadOnly = true;
+ this.gvMx1guid.Tag = "query_a.guid";
+ this.gvMx1guid.Width = 94;
+ //
+ // gvMx1pid
+ //
+ this.gvMx1pid.AppearanceCell.Options.UseFont = true;
+ this.gvMx1pid.Caption = "涓昏〃涓婚敭GUID";
+ this.gvMx1pid.FieldName = "pid";
+ this.gvMx1pid.Name = "gvMx1pid";
+ this.gvMx1pid.OptionsColumn.ReadOnly = true;
+ this.gvMx1pid.Tag = "query_a.pid";
+ this.gvMx1pid.Width = 94;
+ //
+ // gvMx1fcheckItem
+ //
+ this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
+ this.gvMx1fcheckItem.ColumnEdit = this.rptJYXM;
+ this.gvMx1fcheckItem.FieldName = "fcheckItem";
+ this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
+ this.gvMx1fcheckItem.Tag = "edit";
+ this.gvMx1fcheckItem.Visible = true;
+ this.gvMx1fcheckItem.VisibleIndex = 1;
+ this.gvMx1fcheckItem.Width = 150;
+ //
+ // rptJYXM
+ //
+ this.rptJYXM.AutoHeight = false;
+ this.rptJYXM.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptJYXM.Name = "rptJYXM";
+ //
+ // gvMx1forder
+ //
+ this.gvMx1forder.AppearanceCell.Options.UseFont = true;
+ this.gvMx1forder.Caption = "椤哄簭";
+ this.gvMx1forder.ColumnEdit = this.rptShunXui;
+ this.gvMx1forder.FieldName = "forder";
+ this.gvMx1forder.Name = "gvMx1forder";
+ this.gvMx1forder.Tag = "yz_quantity_0_edit";
+ this.gvMx1forder.Visible = true;
+ this.gvMx1forder.VisibleIndex = 0;
+ this.gvMx1forder.Width = 50;
+ //
+ // rptShunXui
+ //
+ this.rptShunXui.AutoHeight = false;
+ this.rptShunXui.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptShunXui.Items.AddRange(new object[] {
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+ "11",
+ "12",
+ "13",
+ "14",
+ "15"});
+ this.rptShunXui.Name = "rptShunXui";
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "瑙勬牸瑕佹眰";
+ this.gridColumn5.FieldName = "fspecRequ";
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Tag = "edit";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 2;
+ this.gridColumn5.Width = 150;
+ //
+ // gvMx1memo
+ //
+ this.gvMx1memo.AppearanceCell.Options.UseFont = true;
+ this.gvMx1memo.Caption = "妫�楠岄」鐩弿杩�";
+ this.gvMx1memo.FieldName = "memo";
+ this.gvMx1memo.Name = "gvMx1memo";
+ this.gvMx1memo.Tag = "edit";
+ this.gvMx1memo.Width = 150;
+ //
+ // gvMx1fcheckTool
+ //
+ this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
+ this.gvMx1fcheckTool.ColumnEdit = this.rptJYGJ;
+ this.gvMx1fcheckTool.FieldName = "fcheckTool";
+ this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
+ this.gvMx1fcheckTool.Tag = "edit";
+ this.gvMx1fcheckTool.Visible = true;
+ this.gvMx1fcheckTool.VisibleIndex = 3;
+ this.gvMx1fcheckTool.Width = 150;
+ //
+ // rptJYGJ
+ //
+ this.rptJYGJ.AutoHeight = false;
+ this.rptJYGJ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptJYGJ.Name = "rptJYGJ";
+ //
+ // gvMx1sampleSizeNo
+ //
+ this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
+ this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣鍑嗗悕绉�";
+ this.gvMx1sampleSizeNo.ColumnEdit = this.rptJYBZ;
+ this.gvMx1sampleSizeNo.FieldName = "sampleSizeName";
+ this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
+ this.gvMx1sampleSizeNo.Tag = "edit";
+ this.gvMx1sampleSizeNo.Visible = true;
+ this.gvMx1sampleSizeNo.VisibleIndex = 4;
+ this.gvMx1sampleSizeNo.Width = 150;
+ //
+ // rptJYBZ
+ //
+ this.rptJYBZ.AutoHeight = false;
+ this.rptJYBZ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptJYBZ.Name = "rptJYBZ";
+ this.rptJYBZ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.rptJYBZ.EditValueChanged += new System.EventHandler(this.rptJYBZ_SelectedIndexChanged);
+ //
+ // sampleSizeName
+ //
+ this.sampleSizeName.Caption = "妫�楠屾爣鍑嗙紪鐮�";
+ this.sampleSizeName.FieldName = "sampleSizeNo";
+ this.sampleSizeName.Name = "sampleSizeName";
+ this.sampleSizeName.OptionsColumn.ReadOnly = true;
+ this.sampleSizeName.Tag = "edit";
+ this.sampleSizeName.Width = 150;
+ //
+ // gvMx1fcheckLevel
+ //
+ this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
+ this.gvMx1fcheckLevel.ColumnEdit = this.rptJYSP;
+ this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
+ this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
+ this.gvMx1fcheckLevel.Tag = "edit";
+ this.gvMx1fcheckLevel.Visible = true;
+ this.gvMx1fcheckLevel.VisibleIndex = 5;
+ this.gvMx1fcheckLevel.Width = 200;
+ //
+ // rptJYSP
+ //
+ this.rptJYSP.AutoHeight = false;
+ this.rptJYSP.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptJYSP.Name = "rptJYSP";
+ this.rptJYSP.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
+ // gvMx1facLevel
+ //
+ this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
+ this.gvMx1facLevel.Caption = "鎺ユ敹姘村钩";
+ this.gvMx1facLevel.ColumnEdit = this.rptJSSP;
+ this.gvMx1facLevel.FieldName = "facLevel";
+ this.gvMx1facLevel.Name = "gvMx1facLevel";
+ this.gvMx1facLevel.Tag = "edit";
+ this.gvMx1facLevel.Visible = true;
+ this.gvMx1facLevel.VisibleIndex = 6;
+ this.gvMx1facLevel.Width = 150;
+ //
+ // rptJSSP
+ //
+ this.rptJSSP.AutoHeight = false;
+ this.rptJSSP.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptJSSP.Name = "rptJSSP";
+ this.rptJSSP.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
+ // gvMx1fupAllow
+ //
+ this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fupAllow.Caption = "涓婇檺";
+ this.gvMx1fupAllow.FieldName = "fupAllow";
+ this.gvMx1fupAllow.Name = "gvMx1fupAllow";
+ this.gvMx1fupAllow.Tag = "yz_quantity_0_edit";
+ this.gvMx1fupAllow.Visible = true;
+ this.gvMx1fupAllow.VisibleIndex = 7;
+ this.gvMx1fupAllow.Width = 60;
+ //
+ // gvMx1fstand
+ //
+ this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fstand.Caption = "鏍囧噯鍊�";
+ this.gvMx1fstand.FieldName = "fstand";
+ this.gvMx1fstand.Name = "gvMx1fstand";
+ this.gvMx1fstand.Tag = "yz_quantity_0_edit";
+ this.gvMx1fstand.Visible = true;
+ this.gvMx1fstand.VisibleIndex = 8;
+ this.gvMx1fstand.Width = 60;
+ //
+ // gvMx1fdownAllow
+ //
+ this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
+ this.gvMx1fdownAllow.Caption = "涓嬮檺";
+ this.gvMx1fdownAllow.FieldName = "fdownAllow";
+ this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
+ this.gvMx1fdownAllow.Tag = "yz_quantity_0_edit";
+ this.gvMx1fdownAllow.Visible = true;
+ this.gvMx1fdownAllow.VisibleIndex = 9;
+ this.gvMx1fdownAllow.Width = 60;
+ //
+ // gridColumn19
+ //
+ this.gridColumn19.Caption = "鏍峰搧鍩烘暟";
+ this.gridColumn19.FieldName = "ypsl";
+ this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.Tag = "edit";
+ this.gridColumn19.Visible = true;
+ this.gridColumn19.VisibleIndex = 10;
+ this.gridColumn19.Width = 94;
+ //
+ // gvMxDel
+ //
+ this.gvMxDel.Caption = "绉婚櫎";
+ this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gvMxDel.MinWidth = 50;
+ this.gvMxDel.Name = "gvMxDel";
+ this.gvMxDel.Visible = true;
+ this.gvMxDel.VisibleIndex = 13;
+ this.gvMxDel.Width = 100;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ 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, 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);
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "鍗曚綅";
+ this.gridColumn11.FieldName = "funit";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Tag = "edit";
+ this.gridColumn11.Width = 94;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "宸ヤ綅";
+ this.gridColumn6.ColumnEdit = this.rptStation;
+ this.gridColumn6.FieldName = "stationName";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Tag = "edit";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 11;
+ this.gridColumn6.Width = 94;
+ //
+ // rptStation
+ //
+ this.rptStation.AutoHeight = false;
+ this.rptStation.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptStation.Name = "rptStation";
+ this.rptStation.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "鏄惁棣栨璁よ瘉";
+ this.gridColumn9.ColumnEdit = this.repositoryItemCheckEdit1;
+ this.gridColumn9.FieldName = "isRzxx";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Tag = "edit";
+ this.gridColumn9.UnboundDataType = typeof(bool);
+ this.gridColumn9.Width = 94;
+ //
+ // repositoryItemCheckEdit1
+ //
+ this.repositoryItemCheckEdit1.AutoHeight = false;
+ this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "鎵�灞炲ぇ绫�";
+ this.gridColumn10.ColumnEdit = this.rptGroup;
+ this.gridColumn10.FieldName = "fcheckType";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Tag = "edit";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 12;
+ this.gridColumn10.Width = 94;
+ //
+ // rptGroup
+ //
+ this.rptGroup.AutoHeight = false;
+ this.rptGroup.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.rptGroup.Name = "rptGroup";
+ //
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(945, 55);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 6;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
+ // JyxmByLeiBie
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.picCheckBox);
+ this.Controls.Add(this.xtraTabControl1);
+ this.Controls.Add(this.toolBarMenu1);
+ this.Name = "JyxmByLeiBie";
+ this.Size = new System.Drawing.Size(1129, 682);
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+ this.xtraTabControl1.ResumeLayout(false);
+ this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+ this.split1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+ this.split1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ this.xtraTabPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+ this.splitMx1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+ this.splitMx1.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+ this.splitMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+ this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckdate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckor.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ftype.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mc.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
+ this.tabMx.ResumeLayout(false);
+ this.tabMxPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptShunXui)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptStation)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.rptGroup)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+ #endregion
+ private UserControl.UcToolBarMenu toolBarMenu1;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private System.Windows.Forms.PictureBox picCheckBox;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraEditors.SplitContainerControl split1;
+ private DevExpress.XtraGrid.GridControl gcMain1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_isenabled;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_foneChecked;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_foneCheckor;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_foneCheckdate;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_memo;
+ private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+ private DevExpress.XtraDataLayout.DataLayoutControl layoutMx1;
+ private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private DevExpress.XtraEditors.TextEdit txt_itemNo;
+ private DevExpress.XtraEditors.TextEdit txt_foneCheckdate;
+ private DevExpress.XtraEditors.TextEdit txt_foneCheckor;
+ private DevExpress.XtraEditors.TextEdit txt_memo;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraEditors.CheckEdit txt_foneChecked;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraTab.XtraTabControl tabMx;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+ private DevExpress.XtraGrid.GridControl gcMx1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1pid;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1forder;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptShunXui;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItem;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYXM;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckTool;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYGJ;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1sampleSizeNo;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
+ private DevExpress.XtraGrid.Columns.GridColumn sampleSizeName;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckLevel;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYSP;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1facLevel;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJSSP;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fupAllow;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstand;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+ private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraEditors.TextEdit txt_ftype;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraEditors.CheckEdit txt_isenabled;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptStation;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
+ private DevExpress.XtraEditors.ButtonEdit txt_itemId;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraEditors.TextEdit txt_mc;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptGroup;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmByLeiBie.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmByLeiBie.cs
new file mode 100644
index 0000000..bba2670
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmByLeiBie.cs
@@ -0,0 +1,871 @@
+锘縰sing DevExpress.XtraEditors;
+using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using MES.Service.Modes;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+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.QC
+{
+ public partial class JyxmByLeiBie : DevExpress.XtraEditors.XtraUserControl
+ {
+ private List<FilterEntity> _filterList = new List<FilterEntity>();
+ private readonly string _webServiceName = "MesQmCheckitemManager/";
+ public string strType = "";//iqc type
+ public decimal dfValue = 1; //iqc鐨勬牱鍝佹暟閲忛粯璁�5锛屽惁鍒欑湅涓嬮潰
+ private string dftSsampleSizeName = "GB/T2828.1-2012/ISO";//榛樿
+ private string dftSsampleSizeNo = "GB/T2828.1-2012/ISO";//榛樿
+ private string dftFcheckLevel = "2.涓�鑸楠屾按骞�(II)";//榛樿妫�楠屾按骞�
+ private string dftFacLevel = "2.50---(AQL_0_250)";//榛樿鎺ユ敹姘村钩
+ public JyxmByLeiBie(string _strType)
+ {
+ InitializeComponent();
+ strType = _strType;
+ }
+ protected override void OnCreateControl()
+ {
+ base.OnCreateControl();
+ if (Parent == null) return;
+ toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
+ toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
+ toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
+ toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
+ toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.xlsInService = "XlsInItemJyxm&" + strType;
+ //绫诲瀷锛宨qc,ipqc宸℃锛宨pqc棣栨鏌�,fqc锛宨qc鐨勬牱鍝佸�奸粯璁や负5锛屽叾瀹冧负1
+ txt_ftype.Text = strType;
+ if (strType == QcSeason.iqc.ToString())
+ {
+ dfValue = 5;
+ gvMx1.Columns["funit"].Visible = true;
+ gvMx1.Columns["funit"].VisibleIndex = 13;
+ gvMx1.Columns["fcheckType"].Visible = false;
+ }
+ if (strType == QcSeason.fqc.ToString())
+ {
+ dfValue = 0;
+ gvMx1.Columns["ypsl"].Visible = false;
+ }
+ if (strType == QcSeason.ipqc棣栨.ToString())
+ {
+ dfValue = 0;
+ gvMx1.Columns["ypsl"].Visible = false;
+ }
+ //濡傛灉鏄痠pqc宸℃锛屾樉绀哄伐浣�
+ if (strType != QcSeason.ipqc宸℃.ToString())
+ {
+ gvMx1.Columns["stationName"].Visible = false;
+ gvMx1.Columns["fcheckType"].Visible = false;
+ }
+ //鏂拌鍒濆鍊�
+ this.gvMx1.InitNewRow += (s, e) =>
+ {
+ int newIndex = gvMx1.DataRowCount + 1;
+ this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue);
+ this.gvMx1.SetRowCellValue(e.RowHandle, "forder", newIndex);
+ this.gvMx1.SetRowCellValue(e.RowHandle, "sampleSizeName", dftSsampleSizeName);
+ this.gvMx1.SetRowCellValue(e.RowHandle, "sampleSizeNo", dftSsampleSizeNo);
+ this.gvMx1.SetRowCellValue(e.RowHandle, "facLevel", dftFacLevel);
+ this.gvMx1.SetRowCellValue(e.RowHandle, "fcheckLevel", dftFcheckLevel);
+ };
+ this.toolBarMenu1.getXmlConfig();
+ Form parentForm = this.FindForm();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1, tips);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, parentForm, "foneChecked", "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ }, tips);
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }, lbGuid);
+ getPageList(1);
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ _setIno();
+ btnCopy.Click += (s, e) =>
+ {
+ if ((lbGuid.Text.Trim().Length < 10))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇峰厛淇濆瓨褰撳墠淇℃伅锛�");
+ return;
+ }
+ if ((txt_foneChecked.Checked == false))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇ラ」鐩湭瀹℃牳锛屾殏涓嶈兘澶嶅埗鍒板叾瀹冪墿鏂欙紒");
+ return;
+ }
+ JyxmShowCopy frm = new JyxmShowCopy(lbGuid.Text.Trim(), strType);
+ frm.ShowDialog();
+ };
+ }
+
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ Task.Delay(100);
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage);
+ }
+
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ Form parentForm;
+ if (this.Parent is Form)
+ parentForm = this.Parent as Form;
+ else
+ parentForm = this.Parent.Parent as Form;
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
+ }
+
+ /// <summary>
+ /// 鏌ヨ鍥炶皟
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+ {
+ _filterList = e.FilterList;
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// 鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+ {
+ _toolCk(0);
+ }
+
+ /// <summary>
+ /// 瀹℃牳浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
+ {
+ _toolCk(1);
+ }
+ /// <summary>
+ /// 鍙栨秷浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
+ {
+ _toolCk(-1);
+ }
+
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ 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);
+ getPageList(this.pageBar1.CurrentPage);
+ }
+ }
+
+ /// <summary>
+ /// 淇敼浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
+ {
+ string rowGuid = "", rowName = "";
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1);
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
+ 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);
+ }
+ //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+ txt_itemId.Enabled = false;
+ }
+
+ /// <summary>
+ /// 鏂板浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
+ {
+ lbGuid.Text = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
+ var gridViews = new List<GridView>();
+ gridViews.Add(gvMx1);
+ UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
+ UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ this.txt_itemId.ReadOnly = true;
+ }
+
+ /// <summary>
+ /// 淇濆瓨浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.isSetBtn = false;
+ string _ItemId = txt_itemId.EditValue.ToString().Trim();
+ if (string.IsNullOrEmpty(_ItemId))
+ {
+ MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�");
+ txt_itemId.Focus();
+ return;
+ }
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
+ if (gvMx1.DataRowCount <= 0)
+ {
+ MsgHelper.Warning("椤圭洰鏄庣粏涓嶈兘涓虹┖锛�");
+ return;
+ }
+ try
+ {
+ var lst = new List<MesQmCheckitemDt>();
+ for (var i = 0; i < gvMx1.DataRowCount; i++)
+ {
+ var row = gvMx1.GetDataRow(i);
+ if (row != null)
+ {
+ if (string.IsNullOrEmpty(row["forder"].ToString()))
+ {
+ MsgHelper.ShowError("椤哄簭涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (string.IsNullOrEmpty(row["FcheckItem"].ToString()))
+ {
+ MsgHelper.ShowError("妫�楠岄」鐩笉鑳戒负绌猴紒");
+ return;
+ }
+ if (string.IsNullOrEmpty(row["FcheckTool"].ToString()))
+ {
+ MsgHelper.ShowError("妫�楠屽伐鍏蜂笉鑳戒负绌猴紒");
+ return;
+ }
+ if (string.IsNullOrEmpty(row["SampleSizeNo"].ToString()))
+ {
+ MsgHelper.ShowError("妫�楠屾爣鍑嗕笉鑳戒负绌猴紒");
+ return;
+ }
+ if (string.IsNullOrEmpty(row["FcheckLevel"].ToString()))
+ {
+ MsgHelper.ShowError("妫�楠屾按骞充笉鑳戒负绌猴紒");
+ return;
+ }
+ if (string.IsNullOrEmpty(row["FacLevel"].ToString()))
+ {
+ MsgHelper.ShowError("鎺ュ彈姘村钩涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (string.IsNullOrEmpty(row["ypsl"].ToString()))
+ {
+ MsgHelper.ShowError("鏍峰搧鏁伴噺涓嶈兘涓虹┖锛�");
+ return;
+ }
+ string _Fstand = row["Fstand"].ToString();
+ string _FupAllow = row["FupAllow"].ToString();
+ string _FdownAllow = row["FdownAllow"].ToString();
+ string _isRzxxTxt = row["isRzxx"].ToString();
+ bool _isRzxx = false;
+ if (_isRzxxTxt == "1" || _isRzxxTxt.ToUpper() == "true".ToUpper())
+ _isRzxx = true;
+ //鍋囧涓変釜閮戒负绌洪�氳繃
+ if (string.IsNullOrEmpty(_Fstand) && string.IsNullOrEmpty(_FupAllow) && string.IsNullOrEmpty(_FdownAllow))
+ {
+ }
+ else
+ {
+ if (!string.IsNullOrEmpty(_Fstand) && !string.IsNullOrEmpty(_FupAllow) && !string.IsNullOrEmpty(_FdownAllow))
+ {
+ decimal _Fstand_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_Fstand);
+ decimal _FupAllow_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_FupAllow);
+ decimal _FdownAllow_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_FdownAllow);
+ if (_Fstand_f >= _FdownAllow_f && _Fstand_f <= _FupAllow_f) { }
+ else
+ {
+ MsgHelper.ShowError("鏍囧噯鍊煎繀椤诲湪涓婇檺鍜屼笅闄愪箣闂达紒");
+ return;
+ }
+ }
+ else
+ {
+ MsgHelper.ShowError("璇峰～鍐欐纭殑涓婇檺锛屾爣鍑嗗�硷紝涓嬮檺锛�");
+ return;
+ }
+ }
+ lst.Add(new MesQmCheckitemDt
+ {
+ Guid = UtilityHelper.ToGuid(row["guid"].ToString()),
+ Forder = int.Parse(row["forder"].ToString()),
+ FcheckItem = row["FcheckItem"].ToString(),
+ SampleSizeNo = row["SampleSizeNo"].ToString(),
+ FcheckTool = row["FcheckTool"].ToString(),
+ FcheckLevel = row["FcheckLevel"].ToString(),
+ Fstand = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["Fstand"].ToString()),
+ FacLevel = row["FacLevel"].ToString(),
+ FspecRequ = row["FspecRequ"].ToString(),
+ Memo = row["memo"].ToString(),
+ FupAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FupAllow"].ToString()),
+ FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()),
+ ypsl = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["ypsl"].ToString()),
+ stationName = row["stationName"].ToString(),
+ FcheckType = row["FcheckType"].ToString(),
+ isRzxx = _isRzxx,
+ Funit = row["funit"].ToString(),
+ });
+ }
+ }
+ var _obj = new MesQmCheckitem
+ {
+ Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
+ ItemId = long.Parse(_ItemId),
+ Memo = txt_memo.Text.Trim(),
+ ItemNo = txt_itemNo.Text.Trim(),
+ Ftype = this.strType,
+ Fversion = 0,
+ list = lst
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "EditModel",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn =
+ UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ lbGuid.Text = _rtn.rtnData;
+ toolBarMenu1.isSetBtn = true;
+ var gridViews = new List<GridView>();
+ gridViews.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
+ toolBarMenu1.currentAction = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ }
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ gcMain1.DataSource = null;
+
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and b.guid is not null");
+ _sbSqlWhere.Append(" and a.FTYPE='" + this.strType + "'");
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,
+ "b.tcode asc,a.FVERSION desc", "", "", _sbSqlWhere.ToString());
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("",
+ _webServiceName + "GetListPageLeiBie", json);
+ var dd =
+ UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ gcMain1.DataSource = null;
+ DataTable dt = dd.rtnData.list;
+ gcMain1.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
+ private void getModel(string strGuid)
+ {
+ bool isEdit = false;
+ if (toolBarMenu1.currentAction == "add") return;
+ if (toolBarMenu1.currentAction == "edit") isEdit = true;
+ if (string.IsNullOrEmpty(strGuid))
+ {
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ var _obj = new
+ {
+ guid = strGuid //涓诲缓
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "GetModelLeiBie",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn =
+ UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ var dy = _rtn.rtnData;
+ lbGuid.Text = strGuid;
+ var gvList = new List<GridView>();
+ gvList.Add(gvMx1);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+ var _job = JObject.Parse(strJson);
+ var array = new JArray();
+ foreach (var a in _job["rtnData"]["list"]) array.Add(a);
+ var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
+ if (dt.Rows.Count > 0)
+ {
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = dt;
+ gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+ }
+ else
+ {
+ UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ }
+ }
+ else
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 宸ュ叿鏉′簨浠�
+ /// </summary>
+ /// <param name="inFieldValue"></param>
+ private void _toolCk(int _inFieldValue)
+ {
+ string strMsg = "";
+ switch (_inFieldValue)
+ {
+ case -1:
+ strMsg = "鍒犻櫎";
+ break;
+ case 0:
+ strMsg = "鍙嶅鏍�";
+ break;
+ case 1:
+ strMsg = "瀹℃牳";
+ break;
+ case 2:
+ strMsg = "鎵瑰噯";
+ break;
+ }
+ ;
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemNo");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+ return;
+ var _obj = new
+ {
+ guid = rowGuid,
+ inFieldValue = _inFieldValue,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "EditModelSubmit",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+
+ if (_inFieldValue < 0 && _rtn.rtnCode > 0)
+ {
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }
+ else
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+ }
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
+ {
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ Form parentForm = this.FindForm();
+ UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, parentForm, _inFieldValue.ToString());
+ }
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ #region 浠ヤ笅涓虹绉嶄笅鎷�
+ private void _setIno()
+ {
+ txt_itemId.ButtonClick += (s, e) =>
+ {
+ var frm = new JyxmShowByLeiBie(this.strType);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ var lst = new List<dynamic>();
+ lst = ee.DynamicList;
+ txt_itemId.Text = lst[0].itemId;
+ txt_mc.Text = lst[0].itemName;
+ txt_itemNo.Text = lst[0].itemNo;
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ };
+ frm.ShowDialog();
+ };
+ _getListJyxm();
+ _getListJygj();
+ _getListJybz();
+ _getListJssp();
+ _getListJysp();
+ _getListStation();
+ _getListGroup();
+ }
+
+ /// <summary>
+ /// 璇诲彇妫�楠岄」鐩�
+ /// </summary>
+ private void _getListJyxm()
+ {
+ var json = JsonConvert.SerializeObject("QCITEM");
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "MesSysLookupTypesManager/GetItemList", json);
+ var dd = UtilityHelper.ReturnToList(strReturn);
+ var dt = dd.rtnData;
+ foreach (DataRow dr in dt.Rows)
+ {
+ rptJYXM.Items.Add(dr["lookUpName"].ToString());
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ /// 璇诲彇妫�楠屽伐浣�
+ /// </summary>
+ private void _getListStation()
+ {
+ string _where = " and 1=1 and s_type='宸ヤ綅淇℃伅' and pid<>'00000000-0000-0000-0000-000000000000'";
+ var pgq = new PageQueryModel(1, 999999, "a.defect_name", "asc", "", _where);
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn =
+ UtilityHelper.HttpPost("", "MesDefectCodeManager/GetListPage", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = dd.rtnData.list;
+ foreach (DataRow dr in dt.Rows)
+ {
+ //tlMenu.KeyFieldName = "guid";
+ //tlMenu.ParentFieldName = "pid";
+ rptStation.Items.Add(dr["defectName"].ToString());
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ /// 璇诲彇妫�楠屽伐鍏�
+ /// </summary>
+ private void _getListJygj()
+ {
+ var json = JsonConvert.SerializeObject("QATOOLS");
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "MesSysLookupTypesManager/GetItemList", json);
+ var dd = UtilityHelper.ReturnToList(strReturn);
+ var dt = dd.rtnData;
+ foreach (DataRow dr in dt.Rows)
+ {
+ rptJYGJ.Items.Add(dr["lookUpName"].ToString());
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ /// 璇诲彇妫�楠屾爣鍑�
+ /// </summary>
+ private void _getListJybz()
+ {
+ var pgq = new PageQueryModel(1, 999999, "CREATE_DATE", "asc", "",
+ " and 1=1");
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("",
+ "MesQmAql1Manager/GetListPage", json);
+ var rtn = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = rtn.rtnData.list;
+ foreach (DataRow dr in dt.Rows)
+ {
+ rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ /// <summary>
+ /// 璇诲彇鎺ュ彈姘村钩
+ /// </summary>
+ private void _getListJssp()
+ {
+ rptJSSP.Items.AddRange(new string[] {
+ "0.010---(AQL_0_0010)"
+ ,"0.015---(AQL_0_0015)"
+ ,"0.025---(AQL_0_0025)"
+ ,"0.040---(AQL_0_0040)"
+ ,"0.065---(AQL_0_0065)"
+ ,"0.10---(AQL_0_010)"
+ ,"0.15---(AQL_0_015)"
+ ,"0.25---(AQL_0_025)"
+ ,"0.40---(AQL_0_040)"
+ ,"0.65---(AQL_0_065)"
+ ,"1.00---(AQL_0_100)"
+ ,"1.50---(AQL_0_150)"
+ ,"2.00---(AQL_0_200)"
+ ,"2.50---(AQL_0_250)"
+ ,"4.00---(AQL_0_400)"
+ ,"6.50---(AQL_0_650)"
+ ,"10.00---(AQL_1_000)"
+ });
+ }
+ /// <summary>
+ /// 璇诲彇妫�楠屾按骞�
+ /// </summary>
+ private void _getListJysp()
+ {
+ rptJYSP.Items.AddRange(new string[] {
+ "1.涓�鑸楠屾按骞�(I)"
+ , "2.涓�鑸楠屾按骞�(II)"
+ ,"3.涓�鑸楠屾按骞�(III)"
+ ,"4.鐗规畩妫�楠屾按骞�(S1)"
+ ,"5.鐗规畩妫�楠屾按骞�(S2)"
+ ,"6.鐗规畩妫�楠屾按骞�(S3)"
+ ,"7.鐗规畩妫�楠屾按骞�(S4)"
+ });
+ }
+ /// <summary>
+ /// 璇诲彇妫�楠屾按骞�
+ /// </summary>
+ private void _getListGroup()
+ {
+ rptGroup.Items.AddRange(new string[] {
+ "澶栬"
+ ,"棰滆壊"
+ ,"灏哄"
+ , "鍏抽敭閮ㄤ欢涓�鑷存��"
+ , "鍝佹按娴嬭瘯"
+ ,"鍒剁儹鎬ц兘"
+ ,"杩涙按鍘嬪姏"
+ ,"鐢垫皵鎬ц兘"
+ });
+ }
+ /// <summary>
+ /// 鍏宠仈妫�楠屾爣鍑嗗悕绉�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptJYBZ_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ ComboBoxEdit comboBox = sender as ComboBoxEdit;
+ if (comboBox != null)
+ {
+ GridView myView = (gcMx1.MainView as GridView);
+ int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
+ CboItemEntity _itm = comboBox.EditValue as CboItemEntity;
+ string _val = _itm.Value.ToString();
+ string _txt = _itm.Text.ToString();
+ gvMx1.CloseEditor();
+ gvMx1.UpdateCurrentRow();
+ gvMx1.SetRowCellValue(dataIndex, "sampleSizeNo", _val);
+ gvMx1.SetRowCellValue(dataIndex, "sampleSizeName", _txt);
+ }
+ }
+ /// <summary>
+ /// 绉诲嚭鏄庣粏
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ gvMx1.CloseEditor();
+ gvMx1.UpdateCurrentRow();
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
+ return;
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ gvMx1.DeleteRow(rowhandle);
+ return;
+ }
+ var strJson = "";
+ var lst = new List<string>();
+ lst.Add(mxGuid);
+ try
+ {
+ strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "DeleteModelMx",
+ JsonConvert.SerializeObject(lst));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ getModel(lbGuid.Text);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmByLeiBie.resx b/DevApp/Gs.DevApp/DevFrm/QC/JyxmByLeiBie.resx
new file mode 100644
index 0000000..5160e8b
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmByLeiBie.resx
@@ -0,0 +1,123 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowByLeiBie.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowByLeiBie.Designer.cs
new file mode 100644
index 0000000..0e19111
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowByLeiBie.Designer.cs
@@ -0,0 +1,210 @@
+锘縩amespace Gs.DevApp.DevFrm.QC
+{
+ partial class JyxmShowByLeiBie
+ {
+ /// <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()
+ {
+ 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.panelControl1 = new DevExpress.XtraEditors.PanelControl();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gvMain = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
+ this.panelControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // panelControl1
+ //
+ this.panelControl1.Controls.Add(this.pageBar1);
+ this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panelControl1.Location = new System.Drawing.Point(0, 686);
+ this.panelControl1.Name = "panelControl1";
+ this.panelControl1.Size = new System.Drawing.Size(642, 42);
+ this.panelControl1.TabIndex = 0;
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.pageBar1.Location = new System.Drawing.Point(2, 2);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 7, 3, 7);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.Size = new System.Drawing.Size(638, 38);
+ this.pageBar1.TabIndex = 4;
+ this.pageBar1.TotalPages = 0;
+ //
+ // gcMain
+ //
+ this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain.Location = new System.Drawing.Point(0, 0);
+ this.gcMain.MainView = this.gvMain;
+ this.gcMain.Name = "gcMain";
+ this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1});
+ this.gcMain.Size = new System.Drawing.Size(642, 686);
+ this.gcMain.TabIndex = 8;
+ this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMain});
+ //
+ // gvMain
+ //
+ this.gvMain.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gvMain.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMain.Appearance.Row.Options.UseFont = true;
+ this.gvMain.ColumnPanelRowHeight = 50;
+ this.gvMain.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_guid,
+ this.gv2,
+ this.gv_salesOrderId,
+ this.gv_orderLineId,
+ this.gridColumn2});
+ this.gvMain.GridControl = this.gcMain;
+ this.gvMain.IndicatorWidth = 50;
+ this.gvMain.Name = "gvMain";
+ this.gvMain.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMain.OptionsView.ShowAutoFilterRow = true;
+ this.gvMain.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_guid
+ //
+ this.gv_guid.AppearanceCell.Options.UseFont = true;
+ this.gv_guid.Caption = "涓婚敭涓嶈兘鍒犻櫎";
+ this.gv_guid.FieldName = "guid";
+ this.gv_guid.MinWidth = 50;
+ this.gv_guid.Name = "gv_guid";
+ this.gv_guid.OptionsColumn.AllowEdit = false;
+ this.gv_guid.Tag = "a.guid";
+ this.gv_guid.Width = 94;
+ //
+ // gv2
+ //
+ this.gv2.AppearanceCell.Options.UseFont = true;
+ this.gv2.Caption = "鐗╂枡绫诲瀷ID";
+ this.gv2.FieldName = "id";
+ this.gv2.Name = "gv2";
+ this.gv2.OptionsColumn.AllowEdit = false;
+ this.gv2.Tag = "a.id";
+ this.gv2.Visible = true;
+ this.gv2.VisibleIndex = 0;
+ this.gv2.Width = 50;
+ //
+ // gv_salesOrderId
+ //
+ this.gv_salesOrderId.AppearanceCell.Options.UseFont = true;
+ this.gv_salesOrderId.Caption = "鐗╂枡绫诲瀷缂栫爜";
+ this.gv_salesOrderId.FieldName = "itemNo";
+ this.gv_salesOrderId.Name = "gv_salesOrderId";
+ this.gv_salesOrderId.OptionsColumn.AllowEdit = false;
+ this.gv_salesOrderId.Tag = "a.item_no";
+ this.gv_salesOrderId.Visible = true;
+ this.gv_salesOrderId.VisibleIndex = 1;
+ this.gv_salesOrderId.Width = 50;
+ //
+ // gv_orderLineId
+ //
+ this.gv_orderLineId.AppearanceCell.Options.UseFont = true;
+ this.gv_orderLineId.Caption = "鐗╂枡绫诲瀷鍚嶇О";
+ this.gv_orderLineId.FieldName = "itemName";
+ this.gv_orderLineId.Name = "gv_orderLineId";
+ this.gv_orderLineId.OptionsColumn.AllowEdit = false;
+ this.gv_orderLineId.Tag = "a.item_name";
+ this.gv_orderLineId.Visible = true;
+ this.gv_orderLineId.VisibleIndex = 2;
+ this.gv_orderLineId.Width = 50;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "閫夋嫨";
+ this.gridColumn2.ColumnEdit = this.repositoryItemButtonEdit1;
+ this.gridColumn2.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 3;
+ this.gridColumn2.Width = 94;
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.checkbox2_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, 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);
+ //
+ // JyxmShowByLeiBie
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(642, 728);
+ this.Controls.Add(this.gcMain);
+ this.Controls.Add(this.panelControl1);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "JyxmShowByLeiBie";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "JyxmShow2";
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
+ this.panelControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMain;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gv2;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrderId;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId;
+ private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowByLeiBie.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowByLeiBie.cs
new file mode 100644
index 0000000..db4f4ac
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowByLeiBie.cs
@@ -0,0 +1,144 @@
+锘縰sing DevExpress.XtraEditors;
+using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using MES.Service.Modes;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.QC
+{
+ public partial class JyxmShowByLeiBie : DevExpress.XtraEditors.XtraForm
+ {
+ private List<FilterEntity> _filterList = new List<FilterEntity>();
+ private readonly string _webServiceName = "MesItemTypeManager/";
+ public string strType = "";//iqc type
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="_sourceGuid"></param>
+ /// <param name="_strType"></param>
+ public JyxmShowByLeiBie(string strType)
+ {
+ InitializeComponent();
+ this.strType = strType;
+ this.Text = "閫夋嫨鐗╂枡绫诲埆-" + strType;
+ getPageList(1);
+ pageBar1.setBar(false);
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gvMain);
+
+ }
+
+ #region 婧愮墿鏂欐暟鎹粦瀹�
+
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gvMain.Columns, gvMain);
+ Task.Delay(100);
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage);
+ }
+
+ /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ gcMain.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "tcode", "asc", "", _sbSqlWhere.ToString(), strType);
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "MesItemTypeManager/GetListSelect", json);
+ var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain.BindingContext = new BindingContext();
+ gvMain.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain.DataSource = dt;
+ gcMain.ForceInitialize();
+ gvMain.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMain);
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain, gvMain);
+ gvMain.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ #endregion
+
+
+ /// <summary>
+ /// 纭畾閫夋嫨
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMain.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMain.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (string.IsNullOrEmpty(mxGuid))
+ {
+ return;
+ }
+ var list = new List<dynamic>();
+ list.Add(new
+ {
+ guid = dr["guid"].ToString(),
+ itemId = dr["id"].ToString(),
+ itemName = dr["itemName"].ToString(),
+ itemNo = dr["itemNo"].ToString(),
+ });
+ UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
+ Close();
+ }
+ }
+
+ /// <summary>
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowByLeiBie.resx b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowByLeiBie.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShowByLeiBie.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs
index bbacf68..090607f 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqfa.Designer.cs
@@ -64,7 +64,7 @@
this.txt_fabm = new DevExpress.XtraEditors.TextEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_bz = new DevExpress.XtraEditors.TextEdit();
- this.txt_checkUserName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.txt_famc = new DevExpress.XtraEditors.TextEdit();
this.txt_bzqx = new DevExpress.XtraEditors.TextEdit();
@@ -115,7 +115,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fabm.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bz.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_famc.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bzqx.Properties)).BeginInit();
@@ -159,10 +159,9 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1504, 98);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1203, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -170,11 +169,10 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1504, 736);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1203, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -183,9 +181,8 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1502, 698);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1201, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -194,7 +191,6 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -207,19 +203,17 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1502, 698);
+ this.split1.Size = new System.Drawing.Size(1201, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1502, 635);
+ this.gcMain1.Size = new System.Drawing.Size(1201, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -229,7 +223,7 @@
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.ColumnPanelRowHeight = 61;
+ this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn9,
this.gridColumn8,
@@ -242,9 +236,8 @@
this.gv_checkDate,
this.gv_remark,
this.gridColumn7});
- this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 62;
+ this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -254,143 +247,137 @@
//
this.gridColumn9.Caption = "淇濆�兼湡闄�";
this.gridColumn9.FieldName = "bzqx";
- this.gridColumn9.MinWidth = 31;
+ this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 4;
- this.gridColumn9.Width = 144;
+ this.gridColumn9.Width = 115;
//
// gridColumn8
//
this.gridColumn8.Caption = "棰勮鏃ユ湡";
this.gridColumn8.FieldName = "yjrq";
- this.gridColumn8.MinWidth = 31;
+ this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 5;
- this.gridColumn8.Width = 144;
+ this.gridColumn8.Width = 115;
//
// gridColumn10
//
this.gridColumn10.Caption = "澶嶆闄愬��";
this.gridColumn10.FieldName = "fjxz";
- this.gridColumn10.MinWidth = 31;
+ this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.Width = 144;
+ this.gridColumn10.Width = 115;
//
// gridColumn1
//
this.gridColumn1.Caption = "浣跨敤缁勭粐";
this.gridColumn1.FieldName = "orgName";
- this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "org.fnamber";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
- this.gridColumn1.Width = 62;
+ this.gridColumn1.Width = 50;
//
// gv_status
//
this.gv_status.AppearanceCell.Options.UseFont = true;
this.gv_status.Caption = "瀹℃牳鐘舵��";
this.gv_status.FieldName = "checkStatus";
- this.gv_status.MaxWidth = 62;
- this.gv_status.MinWidth = 62;
+ this.gv_status.MaxWidth = 50;
+ this.gv_status.MinWidth = 50;
this.gv_status.Name = "gv_status";
this.gv_status.OptionsColumn.AllowEdit = false;
this.gv_status.Tag = "query_a.STATUS";
this.gv_status.Visible = true;
this.gv_status.VisibleIndex = 1;
- this.gv_status.Width = 62;
+ this.gv_status.Width = 50;
//
// gridColumn11
//
this.gridColumn11.Caption = "鏂规鍚嶇О";
this.gridColumn11.FieldName = "famc";
- this.gridColumn11.MinWidth = 31;
+ this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 3;
- this.gridColumn11.Width = 144;
+ this.gridColumn11.Width = 115;
//
// gv_billNo
//
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鏂规缂栫爜";
this.gv_billNo.FieldName = "fabm";
- this.gv_billNo.MinWidth = 25;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
this.gv_billNo.VisibleIndex = 2;
- this.gv_billNo.Width = 184;
+ this.gv_billNo.Width = 147;
//
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜� ";
- this.gv_checkUser.FieldName = "checkUserName";
- this.gv_checkUser.MinWidth = 25;
+ this.gv_checkUser.FieldName = "checkBy";
this.gv_checkUser.Name = "gv_checkUser";
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.CHECK_USER";
this.gv_checkUser.Visible = true;
this.gv_checkUser.VisibleIndex = 6;
- this.gv_checkUser.Width = 144;
+ this.gv_checkUser.Width = 115;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃堕棿 ";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 25;
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 = 7;
- this.gv_checkDate.Width = 144;
+ this.gv_checkDate.Width = 115;
//
// gv_remark
//
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "澶囨敞";
this.gv_remark.FieldName = "bz";
- this.gv_remark.MinWidth = 25;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.REMARK";
this.gv_remark.Visible = true;
this.gv_remark.VisibleIndex = 8;
- this.gv_remark.Width = 171;
+ this.gv_remark.Width = 137;
//
// gridColumn7
//
this.gridColumn7.Caption = "涓婚敭GUID";
this.gridColumn7.FieldName = "guid";
- this.gridColumn7.MinWidth = 31;
+ this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Width = 117;
+ this.gridColumn7.Width = 94;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 635);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1502, 48);
+ this.pageBar1.Size = new System.Drawing.Size(1201, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
- this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1502, 698);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1201, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︽儏";
//
// splitMx1
@@ -398,7 +385,6 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -411,8 +397,8 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1502, 698);
- this.splitMx1.SplitterPosition = 108;
+ this.splitMx1.Size = new System.Drawing.Size(1201, 570);
+ this.splitMx1.SplitterPosition = 88;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -423,7 +409,7 @@
this.layoutMx1.Controls.Add(this.txt_fabm);
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_bz);
- this.layoutMx1.Controls.Add(this.txt_checkUserName);
+ this.layoutMx1.Controls.Add(this.txt_checkBy);
this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Controls.Add(this.txt_famc);
this.layoutMx1.Controls.Add(this.txt_bzqx);
@@ -434,120 +420,108 @@
this.layoutControlItem13,
this.layoutControlItem6});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(535, 431, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1502, 108);
+ this.layoutMx1.Size = new System.Drawing.Size(1201, 88);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// txt_fSubsidiary
//
this.txt_fSubsidiary.IsReadly = false;
- this.txt_fSubsidiary.Location = new System.Drawing.Point(871, 14);
- this.txt_fSubsidiary.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.txt_fSubsidiary.Location = new System.Drawing.Point(701, 12);
this.txt_fSubsidiary.Name = "txt_fSubsidiary";
- this.txt_fSubsidiary.Size = new System.Drawing.Size(246, 28);
+ this.txt_fSubsidiary.Size = new System.Drawing.Size(192, 24);
this.txt_fSubsidiary.TabIndex = 538;
//
// txt_checkStatus
//
- this.txt_checkStatus.Location = new System.Drawing.Point(1121, 88);
- this.txt_checkStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_checkStatus.Location = new System.Drawing.Point(897, 72);
this.txt_checkStatus.Name = "txt_checkStatus";
this.txt_checkStatus.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_checkStatus.Size = new System.Drawing.Size(365, 27);
+ this.txt_checkStatus.Size = new System.Drawing.Size(292, 24);
this.txt_checkStatus.StyleController = this.layoutMx1;
this.txt_checkStatus.TabIndex = 537;
this.txt_checkStatus.Tag = "readonly";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(1050, 139);
- this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbGuid.Location = new System.Drawing.Point(840, 114);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(342, 37);
+ this.lbGuid.Size = new System.Drawing.Size(274, 30);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
// txt_fabm
//
- this.txt_fabm.Location = new System.Drawing.Point(133, 14);
- this.txt_fabm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fabm.Location = new System.Drawing.Point(111, 12);
this.txt_fabm.Name = "txt_fabm";
this.txt_fabm.Properties.Appearance.Options.UseFont = true;
- this.txt_fabm.Size = new System.Drawing.Size(246, 28);
+ this.txt_fabm.Size = new System.Drawing.Size(192, 24);
this.txt_fabm.StyleController = this.layoutMx1;
this.txt_fabm.TabIndex = 211;
this.txt_fabm.Tag = "readonly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(1240, 56);
- this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_checkDate.Location = new System.Drawing.Point(996, 46);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(248, 28);
+ this.txt_checkDate.Size = new System.Drawing.Size(193, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 226;
this.txt_checkDate.Tag = "readonly";
//
// txt_bz
//
- this.txt_bz.Location = new System.Drawing.Point(871, 56);
- this.txt_bz.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_bz.Location = new System.Drawing.Point(701, 46);
this.txt_bz.Name = "txt_bz";
this.txt_bz.Properties.Appearance.Options.UseFont = true;
- this.txt_bz.Size = new System.Drawing.Size(246, 28);
+ this.txt_bz.Size = new System.Drawing.Size(192, 24);
this.txt_bz.StyleController = this.layoutMx1;
this.txt_bz.TabIndex = 252;
//
- // txt_checkUserName
+ // txt_checkBy
//
- this.txt_checkUserName.Location = new System.Drawing.Point(1240, 14);
- this.txt_checkUserName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_checkUserName.Name = "txt_checkUserName";
- this.txt_checkUserName.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUserName.Size = new System.Drawing.Size(248, 28);
- this.txt_checkUserName.StyleController = this.layoutMx1;
- this.txt_checkUserName.TabIndex = 222;
- this.txt_checkUserName.Tag = "readonly";
+ this.txt_checkBy.Location = new System.Drawing.Point(996, 12);
+ this.txt_checkBy.Name = "txt_checkBy";
+ this.txt_checkBy.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkBy.Size = new System.Drawing.Size(193, 24);
+ this.txt_checkBy.StyleController = this.layoutMx1;
+ this.txt_checkBy.TabIndex = 222;
+ this.txt_checkBy.Tag = "readonly";
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(1178, 181);
- this.txt_guid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_guid.Location = new System.Drawing.Point(942, 148);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(215, 28);
+ this.txt_guid.Size = new System.Drawing.Size(172, 24);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 532;
//
// txt_famc
//
- this.txt_famc.Location = new System.Drawing.Point(133, 56);
- this.txt_famc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_famc.Location = new System.Drawing.Point(111, 46);
this.txt_famc.Name = "txt_famc";
- this.txt_famc.Size = new System.Drawing.Size(246, 28);
+ this.txt_famc.Size = new System.Drawing.Size(192, 24);
this.txt_famc.StyleController = this.layoutMx1;
this.txt_famc.TabIndex = 533;
//
// txt_bzqx
//
- this.txt_bzqx.Location = new System.Drawing.Point(502, 14);
- this.txt_bzqx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_bzqx.Location = new System.Drawing.Point(406, 12);
this.txt_bzqx.Name = "txt_bzqx";
- this.txt_bzqx.Size = new System.Drawing.Size(246, 28);
+ this.txt_bzqx.Size = new System.Drawing.Size(192, 24);
this.txt_bzqx.StyleController = this.layoutMx1;
this.txt_bzqx.TabIndex = 534;
//
// txt_yjrq
//
- this.txt_yjrq.Location = new System.Drawing.Point(502, 56);
- this.txt_yjrq.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_yjrq.Location = new System.Drawing.Point(406, 46);
this.txt_yjrq.Name = "txt_yjrq";
- this.txt_yjrq.Size = new System.Drawing.Size(246, 28);
+ this.txt_yjrq.Size = new System.Drawing.Size(192, 24);
this.txt_yjrq.StyleController = this.layoutMx1;
this.txt_yjrq.TabIndex = 536;
//
@@ -560,7 +534,7 @@
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem17.Size = new System.Drawing.Size(278, 35);
this.layoutControlItem17.Text = "涓婚敭Guid";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(62, 24);
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(50, 20);
//
// layoutControlItem13
//
@@ -621,100 +595,99 @@
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2});
- this.Root.Size = new System.Drawing.Size(1502, 108);
+ this.Root.Size = new System.Drawing.Size(1201, 88);
this.Root.TextVisible = false;
//
// layoutControlItem9
//
- this.layoutControlItem9.Control = this.txt_checkUserName;
+ this.layoutControlItem9.Control = this.txt_checkBy;
this.layoutControlItem9.CustomizationFormText = "瀹℃牳浜哄憳";
- this.layoutControlItem9.Location = new System.Drawing.Point(1107, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(885, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(371, 42);
+ this.layoutControlItem9.Size = new System.Drawing.Size(296, 34);
this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(104, 22);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_checkDate;
- this.layoutControlItem10.Location = new System.Drawing.Point(1107, 42);
+ this.layoutControlItem10.Location = new System.Drawing.Point(885, 34);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(371, 42);
+ this.layoutControlItem10.Size = new System.Drawing.Size(296, 34);
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(104, 22);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_fabm;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(369, 42);
+ this.layoutControlItem1.Size = new System.Drawing.Size(295, 34);
this.layoutControlItem1.Text = "鏂规缂栫爜";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(104, 22);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_famc;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 42);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 34);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(369, 42);
+ this.layoutControlItem3.Size = new System.Drawing.Size(295, 34);
this.layoutControlItem3.Text = "鏂规鍚嶇О";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(104, 22);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fSubsidiary;
- this.layoutControlItem8.Location = new System.Drawing.Point(738, 0);
+ this.layoutControlItem8.Location = new System.Drawing.Point(590, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(369, 42);
+ this.layoutControlItem8.Size = new System.Drawing.Size(295, 34);
this.layoutControlItem8.Text = "浣跨敤缁勭粐";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(104, 22);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_bzqx;
- this.layoutControlItem2.Location = new System.Drawing.Point(369, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(295, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(369, 42);
+ this.layoutControlItem2.Size = new System.Drawing.Size(295, 34);
this.layoutControlItem2.Text = "璐ㄤ繚鏈熼檺(澶�)";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(104, 22);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_yjrq;
- this.layoutControlItem5.Location = new System.Drawing.Point(369, 42);
+ this.layoutControlItem5.Location = new System.Drawing.Point(295, 34);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(369, 42);
+ this.layoutControlItem5.Size = new System.Drawing.Size(295, 34);
this.layoutControlItem5.Text = "棰勮鏃ユ湡(澶�)";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(104, 22);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_bz;
- this.layoutControlItem7.Location = new System.Drawing.Point(738, 42);
+ this.layoutControlItem7.Location = new System.Drawing.Point(590, 34);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(369, 42);
+ this.layoutControlItem7.Size = new System.Drawing.Size(295, 34);
this.layoutControlItem7.Text = "鏂规澶囨敞";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(104, 22);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(87, 18);
//
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
- this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1502, 575);
+ this.tabMx.Size = new System.Drawing.Size(1201, 470);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -722,16 +695,14 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.splitContainerControl1);
- this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1500, 537);
+ this.tabMxPage1.Size = new System.Drawing.Size(1199, 438);
this.tabMxPage1.Text = "鏂规鏄庣粏";
//
// splitContainerControl1
//
this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
- this.splitContainerControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitContainerControl1.Name = "splitContainerControl1";
//
// splitContainerControl1.Panel1
@@ -744,24 +715,22 @@
this.splitContainerControl1.Panel2.Controls.Add(this.splitContainerControl2);
this.splitContainerControl1.Panel2.Text = "Panel2";
this.splitContainerControl1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitContainerControl1.Size = new System.Drawing.Size(1500, 537);
- this.splitContainerControl1.SplitterPosition = 785;
+ this.splitContainerControl1.Size = new System.Drawing.Size(1199, 438);
+ this.splitContainerControl1.SplitterPosition = 628;
this.splitContainerControl1.TabIndex = 0;
//
// frm_CqfaItems1
//
this.frm_CqfaItems1.Dock = System.Windows.Forms.DockStyle.Fill;
this.frm_CqfaItems1.Location = new System.Drawing.Point(0, 0);
- this.frm_CqfaItems1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.frm_CqfaItems1.Name = "frm_CqfaItems1";
- this.frm_CqfaItems1.Size = new System.Drawing.Size(785, 537);
+ this.frm_CqfaItems1.Size = new System.Drawing.Size(628, 438);
this.frm_CqfaItems1.TabIndex = 0;
//
// splitContainerControl2
//
this.splitContainerControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainerControl2.Location = new System.Drawing.Point(0, 0);
- this.splitContainerControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitContainerControl2.Name = "splitContainerControl2";
//
// splitContainerControl2.Panel1
@@ -775,18 +744,17 @@
this.splitContainerControl2.Panel2.Controls.Add(this.frm_CqfaItems2);
this.splitContainerControl2.Panel2.Text = "Panel2";
this.splitContainerControl2.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.False;
- this.splitContainerControl2.Size = new System.Drawing.Size(700, 537);
- this.splitContainerControl2.SplitterPosition = 89;
+ this.splitContainerControl2.Size = new System.Drawing.Size(559, 438);
+ this.splitContainerControl2.SplitterPosition = 71;
this.splitContainerControl2.TabIndex = 0;
//
// btnOut
//
this.btnOut.Appearance.ForeColor = System.Drawing.Color.Blue;
this.btnOut.Appearance.Options.UseForeColor = true;
- this.btnOut.Location = new System.Drawing.Point(21, 287);
- this.btnOut.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnOut.Location = new System.Drawing.Point(17, 235);
this.btnOut.Name = "btnOut";
- this.btnOut.Size = new System.Drawing.Size(49, 35);
+ this.btnOut.Size = new System.Drawing.Size(39, 29);
this.btnOut.TabIndex = 2;
this.btnOut.Text = ">>";
//
@@ -794,10 +762,9 @@
//
this.btnIn.Appearance.ForeColor = System.Drawing.Color.Blue;
this.btnIn.Appearance.Options.UseForeColor = true;
- this.btnIn.Location = new System.Drawing.Point(21, 233);
- this.btnIn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnIn.Location = new System.Drawing.Point(17, 191);
this.btnIn.Name = "btnIn";
- this.btnIn.Size = new System.Drawing.Size(49, 35);
+ this.btnIn.Size = new System.Drawing.Size(39, 29);
this.btnIn.TabIndex = 1;
this.btnIn.Text = "<<";
//
@@ -805,18 +772,16 @@
//
this.frm_CqfaItems2.Dock = System.Windows.Forms.DockStyle.Fill;
this.frm_CqfaItems2.Location = new System.Drawing.Point(0, 0);
- this.frm_CqfaItems2.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.frm_CqfaItems2.Name = "frm_CqfaItems2";
- this.frm_CqfaItems2.Size = new System.Drawing.Size(596, 537);
+ this.frm_CqfaItems2.Size = new System.Drawing.Size(476, 438);
this.frm_CqfaItems2.TabIndex = 0;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1206, 78);
- this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.picCheckBox.Location = new System.Drawing.Point(965, 64);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(125, 61);
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 8;
this.picCheckBox.TabStop = false;
@@ -832,13 +797,12 @@
//
// Frm_Cqfa
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1504, 834);
+ this.ClientSize = new System.Drawing.Size(1203, 682);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_Cqfa";
this.Text = "瓒呮湡妫�楠屾柟妗�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -864,7 +828,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fabm.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bz.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_famc.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bzqx.Properties)).EndInit();
@@ -922,7 +886,7 @@
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_bz;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
- private DevExpress.XtraEditors.TextEdit txt_checkUserName;
+ private DevExpress.XtraEditors.TextEdit txt_checkBy;
private DevExpress.XtraEditors.TextEdit txt_fabm;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
index 71459bc..bd6f2f3 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.Designer.cs
@@ -68,10 +68,10 @@
this.txt_billType = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
- this.txt_checkByName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
- this.txt_lastUpdateByName = new DevExpress.XtraEditors.TextEdit();
- this.txt_lastUpdateDate = new DevExpress.XtraEditors.TextEdit();
+ this.lastUpdateUser = new DevExpress.XtraEditors.TextEdit();
+ this.lastUpdateTime = new DevExpress.XtraEditors.TextEdit();
this.txt_guid = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -81,11 +81,6 @@
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -120,6 +115,11 @@
this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -143,10 +143,10 @@
((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkByName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateByName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lastUpdateUser.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lastUpdateTime.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
@@ -156,11 +156,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -171,6 +166,11 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -182,10 +182,9 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -193,11 +192,10 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -206,9 +204,8 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -217,7 +214,6 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -230,19 +226,17 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1408, 698);
+ this.split1.Size = new System.Drawing.Size(1126, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1408, 635);
+ this.gcMain1.Size = new System.Drawing.Size(1126, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -252,7 +246,7 @@
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.ColumnPanelRowHeight = 61;
+ this.gridView1.ColumnPanelRowHeight = 50;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn1,
this.gv_status,
@@ -264,9 +258,8 @@
this.gv_returnMethod,
this.gv_remark,
this.gridColumn7});
- this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 62;
+ this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -276,144 +269,135 @@
//
this.gridColumn1.Caption = "鐢宠缁勭粐";
this.gridColumn1.FieldName = "kcOrg";
- this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "org.fnamber";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 1;
- this.gridColumn1.Width = 312;
+ this.gridColumn1.Width = 250;
//
// gv_status
//
this.gv_status.AppearanceCell.Options.UseFont = true;
this.gv_status.Caption = "瀹℃牳鐘舵��";
this.gv_status.FieldName = "checkStatus";
- this.gv_status.MaxWidth = 62;
- this.gv_status.MinWidth = 62;
+ this.gv_status.MaxWidth = 50;
+ this.gv_status.MinWidth = 50;
this.gv_status.Name = "gv_status";
this.gv_status.OptionsColumn.AllowEdit = false;
this.gv_status.Tag = "query_a.STATUS";
this.gv_status.Visible = true;
this.gv_status.VisibleIndex = 0;
- this.gv_status.Width = 62;
+ this.gv_status.Width = 50;
//
// gv_billNo
//
this.gv_billNo.AppearanceCell.Options.UseFont = true;
this.gv_billNo.Caption = "鍗曟嵁缂栫爜";
this.gv_billNo.FieldName = "billNo";
- this.gv_billNo.MinWidth = 25;
this.gv_billNo.Name = "gv_billNo";
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
this.gv_billNo.VisibleIndex = 2;
- this.gv_billNo.Width = 150;
+ this.gv_billNo.Width = 120;
//
// gv_lastUpdateUser
//
this.gv_lastUpdateUser.AppearanceCell.Options.UseFont = true;
- this.gv_lastUpdateUser.Caption = "鏈�鍚庢洿鏂颁汉 ";
- this.gv_lastUpdateUser.FieldName = "lastUpdateByName";
- this.gv_lastUpdateUser.MinWidth = 25;
+ this.gv_lastUpdateUser.Caption = "鏈�鍚庤窡鏂颁汉 ";
+ this.gv_lastUpdateUser.FieldName = "lastUpdateBy";
this.gv_lastUpdateUser.Name = "gv_lastUpdateUser";
this.gv_lastUpdateUser.OptionsColumn.AllowEdit = false;
this.gv_lastUpdateUser.Tag = "query_a.LAST_UPDATE_USER";
this.gv_lastUpdateUser.Visible = true;
this.gv_lastUpdateUser.VisibleIndex = 3;
- this.gv_lastUpdateUser.Width = 117;
+ this.gv_lastUpdateUser.Width = 94;
//
// gv_lastUpdateTime
//
this.gv_lastUpdateTime.AppearanceCell.Options.UseFont = true;
this.gv_lastUpdateTime.Caption = "鏈�鍚庝慨鏀规椂闂� ";
this.gv_lastUpdateTime.FieldName = "lastUpdateDate";
- this.gv_lastUpdateTime.MinWidth = 25;
this.gv_lastUpdateTime.Name = "gv_lastUpdateTime";
this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false;
this.gv_lastUpdateTime.Tag = "query_a.LAST_UPDATE_TIME";
this.gv_lastUpdateTime.Visible = true;
this.gv_lastUpdateTime.VisibleIndex = 4;
- this.gv_lastUpdateTime.Width = 225;
+ this.gv_lastUpdateTime.Width = 180;
//
// gv_checkUser
//
this.gv_checkUser.AppearanceCell.Options.UseFont = true;
this.gv_checkUser.Caption = "瀹℃牳浜� ";
- this.gv_checkUser.FieldName = "checkByName";
- this.gv_checkUser.MinWidth = 25;
+ this.gv_checkUser.FieldName = "checkBy";
this.gv_checkUser.Name = "gv_checkUser";
this.gv_checkUser.OptionsColumn.AllowEdit = false;
this.gv_checkUser.Tag = "query_a.CHECK_USER";
this.gv_checkUser.Visible = true;
this.gv_checkUser.VisibleIndex = 5;
- this.gv_checkUser.Width = 117;
+ this.gv_checkUser.Width = 94;
//
// gv_checkDate
//
this.gv_checkDate.AppearanceCell.Options.UseFont = true;
this.gv_checkDate.Caption = "瀹℃牳鏃堕棿 ";
this.gv_checkDate.FieldName = "checkDate";
- this.gv_checkDate.MinWidth = 25;
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 = 6;
- this.gv_checkDate.Width = 117;
+ this.gv_checkDate.Width = 94;
//
// gv_returnMethod
//
this.gv_returnMethod.AppearanceCell.Options.UseFont = true;
this.gv_returnMethod.Caption = "鐢宠绫诲瀷";
this.gv_returnMethod.FieldName = "billType";
- this.gv_returnMethod.MinWidth = 25;
this.gv_returnMethod.Name = "gv_returnMethod";
this.gv_returnMethod.OptionsColumn.AllowEdit = false;
this.gv_returnMethod.Tag = "query_a.RETURN_METHOD";
this.gv_returnMethod.Visible = true;
this.gv_returnMethod.VisibleIndex = 7;
- this.gv_returnMethod.Width = 117;
+ this.gv_returnMethod.Width = 94;
//
// gv_remark
//
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "鐢宠澶囨敞";
this.gv_remark.FieldName = "remark";
- this.gv_remark.MinWidth = 25;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.REMARK";
this.gv_remark.Visible = true;
this.gv_remark.VisibleIndex = 8;
- this.gv_remark.Width = 117;
+ this.gv_remark.Width = 94;
//
// gridColumn7
//
this.gridColumn7.Caption = "涓婚敭GUID";
this.gridColumn7.FieldName = "guid";
- this.gridColumn7.MinWidth = 31;
+ this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Width = 117;
+ this.gridColumn7.Width = 94;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 635);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1408, 48);
+ this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
- this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︽儏";
//
// splitMx1
@@ -421,7 +405,6 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -434,8 +417,8 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1408, 698);
- this.splitMx1.SplitterPosition = 132;
+ this.splitMx1.Size = new System.Drawing.Size(1126, 570);
+ this.splitMx1.SplitterPosition = 108;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -447,41 +430,38 @@
this.layoutMx1.Controls.Add(this.txt_billType);
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_remark);
- this.layoutMx1.Controls.Add(this.txt_checkByName);
+ this.layoutMx1.Controls.Add(this.txt_checkUser);
this.layoutMx1.Controls.Add(this.txt_status);
- this.layoutMx1.Controls.Add(this.txt_lastUpdateByName);
- this.layoutMx1.Controls.Add(this.txt_lastUpdateDate);
+ this.layoutMx1.Controls.Add(this.lastUpdateUser);
+ this.layoutMx1.Controls.Add(this.lastUpdateTime);
this.layoutMx1.Controls.Add(this.txt_guid);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem17,
this.layoutControlItem13});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(832, 224, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1408, 132);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 108);
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(14, 90);
- this.btnSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnSelect.Location = new System.Drawing.Point(12, 69);
this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(146, 34);
+ this.btnSelect.Size = new System.Drawing.Size(116, 27);
this.btnSelect.StyleController = this.layoutMx1;
this.btnSelect.TabIndex = 525;
this.btnSelect.Text = "閫夋嫨瓒呮湡鏉＄爜";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(1050, 139);
- this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbGuid.Location = new System.Drawing.Point(840, 114);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(342, 37);
+ this.lbGuid.Size = new System.Drawing.Size(274, 30);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
@@ -489,19 +469,17 @@
// txt_kcOrgId
//
this.txt_kcOrgId.IsReadly = false;
- this.txt_kcOrgId.Location = new System.Drawing.Point(137, 52);
- this.txt_kcOrgId.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.txt_kcOrgId.Location = new System.Drawing.Point(114, 38);
this.txt_kcOrgId.Name = "txt_kcOrgId";
- this.txt_kcOrgId.Size = new System.Drawing.Size(212, 28);
+ this.txt_kcOrgId.Size = new System.Drawing.Size(165, 24);
this.txt_kcOrgId.TabIndex = 526;
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(137, 14);
- this.txt_billNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_billNo.Location = new System.Drawing.Point(114, 7);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(212, 28);
+ this.txt_billNo.Size = new System.Drawing.Size(165, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
@@ -509,8 +487,7 @@
// txt_billType
//
this.txt_billType.EditValue = "-璇烽�夋嫨-";
- this.txt_billType.Location = new System.Drawing.Point(476, 14);
- this.txt_billType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_billType.Location = new System.Drawing.Point(385, 7);
this.txt_billType.Name = "txt_billType";
this.txt_billType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -523,79 +500,72 @@
"閿�鍞渶姹�",
"瀹為獙闇�姹�"});
this.txt_billType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_billType.Size = new System.Drawing.Size(212, 28);
+ this.txt_billType.Size = new System.Drawing.Size(165, 24);
this.txt_billType.StyleController = this.layoutMx1;
this.txt_billType.TabIndex = 520;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(1154, 52);
- this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_checkDate.Location = new System.Drawing.Point(927, 38);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(214, 28);
+ this.txt_checkDate.Size = new System.Drawing.Size(166, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 226;
this.txt_checkDate.Tag = "readonly";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(476, 52);
- this.txt_remark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_remark.Location = new System.Drawing.Point(385, 38);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(212, 28);
+ this.txt_remark.Size = new System.Drawing.Size(165, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 252;
//
- // txt_checkByName
+ // txt_checkUser
//
- this.txt_checkByName.Location = new System.Drawing.Point(1154, 14);
- this.txt_checkByName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_checkByName.Name = "txt_checkByName";
- this.txt_checkByName.Properties.Appearance.Options.UseFont = true;
- this.txt_checkByName.Size = new System.Drawing.Size(214, 28);
- this.txt_checkByName.StyleController = this.layoutMx1;
- this.txt_checkByName.TabIndex = 222;
- this.txt_checkByName.Tag = "readonly";
+ this.txt_checkUser.Location = new System.Drawing.Point(927, 7);
+ this.txt_checkUser.Name = "txt_checkUser";
+ this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
+ this.txt_checkUser.Size = new System.Drawing.Size(166, 24);
+ this.txt_checkUser.StyleController = this.layoutMx1;
+ this.txt_checkUser.TabIndex = 222;
+ this.txt_checkUser.Tag = "readonly";
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(1031, 90);
- this.txt_status.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_status.Location = new System.Drawing.Point(825, 69);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_status.Size = new System.Drawing.Size(337, 27);
+ this.txt_status.Size = new System.Drawing.Size(268, 24);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 528;
this.txt_status.Tag = "readonly";
//
- // txt_lastUpdateByName
+ // lastUpdateUser
//
- this.txt_lastUpdateByName.Location = new System.Drawing.Point(815, 14);
- this.txt_lastUpdateByName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_lastUpdateByName.Name = "txt_lastUpdateByName";
- this.txt_lastUpdateByName.Size = new System.Drawing.Size(212, 28);
- this.txt_lastUpdateByName.StyleController = this.layoutMx1;
- this.txt_lastUpdateByName.TabIndex = 530;
- this.txt_lastUpdateByName.Tag = "readonly";
+ this.lastUpdateUser.Location = new System.Drawing.Point(656, 7);
+ this.lastUpdateUser.Name = "lastUpdateUser";
+ this.lastUpdateUser.Size = new System.Drawing.Size(165, 24);
+ this.lastUpdateUser.StyleController = this.layoutMx1;
+ this.lastUpdateUser.TabIndex = 530;
+ this.lastUpdateUser.Tag = "readonly";
//
- // txt_lastUpdateDate
+ // lastUpdateTime
//
- this.txt_lastUpdateDate.Location = new System.Drawing.Point(815, 52);
- this.txt_lastUpdateDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_lastUpdateDate.Name = "txt_lastUpdateDate";
- this.txt_lastUpdateDate.Size = new System.Drawing.Size(212, 28);
- this.txt_lastUpdateDate.StyleController = this.layoutMx1;
- this.txt_lastUpdateDate.TabIndex = 531;
- this.txt_lastUpdateDate.Tag = "readonly";
+ this.lastUpdateTime.Location = new System.Drawing.Point(656, 38);
+ this.lastUpdateTime.Name = "lastUpdateTime";
+ this.lastUpdateTime.Size = new System.Drawing.Size(165, 24);
+ this.lastUpdateTime.StyleController = this.layoutMx1;
+ this.lastUpdateTime.TabIndex = 531;
+ this.lastUpdateTime.Tag = "readonly";
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(1178, 181);
- this.txt_guid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_guid.Location = new System.Drawing.Point(942, 148);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(215, 28);
+ this.txt_guid.Size = new System.Drawing.Size(172, 24);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 532;
//
@@ -608,7 +578,7 @@
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem17.Size = new System.Drawing.Size(278, 35);
this.layoutControlItem17.Text = "涓婚敭Guid";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(62, 24);
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(50, 20);
//
// layoutControlItem13
//
@@ -662,7 +632,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1382, 138);
+ this.Root.Size = new System.Drawing.Size(1105, 113);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -670,118 +640,63 @@
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(339, 38);
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_kcOrgId;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 38);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(339, 38);
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem2.Text = "閫夋嫨缁勭粐";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(108, 22);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem9
//
- this.layoutControlItem9.Control = this.txt_checkByName;
+ this.layoutControlItem9.Control = this.txt_checkUser;
this.layoutControlItem9.CustomizationFormText = "瀹℃牳浜哄憳";
- this.layoutControlItem9.Location = new System.Drawing.Point(1017, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(341, 38);
+ this.layoutControlItem9.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(108, 22);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_checkDate;
- this.layoutControlItem10.Location = new System.Drawing.Point(1017, 38);
+ this.layoutControlItem10.Location = new System.Drawing.Point(813, 31);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(341, 38);
+ this.layoutControlItem10.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(108, 22);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.btnSelect;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 76);
- this.layoutControlItem16.MaxSize = new System.Drawing.Size(150, 38);
- this.layoutControlItem16.MinSize = new System.Drawing.Size(25, 38);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 62);
+ this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(339, 38);
+ this.layoutControlItem16.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "閫�璐ф槑缁�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem16.TextVisible = false;
//
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_status;
- this.layoutControlItem11.Location = new System.Drawing.Point(1017, 76);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(341, 38);
- this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem11.TextVisible = false;
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_lastUpdateDate;
- this.layoutControlItem15.Location = new System.Drawing.Point(678, 38);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(339, 38);
- this.layoutControlItem15.Text = "鏈�鍚庢洿鏂版椂闂�";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(108, 22);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_lastUpdateByName;
- this.layoutControlItem14.Location = new System.Drawing.Point(678, 0);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(339, 38);
- this.layoutControlItem14.Text = "鏈�鍚庢洿鏂颁汉";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(108, 22);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_billType;
- this.layoutControlItem5.Location = new System.Drawing.Point(339, 0);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(339, 38);
- this.layoutControlItem5.Text = "鐢宠绫诲瀷";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(108, 22);
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_remark;
- this.layoutControlItem7.Location = new System.Drawing.Point(339, 38);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(339, 38);
- this.layoutControlItem7.Text = "鐢宠澶囨敞";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(108, 22);
- //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
- this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1408, 551);
+ this.tabMx.Size = new System.Drawing.Size(1126, 450);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -790,22 +705,19 @@
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
- this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1406, 513);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 418);
this.tabMxPage1.Text = "鏉＄爜鏄庣粏";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1406, 513);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 418);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -827,7 +739,6 @@
this.gridColumn20,
this.gridColumn21,
this.gvMxDel});
- this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -838,147 +749,147 @@
//
this.gridColumn6.Caption = "鏄庣粏GUID";
this.gridColumn6.FieldName = "guid";
- this.gridColumn6.MinWidth = 31;
+ this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
- this.gridColumn6.Width = 117;
+ this.gridColumn6.Width = 94;
//
// gridColumn8
//
this.gridColumn8.AppearanceCell.Options.UseFont = true;
this.gridColumn8.Caption = "涓昏〃GUID";
this.gridColumn8.FieldName = "pGuid";
- this.gridColumn8.MinWidth = 62;
+ this.gridColumn8.MinWidth = 50;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Tag = "query_a.MID";
- this.gridColumn8.Width = 117;
+ this.gridColumn8.Width = 94;
//
// gridColumn9
//
this.gridColumn9.AppearanceCell.Options.UseFont = true;
this.gridColumn9.Caption = "鐗╂枡ID";
this.gridColumn9.FieldName = "itemId";
- this.gridColumn9.MinWidth = 62;
+ this.gridColumn9.MinWidth = 50;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Tag = "query_a.ITEM_ID";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 0;
- this.gridColumn9.Width = 117;
+ this.gridColumn9.Width = 94;
//
// gridColumn10
//
this.gridColumn10.Caption = "鐗╂枡缂栫爜";
this.gridColumn10.FieldName = "itemNo";
- this.gridColumn10.MinWidth = 31;
+ this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 2;
- this.gridColumn10.Width = 117;
+ this.gridColumn10.Width = 94;
//
// gridColumn11
//
this.gridColumn11.Caption = "鐗╂枡鍚嶇О";
this.gridColumn11.FieldName = "itemName";
- this.gridColumn11.MinWidth = 31;
+ this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 3;
- this.gridColumn11.Width = 117;
+ this.gridColumn11.Width = 94;
//
// gridColumn12
//
this.gridColumn12.Caption = "鐗╂枡瑙勬牸";
this.gridColumn12.FieldName = "itemModel";
- this.gridColumn12.MinWidth = 31;
+ this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 4;
- this.gridColumn12.Width = 117;
+ this.gridColumn12.Width = 94;
//
// gridColumn13
//
this.gridColumn13.AppearanceCell.Options.UseFont = true;
this.gridColumn13.Caption = "鏁伴噺";
this.gridColumn13.FieldName = "itemBarCodeSl";
- this.gridColumn13.MinWidth = 62;
+ this.gridColumn13.MinWidth = 50;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Tag = "yz_quantity_0_edit";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 5;
- this.gridColumn13.Width = 117;
+ this.gridColumn13.Width = 94;
//
// gridColumn14
//
this.gridColumn14.AppearanceCell.Options.UseFont = true;
this.gridColumn14.Caption = "鏈夋晥鏈熻嚦";
this.gridColumn14.FieldName = "yxqDate";
- this.gridColumn14.MinWidth = 62;
+ this.gridColumn14.MinWidth = 50;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Tag = "yz_quantity_0_edit";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 6;
- this.gridColumn14.Width = 117;
+ this.gridColumn14.Width = 94;
//
// gridColumn15
//
this.gridColumn15.Caption = "閲嶆娆℃暟";
this.gridColumn15.FieldName = "cjcs";
- this.gridColumn15.MinWidth = 31;
+ this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 8;
- this.gridColumn15.Width = 117;
+ this.gridColumn15.Width = 94;
//
// gridColumn16
//
this.gridColumn16.AppearanceCell.Options.UseFont = true;
this.gridColumn16.Caption = "鍓╀綑澶╂暟";
this.gridColumn16.FieldName = "syts";
- this.gridColumn16.MinWidth = 62;
+ this.gridColumn16.MinWidth = 50;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Tag = "edit";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 7;
- this.gridColumn16.Width = 117;
+ this.gridColumn16.Width = 94;
//
// gridColumn17
//
this.gridColumn17.Caption = "鐗╂枡鏉＄爜";
this.gridColumn17.FieldName = "itemBarCode";
- this.gridColumn17.MinWidth = 31;
+ this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 1;
- this.gridColumn17.Width = 117;
+ this.gridColumn17.Width = 94;
//
// gridColumn20
//
this.gridColumn20.Caption = "褰撳墠搴撲綅";
this.gridColumn20.FieldName = "qckw";
- this.gridColumn20.MinWidth = 31;
+ this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 9;
- this.gridColumn20.Width = 117;
+ this.gridColumn20.Width = 94;
//
// gridColumn21
//
this.gridColumn21.Caption = "澶嶆缁撴灉";
this.gridColumn21.FieldNameSortGroup = "fjjg";
- this.gridColumn21.MinWidth = 31;
+ this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 10;
- this.gridColumn21.Width = 117;
+ this.gridColumn21.Width = 94;
//
// gvMxDel
//
this.gvMxDel.Caption = "绉诲嚭";
this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gvMxDel.MinWidth = 31;
+ this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
this.gvMxDel.VisibleIndex = 11;
- this.gvMxDel.Width = 117;
+ this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
//
@@ -994,20 +905,17 @@
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx2);
- this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1406, 508);
+ this.tabMxPage2.Size = new System.Drawing.Size(1124, 418);
this.tabMxPage2.Text = "鐗╂枡鏄庣粏";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
- this.gcMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1406, 508);
+ this.gcMx2.Size = new System.Drawing.Size(1124, 418);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1025,7 +933,6 @@
this.gvMx1ysNum,
this.gridColumn4,
this.gvMx1remark});
- this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1036,71 +943,71 @@
//
this.mxGuid.Caption = "鏄庣粏GUID";
this.mxGuid.FieldName = "guid";
- this.mxGuid.MinWidth = 31;
+ this.mxGuid.MinWidth = 25;
this.mxGuid.Name = "mxGuid";
- this.mxGuid.Width = 117;
+ this.mxGuid.Width = 94;
//
// pGuid
//
this.pGuid.AppearanceCell.Options.UseFont = true;
this.pGuid.Caption = "涓昏〃GUID";
this.pGuid.FieldName = "pGuid";
- this.pGuid.MinWidth = 62;
+ this.pGuid.MinWidth = 50;
this.pGuid.Name = "pGuid";
this.pGuid.Tag = "query_a.MID";
- this.pGuid.Width = 117;
+ this.pGuid.Width = 94;
//
// gvMx1itemId
//
this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
this.gvMx1itemId.Caption = "鐗╂枡ID";
this.gvMx1itemId.FieldName = "itemId";
- this.gvMx1itemId.MinWidth = 62;
+ this.gvMx1itemId.MinWidth = 50;
this.gvMx1itemId.Name = "gvMx1itemId";
this.gvMx1itemId.Tag = "query_a.ITEM_ID";
- this.gvMx1itemId.Width = 117;
+ this.gvMx1itemId.Width = 94;
//
// gridColumn2
//
this.gridColumn2.Caption = "鐗╂枡缂栫爜";
this.gridColumn2.FieldName = "itemNo";
- this.gridColumn2.MinWidth = 31;
+ this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 0;
- this.gridColumn2.Width = 117;
+ this.gridColumn2.Width = 94;
//
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
this.gridColumn5.FieldName = "itemName";
- this.gridColumn5.MinWidth = 31;
+ this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 1;
- this.gridColumn5.Width = 117;
+ this.gridColumn5.Width = 94;
//
// gridColumn3
//
this.gridColumn3.Caption = "鐗╂枡瑙勬牸";
this.gridColumn3.FieldName = "itemModel";
- this.gridColumn3.MinWidth = 31;
+ this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 2;
- this.gridColumn3.Width = 117;
+ this.gridColumn3.Width = 94;
//
// gvMx1sqNum
//
this.gvMx1sqNum.AppearanceCell.Options.UseFont = true;
this.gvMx1sqNum.Caption = "褰撴椂杩囨湡鏁伴噺";
this.gvMx1sqNum.FieldName = "gqsl";
- this.gvMx1sqNum.MinWidth = 62;
+ this.gvMx1sqNum.MinWidth = 50;
this.gvMx1sqNum.Name = "gvMx1sqNum";
this.gvMx1sqNum.Tag = "yz_quantity_0_edit";
this.gvMx1sqNum.Visible = true;
this.gvMx1sqNum.VisibleIndex = 3;
- this.gvMx1sqNum.Width = 117;
+ this.gvMx1sqNum.Width = 94;
//
// gvMx1ysNum
//
@@ -1111,22 +1018,22 @@
this.gvMx1ysNum.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1ysNum.Caption = "鐢宠鏁伴噺";
this.gvMx1ysNum.FieldName = "sqsl";
- this.gvMx1ysNum.MinWidth = 62;
+ this.gvMx1ysNum.MinWidth = 50;
this.gvMx1ysNum.Name = "gvMx1ysNum";
this.gvMx1ysNum.Tag = "yz_quantity_0_edit";
this.gvMx1ysNum.Visible = true;
this.gvMx1ysNum.VisibleIndex = 4;
- this.gvMx1ysNum.Width = 117;
+ this.gvMx1ysNum.Width = 94;
//
// gridColumn4
//
this.gridColumn4.Caption = "瀹屾垚鏁伴噺";
this.gridColumn4.FieldName = "wcsl";
- this.gridColumn4.MinWidth = 31;
+ this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 6;
- this.gridColumn4.Width = 117;
+ this.gridColumn4.Width = 94;
//
// gvMx1remark
//
@@ -1137,34 +1044,86 @@
this.gvMx1remark.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1remark.Caption = "澶囨敞";
this.gvMx1remark.FieldName = "remark";
- this.gvMx1remark.MinWidth = 62;
+ this.gvMx1remark.MinWidth = 50;
this.gvMx1remark.Name = "gvMx1remark";
this.gvMx1remark.Tag = "edit";
this.gvMx1remark.Visible = true;
this.gvMx1remark.VisibleIndex = 5;
- this.gvMx1remark.Width = 117;
+ this.gvMx1remark.Width = 94;
//
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1206, 78);
- this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.picCheckBox.Location = new System.Drawing.Point(965, 64);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(125, 61);
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 8;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_status;
+ this.layoutControlItem11.Location = new System.Drawing.Point(813, 62);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem11.TextVisible = false;
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.lastUpdateTime;
+ this.layoutControlItem15.Location = new System.Drawing.Point(542, 31);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem15.Text = "鏈�鍚庢洿鏂版椂闂�";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.lastUpdateUser;
+ this.layoutControlItem14.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem14.Text = "鏈�鍚庢洿鏂颁汉";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_billType;
+ this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem5.Text = "鐢宠绫诲瀷";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_remark;
+ this.layoutControlItem7.Location = new System.Drawing.Point(271, 31);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem7.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem7.Text = "鐢宠澶囨敞";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ //
// Frm_Cqsq
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1410, 834);
+ this.ClientSize = new System.Drawing.Size(1128, 682);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_Cqsq";
this.Text = "瓒呮湡妫�楠岀敵璇�";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1190,10 +1149,10 @@
((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_checkByName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateByName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lastUpdateUser.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.lastUpdateTime.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
@@ -1203,11 +1162,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1218,6 +1172,11 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
this.ResumeLayout(false);
}
@@ -1249,7 +1208,7 @@
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_remark;
private DevExpress.XtraEditors.TextEdit txt_checkDate;
- private DevExpress.XtraEditors.TextEdit txt_checkByName;
+ private DevExpress.XtraEditors.TextEdit txt_checkUser;
private DevExpress.XtraEditors.TextEdit txt_billNo;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
@@ -1257,8 +1216,8 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraEditors.TextEdit txt_lastUpdateByName;
- private DevExpress.XtraEditors.TextEdit txt_lastUpdateDate;
+ private DevExpress.XtraEditors.TextEdit lastUpdateUser;
+ private DevExpress.XtraEditors.TextEdit lastUpdateTime;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraEditors.TextEdit txt_guid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.Designer.cs
index c95da94..ee46cd9 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.Designer.cs
@@ -29,35 +29,35 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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.XtraLayout.ColumnDefinition columnDefinition43 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition44 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition45 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition46 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition31 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition32 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition33 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition34 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition35 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition36 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition47 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition48 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition49 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition50 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition37 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition51 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition52 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition38 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition53 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition54 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition55 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition56 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition39 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition40 = 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 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.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ 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.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 rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
@@ -89,7 +89,6 @@
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -106,7 +105,7 @@
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
this.txt_itemId = new DevExpress.XtraEditors.TextEdit();
- this.txt_fcheckByName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_fcheckBy = new DevExpress.XtraEditors.TextEdit();
this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit();
this.txt_fsubmitBy = new DevExpress.XtraEditors.TextEdit();
this.txt_fsubmitDate = new DevExpress.XtraEditors.TextEdit();
@@ -236,6 +235,7 @@
this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -266,7 +266,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckByName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).BeginInit();
@@ -375,10 +375,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ 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;
//
@@ -401,10 +401,9 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1680, 98);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1344, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -412,11 +411,10 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1680, 880);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1344, 720);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -425,9 +423,8 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1678, 842);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1342, 688);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -436,7 +433,6 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -449,19 +445,17 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1678, 842);
+ this.split1.Size = new System.Drawing.Size(1342, 688);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 4;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1678, 781);
+ this.gcMain1.Size = new System.Drawing.Size(1342, 638);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -498,9 +492,8 @@
this.gridColumn5,
this.gridColumn6,
this.gridColumn31});
- this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 62;
+ this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -511,301 +504,291 @@
this.gv_fsubmit.AppearanceCell.Options.UseFont = true;
this.gv_fsubmit.Caption = "瀹℃牳鏍囪瘑";
this.gv_fsubmit.FieldName = "fsubmitTxt";
- this.gv_fsubmit.MinWidth = 37;
+ this.gv_fsubmit.MinWidth = 30;
this.gv_fsubmit.Name = "gv_fsubmit";
this.gv_fsubmit.OptionsColumn.AllowEdit = false;
this.gv_fsubmit.Tag = "query_a.fsubmit";
this.gv_fsubmit.UnboundDataType = typeof(bool);
this.gv_fsubmit.Visible = true;
this.gv_fsubmit.VisibleIndex = 0;
- this.gv_fsubmit.Width = 62;
+ this.gv_fsubmit.Width = 50;
//
// gv_lotNo
//
this.gv_lotNo.AppearanceCell.Options.UseFont = true;
this.gv_lotNo.Caption = "閫佹鎵规";
this.gv_lotNo.FieldName = "lotNo";
- this.gv_lotNo.MinWidth = 37;
+ this.gv_lotNo.MinWidth = 30;
this.gv_lotNo.Name = "gv_lotNo";
this.gv_lotNo.OptionsColumn.AllowEdit = false;
this.gv_lotNo.Tag = "query_a.lot_no";
this.gv_lotNo.Visible = true;
this.gv_lotNo.VisibleIndex = 5;
- this.gv_lotNo.Width = 150;
+ this.gv_lotNo.Width = 120;
//
// gv_releaseNo
//
this.gv_releaseNo.AppearanceCell.Options.UseFont = true;
this.gv_releaseNo.Caption = "妫�楠屽崟鍙�";
this.gv_releaseNo.FieldName = "releaseNo";
- this.gv_releaseNo.MinWidth = 37;
+ this.gv_releaseNo.MinWidth = 30;
this.gv_releaseNo.Name = "gv_releaseNo";
this.gv_releaseNo.OptionsColumn.AllowEdit = false;
this.gv_releaseNo.Tag = "query_a.release_no";
this.gv_releaseNo.Visible = true;
this.gv_releaseNo.VisibleIndex = 1;
- this.gv_releaseNo.Width = 125;
+ this.gv_releaseNo.Width = 100;
//
// gv_itemId
//
this.gv_itemId.AppearanceCell.Options.UseFont = true;
this.gv_itemId.Caption = "鐗╂枡ID";
this.gv_itemId.FieldName = "itemId";
- this.gv_itemId.MinWidth = 37;
+ this.gv_itemId.MinWidth = 30;
this.gv_itemId.Name = "gv_itemId";
this.gv_itemId.OptionsColumn.AllowEdit = false;
this.gv_itemId.Tag = "query_a.item_id";
this.gv_itemId.Visible = true;
this.gv_itemId.VisibleIndex = 6;
- this.gv_itemId.Width = 37;
+ this.gv_itemId.Width = 30;
//
// gv_itemNo
//
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
this.gv_itemNo.FieldName = "itemNo";
- this.gv_itemNo.MinWidth = 37;
+ this.gv_itemNo.MinWidth = 30;
this.gv_itemNo.Name = "gv_itemNo";
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.item_no";
this.gv_itemNo.Visible = true;
this.gv_itemNo.VisibleIndex = 7;
- this.gv_itemNo.Width = 170;
+ this.gv_itemNo.Width = 136;
//
// gv_boardStyle
//
this.gv_boardStyle.AppearanceCell.Options.UseFont = true;
this.gv_boardStyle.Caption = "鐗╂枡鍚嶇О";
this.gv_boardStyle.FieldName = "itemName";
- this.gv_boardStyle.MinWidth = 37;
+ this.gv_boardStyle.MinWidth = 30;
this.gv_boardStyle.Name = "gv_boardStyle";
this.gv_boardStyle.OptionsColumn.AllowEdit = false;
this.gv_boardStyle.Tag = "query_a.board_style";
this.gv_boardStyle.Visible = true;
this.gv_boardStyle.VisibleIndex = 8;
- this.gv_boardStyle.Width = 205;
+ this.gv_boardStyle.Width = 164;
//
// gridColumn14
//
this.gridColumn14.Caption = "鐗╂枡瑙勬牸";
this.gridColumn14.FieldName = "itemModel";
- this.gridColumn14.MinWidth = 37;
+ this.gridColumn14.MinWidth = 30;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 9;
- this.gridColumn14.Width = 250;
+ this.gridColumn14.Width = 200;
//
// gv_fbatchQty
//
this.gv_fbatchQty.AppearanceCell.Options.UseFont = true;
this.gv_fbatchQty.Caption = "鏀惰揣鏁伴噺";
this.gv_fbatchQty.FieldName = "fbatchQty";
- this.gv_fbatchQty.MinWidth = 37;
+ this.gv_fbatchQty.MinWidth = 30;
this.gv_fbatchQty.Name = "gv_fbatchQty";
this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
this.gv_fbatchQty.Visible = true;
this.gv_fbatchQty.VisibleIndex = 10;
- this.gv_fbatchQty.Width = 100;
+ this.gv_fbatchQty.Width = 80;
//
// gv_fcheckResu
//
this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gv_fcheckResu.FieldName = "fcheckResu";
- this.gv_fcheckResu.MinWidth = 37;
+ this.gv_fcheckResu.MinWidth = 30;
this.gv_fcheckResu.Name = "gv_fcheckResu";
this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
this.gv_fcheckResu.Visible = true;
this.gv_fcheckResu.VisibleIndex = 3;
- this.gv_fcheckResu.Width = 62;
+ this.gv_fcheckResu.Width = 50;
//
// gv_remarks
//
this.gv_remarks.AppearanceCell.Options.UseFont = true;
this.gv_remarks.Caption = "澶囨敞璇存槑";
this.gv_remarks.FieldName = "remarks";
- this.gv_remarks.MinWidth = 37;
+ this.gv_remarks.MinWidth = 30;
this.gv_remarks.Name = "gv_remarks";
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
this.gv_remarks.Visible = true;
this.gv_remarks.VisibleIndex = 11;
- this.gv_remarks.Width = 125;
+ this.gv_remarks.Width = 100;
//
// gv_fcheckBy
//
this.gv_fcheckBy.AppearanceCell.Options.UseFont = true;
this.gv_fcheckBy.Caption = "妫�楠屼汉鍛�";
- this.gv_fcheckBy.FieldName = "fcheckByName";
- this.gv_fcheckBy.MinWidth = 37;
+ this.gv_fcheckBy.FieldName = "fcheckBy";
+ this.gv_fcheckBy.MinWidth = 30;
this.gv_fcheckBy.Name = "gv_fcheckBy";
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
this.gv_fcheckBy.VisibleIndex = 12;
- this.gv_fcheckBy.Width = 147;
+ this.gv_fcheckBy.Width = 118;
//
// gv_fcheckDate
//
this.gv_fcheckDate.AppearanceCell.Options.UseFont = true;
this.gv_fcheckDate.Caption = "妫�楠屾棩鏈�";
this.gv_fcheckDate.FieldName = "fcheckDate";
- this.gv_fcheckDate.MinWidth = 37;
+ this.gv_fcheckDate.MinWidth = 30;
this.gv_fcheckDate.Name = "gv_fcheckDate";
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
this.gv_fcheckDate.VisibleIndex = 14;
- this.gv_fcheckDate.Width = 227;
+ this.gv_fcheckDate.Width = 182;
//
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
- this.gv_createBy.FieldName = "createByName";
- this.gv_createBy.MinWidth = 37;
+ this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.MinWidth = 30;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 13;
- this.gv_createBy.Width = 84;
+ this.gv_createBy.Width = 67;
//
// gridColumn15
//
this.gridColumn15.Caption = "鍒涘缓鏃ユ湡";
this.gridColumn15.FieldName = "createDate";
- this.gridColumn15.MinWidth = 31;
+ this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 15;
- this.gridColumn15.Width = 117;
+ this.gridColumn15.Width = 94;
//
// gv_lastupdateBy
//
this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉";
- this.gv_lastupdateBy.FieldName = "lastupdateByName";
- this.gv_lastupdateBy.MinWidth = 37;
+ this.gv_lastupdateBy.FieldName = "lastupdateBy";
+ this.gv_lastupdateBy.MinWidth = 30;
this.gv_lastupdateBy.Name = "gv_lastupdateBy";
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
this.gv_lastupdateBy.Visible = true;
this.gv_lastupdateBy.VisibleIndex = 16;
+ this.gv_lastupdateBy.Width = 60;
//
// gv_lastupdateDate
//
this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
this.gv_lastupdateDate.Caption = "鏈�鍚庢洿鏂版棩鏈�";
this.gv_lastupdateDate.FieldName = "lastupdateDate";
- this.gv_lastupdateDate.MinWidth = 37;
+ this.gv_lastupdateDate.MinWidth = 30;
this.gv_lastupdateDate.Name = "gv_lastupdateDate";
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
this.gv_lastupdateDate.Visible = true;
this.gv_lastupdateDate.VisibleIndex = 17;
- this.gv_lastupdateDate.Width = 150;
+ this.gv_lastupdateDate.Width = 120;
//
// gv_fngHandle
//
this.gv_fngHandle.AppearanceCell.Options.UseFont = true;
this.gv_fngHandle.Caption = "澶勭悊鎰忚";
this.gv_fngHandle.FieldName = "fngHandle";
- this.gv_fngHandle.MinWidth = 37;
+ this.gv_fngHandle.MinWidth = 30;
this.gv_fngHandle.Name = "gv_fngHandle";
this.gv_fngHandle.OptionsColumn.AllowEdit = false;
this.gv_fngHandle.Tag = "query_a.fng_handle";
this.gv_fngHandle.Visible = true;
this.gv_fngHandle.VisibleIndex = 4;
- this.gv_fngHandle.Width = 125;
+ this.gv_fngHandle.Width = 100;
//
// gridColumn18
//
this.gridColumn18.Caption = "瀹℃牳浜�";
this.gridColumn18.FieldName = "fsubmitBy";
- this.gridColumn18.MinWidth = 31;
+ this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 18;
- this.gridColumn18.Width = 117;
+ this.gridColumn18.Width = 94;
//
// gridColumn19
//
this.gridColumn19.Caption = "瀹℃牳鏃ユ湡";
this.gridColumn19.FieldName = "fsubmitDate";
- this.gridColumn19.MinWidth = 31;
+ this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
this.gridColumn19.VisibleIndex = 19;
- this.gridColumn19.Width = 117;
+ this.gridColumn19.Width = 94;
//
// gridColumn17
//
this.gridColumn17.Caption = "涓婚敭Guid";
this.gridColumn17.FieldName = "guid";
- this.gridColumn17.MinWidth = 31;
+ this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
- this.gridColumn17.Width = 117;
+ this.gridColumn17.Width = 94;
//
// gridColumn30
//
this.gridColumn30.Caption = "绫诲瀷";
this.gridColumn30.FieldName = "orderType";
- this.gridColumn30.MinWidth = 31;
+ this.gridColumn30.MinWidth = 25;
this.gridColumn30.Name = "gridColumn30";
- this.gridColumn30.Width = 117;
+ this.gridColumn30.Width = 94;
//
// gridColumn5
//
this.gridColumn5.Caption = "妫�楠岀姸鎬�";
this.gridColumn5.FieldName = "checkStates";
- this.gridColumn5.MinWidth = 31;
+ this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 2;
- this.gridColumn5.Width = 117;
+ this.gridColumn5.Width = 94;
//
// gridColumn6
//
this.gridColumn6.Caption = "鍒ゅ畾缁撴灉";
this.gridColumn6.FieldName = "freceQty";
- this.gridColumn6.MinWidth = 31;
+ this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
- this.gridColumn6.Width = 117;
- //
- // gridColumn31
- //
- this.gridColumn31.Caption = "鍏ュ簱缁勭粐";
- this.gridColumn31.FieldName = "receivingOrg";
- this.gridColumn31.MinWidth = 31;
- this.gridColumn31.Name = "gridColumn31";
- this.gridColumn31.Visible = true;
- this.gridColumn31.VisibleIndex = 20;
- this.gridColumn31.Width = 117;
+ this.gridColumn6.Width = 94;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 781);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+ this.pageBar1.Location = new System.Drawing.Point(0, 638);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1678, 46);
+ this.pageBar1.Size = new System.Drawing.Size(1342, 38);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
- this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1678, 842);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1342, 688);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -813,7 +796,6 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -826,8 +808,8 @@
this.splitMx1.Panel2.Controls.Add(this.xtraTabControl2);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1678, 842);
- this.splitMx1.SplitterPosition = 226;
+ this.splitMx1.Size = new System.Drawing.Size(1342, 688);
+ this.splitMx1.SplitterPosition = 185;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -844,7 +826,7 @@
this.layoutMx1.Controls.Add(this.txt_itemNo);
this.layoutMx1.Controls.Add(this.txt_itemModel);
this.layoutMx1.Controls.Add(this.txt_itemId);
- this.layoutMx1.Controls.Add(this.txt_fcheckByName);
+ this.layoutMx1.Controls.Add(this.txt_fcheckBy);
this.layoutMx1.Controls.Add(this.txt_fbatchQty);
this.layoutMx1.Controls.Add(this.txt_fsubmitBy);
this.layoutMx1.Controls.Add(this.txt_fsubmitDate);
@@ -862,244 +844,222 @@
this.layoutControlItem23,
this.layoutControlItem36});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(609, 530, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1678, 226);
+ this.layoutMx1.Size = new System.Drawing.Size(1342, 185);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// txt_rkCkId
//
this.txt_rkCkId.IsReadly = false;
- this.txt_rkCkId.Location = new System.Drawing.Point(927, 148);
+ this.txt_rkCkId.Location = new System.Drawing.Point(734, 124);
this.txt_rkCkId.Margin = new System.Windows.Forms.Padding(0);
this.txt_rkCkId.Name = "txt_rkCkId";
- this.txt_rkCkId.Size = new System.Drawing.Size(322, 28);
+ this.txt_rkCkId.Size = new System.Drawing.Size(249, 24);
this.txt_rkCkId.TabIndex = 817;
//
// txt_fngDesc
//
this.txt_fngDesc.BtnTxt = "寮傚父鎻忚堪";
- this.txt_fngDesc.Location = new System.Drawing.Point(14, 148);
- this.txt_fngDesc.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.txt_fngDesc.Location = new System.Drawing.Point(12, 124);
this.txt_fngDesc.Name = "txt_fngDesc";
- this.txt_fngDesc.Size = new System.Drawing.Size(822, 64);
+ this.txt_fngDesc.Size = new System.Drawing.Size(646, 52);
this.txt_fngDesc.TabIndex = 815;
this.txt_fngDesc.TextTxt = "";
this.txt_fngDesc.WhereTxt = " a.s_type=\'QC寮傚父鎻忚堪\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(1234, 132);
- this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbGuid.Location = new System.Drawing.Point(987, 108);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(402, 34);
+ this.lbGuid.Size = new System.Drawing.Size(322, 28);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
// txt_remarks
//
- this.txt_remarks.Location = new System.Drawing.Point(101, 114);
- this.txt_remarks.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_remarks.Location = new System.Drawing.Point(84, 96);
this.txt_remarks.Name = "txt_remarks";
this.txt_remarks.Properties.Appearance.Options.UseFont = true;
- this.txt_remarks.Size = new System.Drawing.Size(735, 28);
+ this.txt_remarks.Size = new System.Drawing.Size(574, 24);
this.txt_remarks.StyleController = this.layoutMx1;
this.txt_remarks.TabIndex = 797;
this.txt_remarks.Tag = "readonly";
//
// txt_fcheckResu
//
- this.txt_fcheckResu.Location = new System.Drawing.Point(927, 114);
- this.txt_fcheckResu.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fcheckResu.Location = new System.Drawing.Point(734, 96);
this.txt_fcheckResu.Name = "txt_fcheckResu";
this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
- this.txt_fcheckResu.Size = new System.Drawing.Size(322, 28);
+ 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";
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(101, 46);
- this.txt_itemName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_itemName.Location = new System.Drawing.Point(84, 40);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(322, 28);
+ this.txt_itemName.Size = new System.Drawing.Size(249, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 800;
this.txt_itemName.Tag = "readonly";
//
// txt_releaseNo
//
- this.txt_releaseNo.Location = new System.Drawing.Point(101, 14);
- this.txt_releaseNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_releaseNo.Location = new System.Drawing.Point(84, 12);
this.txt_releaseNo.Name = "txt_releaseNo";
this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
- this.txt_releaseNo.Size = new System.Drawing.Size(322, 28);
+ this.txt_releaseNo.Size = new System.Drawing.Size(249, 24);
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(927, 14);
- this.txt_fcheckDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fcheckDate.Location = new System.Drawing.Point(734, 12);
this.txt_fcheckDate.Name = "txt_fcheckDate";
this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckDate.Size = new System.Drawing.Size(322, 28);
+ this.txt_fcheckDate.Size = new System.Drawing.Size(249, 24);
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(514, 14);
- this.txt_lotNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_lotNo.Location = new System.Drawing.Point(409, 12);
this.txt_lotNo.Name = "txt_lotNo";
this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
- this.txt_lotNo.Size = new System.Drawing.Size(322, 28);
+ this.txt_lotNo.Size = new System.Drawing.Size(249, 24);
this.txt_lotNo.StyleController = this.layoutMx1;
this.txt_lotNo.TabIndex = 262;
this.txt_lotNo.Tag = "readonly";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(101, 80);
- this.txt_itemNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_itemNo.Location = new System.Drawing.Point(84, 68);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(322, 28);
+ this.txt_itemNo.Size = new System.Drawing.Size(249, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 789;
this.txt_itemNo.Tag = "readonly";
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(514, 80);
- this.txt_itemModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_itemModel.Location = new System.Drawing.Point(409, 68);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(322, 28);
+ 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";
//
// txt_itemId
//
- this.txt_itemId.Location = new System.Drawing.Point(105, 171);
- this.txt_itemId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_itemId.Location = new System.Drawing.Point(84, 140);
this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Size = new System.Drawing.Size(311, 28);
+ this.txt_itemId.Size = new System.Drawing.Size(249, 24);
this.txt_itemId.StyleController = this.layoutMx1;
this.txt_itemId.TabIndex = 802;
this.txt_itemId.Tag = "readonly";
//
- // txt_fcheckByName
+ // txt_fcheckBy
//
- this.txt_fcheckByName.Location = new System.Drawing.Point(927, 46);
- this.txt_fcheckByName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_fcheckByName.Name = "txt_fcheckByName";
- this.txt_fcheckByName.Properties.Appearance.Options.UseFont = true;
- this.txt_fcheckByName.Size = new System.Drawing.Size(322, 28);
- this.txt_fcheckByName.StyleController = this.layoutMx1;
- this.txt_fcheckByName.TabIndex = 217;
- this.txt_fcheckByName.Tag = "readonly";
+ this.txt_fcheckBy.Location = new System.Drawing.Point(734, 40);
+ this.txt_fcheckBy.Name = "txt_fcheckBy";
+ this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
+ this.txt_fcheckBy.Size = new System.Drawing.Size(249, 24);
+ 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(514, 46);
- this.txt_fbatchQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fbatchQty.Location = new System.Drawing.Point(409, 40);
this.txt_fbatchQty.Name = "txt_fbatchQty";
this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
- this.txt_fbatchQty.Size = new System.Drawing.Size(322, 28);
+ this.txt_fbatchQty.Size = new System.Drawing.Size(249, 24);
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(1340, 46);
- this.txt_fsubmitBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fsubmitBy.Location = new System.Drawing.Point(1059, 40);
this.txt_fsubmitBy.Name = "txt_fsubmitBy";
- this.txt_fsubmitBy.Size = new System.Drawing.Size(324, 28);
+ 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(1340, 80);
- this.txt_fsubmitDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_fsubmitDate.Location = new System.Drawing.Point(1059, 68);
this.txt_fsubmitDate.Name = "txt_fsubmitDate";
- this.txt_fsubmitDate.Size = new System.Drawing.Size(324, 28);
+ 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(1253, 14);
- this.txt_fsubmit.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ 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(411, 27);
+ 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_guid
//
- this.txt_guid.Location = new System.Drawing.Point(1331, 132);
- this.txt_guid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_guid.Location = new System.Drawing.Point(1065, 108);
this.txt_guid.Name = "txt_guid";
- this.txt_guid.Size = new System.Drawing.Size(305, 28);
+ this.txt_guid.Size = new System.Drawing.Size(244, 24);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 808;
this.txt_guid.Tag = "readonly";
//
// txt_checkStates
//
- this.txt_checkStates.Location = new System.Drawing.Point(927, 80);
- this.txt_checkStates.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_checkStates.Location = new System.Drawing.Point(734, 68);
this.txt_checkStates.Name = "txt_checkStates";
this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
- this.txt_checkStates.Size = new System.Drawing.Size(322, 28);
+ this.txt_checkStates.Size = new System.Drawing.Size(249, 24);
this.txt_checkStates.StyleController = this.layoutMx1;
this.txt_checkStates.TabIndex = 809;
this.txt_checkStates.Tag = "readonly";
//
// txt_freceQty
//
- this.txt_freceQty.Location = new System.Drawing.Point(1342, 125);
- this.txt_freceQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_freceQty.Location = new System.Drawing.Point(1074, 102);
this.txt_freceQty.Name = "txt_freceQty";
this.txt_freceQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_freceQty.Properties.Appearance.Options.UseForeColor = true;
- this.txt_freceQty.Size = new System.Drawing.Size(320, 28);
+ this.txt_freceQty.Size = new System.Drawing.Size(256, 24);
this.txt_freceQty.StyleController = this.layoutMx1;
this.txt_freceQty.TabIndex = 810;
this.txt_freceQty.Tag = "readonly";
//
// txt_aboutGuid
//
- this.txt_aboutGuid.Location = new System.Drawing.Point(1406, 182);
- this.txt_aboutGuid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_aboutGuid.Location = new System.Drawing.Point(1125, 149);
this.txt_aboutGuid.Name = "txt_aboutGuid";
- this.txt_aboutGuid.Size = new System.Drawing.Size(230, 28);
+ this.txt_aboutGuid.Size = new System.Drawing.Size(184, 24);
this.txt_aboutGuid.StyleController = this.layoutMx1;
this.txt_aboutGuid.TabIndex = 816;
//
// txt_receiveOrgId
//
- this.txt_receiveOrgId.Location = new System.Drawing.Point(927, 182);
- this.txt_receiveOrgId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_receiveOrgId.Location = new System.Drawing.Point(734, 152);
this.txt_receiveOrgId.Name = "txt_receiveOrgId";
- this.txt_receiveOrgId.Size = new System.Drawing.Size(322, 28);
+ this.txt_receiveOrgId.Size = new System.Drawing.Size(249, 24);
this.txt_receiveOrgId.StyleController = this.layoutMx1;
this.txt_receiveOrgId.TabIndex = 818;
this.txt_receiveOrgId.Tag = "readonly";
@@ -1124,7 +1084,7 @@
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem7.Size = new System.Drawing.Size(325, 32);
this.layoutControlItem7.Text = "鐗╂枡ID";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 22);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem21
//
@@ -1135,7 +1095,7 @@
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem21.Size = new System.Drawing.Size(326, 32);
this.layoutControlItem21.Text = "涓婚敭GUID";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(62, 24);
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(50, 20);
//
// layoutControlItem23
//
@@ -1146,7 +1106,7 @@
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem23.Size = new System.Drawing.Size(332, 30);
this.layoutControlItem23.Text = "鍒ゅ畾缁撴灉";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 22);
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem36
//
@@ -1157,7 +1117,7 @@
this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 5;
this.layoutControlItem36.Size = new System.Drawing.Size(326, 28);
this.layoutControlItem36.Text = "鐢熶骇閫�鏂欐槑缁咷UID";
- this.layoutControlItem36.TextSize = new System.Drawing.Size(157, 22);
+ this.layoutControlItem36.TextSize = new System.Drawing.Size(126, 18);
//
// Root
//
@@ -1183,39 +1143,39 @@
this.layoutControlItem27});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition43.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition43.Width = 100D;
- columnDefinition44.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition44.Width = 100D;
- columnDefinition45.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition45.Width = 100D;
- columnDefinition46.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition46.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[] {
- columnDefinition43,
- columnDefinition44,
- columnDefinition45,
- columnDefinition46});
- rowDefinition31.Height = 100D;
- rowDefinition31.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition32.Height = 100D;
- rowDefinition32.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition33.Height = 100D;
- rowDefinition33.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition34.Height = 100D;
- rowDefinition34.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition35.Height = 100D;
- rowDefinition35.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition36.Height = 100D;
- rowDefinition36.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;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition31,
- rowDefinition32,
- rowDefinition33,
- rowDefinition34,
- rowDefinition35,
- rowDefinition36});
- this.Root.Size = new System.Drawing.Size(1678, 226);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
+ this.Root.Size = new System.Drawing.Size(1321, 188);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1223,59 +1183,59 @@
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(413, 32);
+ this.layoutControlItem1.Size = new System.Drawing.Size(325, 28);
this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_itemName;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(413, 34);
+ this.layoutControlItem4.Size = new System.Drawing.Size(325, 28);
this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemNo;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 66);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(413, 34);
+ this.layoutControlItem5.Size = new System.Drawing.Size(325, 28);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_fsubmitBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(1239, 32);
+ this.layoutControlItem15.Location = new System.Drawing.Point(975, 28);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(415, 34);
+ this.layoutControlItem15.Size = new System.Drawing.Size(326, 28);
this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fsubmitDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(1239, 66);
+ this.layoutControlItem16.Location = new System.Drawing.Point(975, 56);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(415, 34);
+ this.layoutControlItem16.Size = new System.Drawing.Size(326, 28);
this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fsubmit;
- this.layoutControlItem14.Location = new System.Drawing.Point(1239, 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(415, 32);
+ this.layoutControlItem14.Size = new System.Drawing.Size(326, 28);
this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
@@ -1283,98 +1243,98 @@
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fcheckResu;
- this.layoutControlItem10.Location = new System.Drawing.Point(826, 100);
+ this.layoutControlItem10.Location = new System.Drawing.Point(650, 84);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(413, 34);
+ this.layoutControlItem10.Size = new System.Drawing.Size(325, 28);
this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_checkStates;
- this.layoutControlItem22.Location = new System.Drawing.Point(826, 66);
+ this.layoutControlItem22.Location = new System.Drawing.Point(650, 56);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(413, 34);
+ this.layoutControlItem22.Size = new System.Drawing.Size(325, 28);
this.layoutControlItem22.Text = "妫�楠岀姸鎬�";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
- this.layoutControlItem8.Control = this.txt_fcheckByName;
- this.layoutControlItem8.Location = new System.Drawing.Point(826, 32);
+ this.layoutControlItem8.Control = this.txt_fcheckBy;
+ this.layoutControlItem8.Location = new System.Drawing.Point(650, 28);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(413, 34);
+ this.layoutControlItem8.Size = new System.Drawing.Size(325, 28);
this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fcheckDate;
- this.layoutControlItem2.Location = new System.Drawing.Point(826, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(650, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(413, 32);
+ this.layoutControlItem2.Size = new System.Drawing.Size(325, 28);
this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_lotNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(413, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(325, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(413, 32);
+ this.layoutControlItem3.Size = new System.Drawing.Size(325, 28);
this.layoutControlItem3.Text = "閫佹鎵瑰彿";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fbatchQty;
- this.layoutControlItem9.Location = new System.Drawing.Point(413, 32);
+ this.layoutControlItem9.Location = new System.Drawing.Point(325, 28);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(413, 34);
+ this.layoutControlItem9.Size = new System.Drawing.Size(325, 28);
this.layoutControlItem9.Text = "鏀惰揣鏁伴噺";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_itemModel;
- this.layoutControlItem6.Location = new System.Drawing.Point(413, 66);
+ this.layoutControlItem6.Location = new System.Drawing.Point(325, 56);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(413, 34);
+ this.layoutControlItem6.Size = new System.Drawing.Size(325, 28);
this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_remarks;
- this.layoutControlItem12.Location = new System.Drawing.Point(0, 100);
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 84);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(826, 34);
+ this.layoutControlItem12.Size = new System.Drawing.Size(650, 28);
this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_fngDesc;
- this.layoutControlItem28.Location = new System.Drawing.Point(0, 134);
+ this.layoutControlItem28.Location = new System.Drawing.Point(0, 112);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem28.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem28.Size = new System.Drawing.Size(826, 68);
+ this.layoutControlItem28.Size = new System.Drawing.Size(650, 56);
this.layoutControlItem28.Text = "寮傚父澶囨敞";
this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem28.TextVisible = false;
@@ -1382,33 +1342,32 @@
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_rkCkId;
- this.layoutControlItem25.Location = new System.Drawing.Point(826, 134);
+ this.layoutControlItem25.Location = new System.Drawing.Point(650, 112);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem25.Size = new System.Drawing.Size(413, 34);
+ this.layoutControlItem25.Size = new System.Drawing.Size(325, 28);
this.layoutControlItem25.Text = "鍏ュ簱浠撳簱";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_receiveOrgId;
- this.layoutControlItem27.Location = new System.Drawing.Point(826, 168);
+ this.layoutControlItem27.Location = new System.Drawing.Point(650, 140);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem27.Size = new System.Drawing.Size(413, 34);
+ this.layoutControlItem27.Size = new System.Drawing.Size(325, 28);
this.layoutControlItem27.Text = "閫�鏂欑粍缁�";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(60, 18);
//
// xtraTabControl2
//
this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
- this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
- this.xtraTabControl2.Size = new System.Drawing.Size(1678, 601);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1342, 491);
this.xtraTabControl2.TabIndex = 3;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1419,17 +1378,15 @@
//
this.tabMxPage1.Controls.Add(this.splitMx2);
this.tabMxPage1.Controls.Add(this.panMsg);
- this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1676, 563);
+ this.tabMxPage1.Size = new System.Drawing.Size(1340, 459);
this.tabMxPage1.Text = "鎶芥牱淇℃伅";
//
// splitMx2
//
this.splitMx2.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx2.Horizontal = false;
- this.splitMx2.Location = new System.Drawing.Point(0, 57);
- this.splitMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.splitMx2.Location = new System.Drawing.Point(0, 47);
this.splitMx2.Name = "splitMx2";
//
// splitMx2.Panel1
@@ -1441,19 +1398,17 @@
//
this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
this.splitMx2.Panel2.Text = "Panel2";
- this.splitMx2.Size = new System.Drawing.Size(1676, 506);
- this.splitMx2.SplitterPosition = 351;
+ this.splitMx2.Size = new System.Drawing.Size(1340, 412);
+ this.splitMx2.SplitterPosition = 287;
this.splitMx2.TabIndex = 3;
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1676, 351);
+ this.gcMx1.Size = new System.Drawing.Size(1340, 287);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1462,7 +1417,7 @@
//
this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx1.ColumnPanelRowHeight = 61;
+ this.gvMx1.ColumnPanelRowHeight = 50;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1fcheckItem,
@@ -1481,7 +1436,6 @@
this.gvMx1sampleSizeNo,
this.gvMx1fcheckLevel,
this.gvMx1facLevel});
- this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1493,127 +1447,129 @@
this.gvMx1guid.AppearanceCell.Options.UseFont = true;
this.gvMx1guid.Caption = "guid涓嶈兘鍒犻櫎";
this.gvMx1guid.FieldName = "guid";
- this.gvMx1guid.MinWidth = 62;
+ this.gvMx1guid.MinWidth = 50;
this.gvMx1guid.Name = "gvMx1guid";
this.gvMx1guid.Tag = "query_a.guid";
- this.gvMx1guid.Width = 117;
+ this.gvMx1guid.Width = 94;
//
// gvMx1fcheckItem
//
this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
this.gvMx1fcheckItem.FieldName = "fcheckItem";
- this.gvMx1fcheckItem.MinWidth = 62;
+ this.gvMx1fcheckItem.MinWidth = 50;
this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
this.gvMx1fcheckItem.Tag = "query_a.fcheck_item";
this.gvMx1fcheckItem.Visible = true;
this.gvMx1fcheckItem.VisibleIndex = 0;
- this.gvMx1fcheckItem.Width = 150;
+ this.gvMx1fcheckItem.Width = 120;
//
// gvMx1fcheckTool
//
this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
this.gvMx1fcheckTool.FieldName = "fcheckTool";
- this.gvMx1fcheckTool.MinWidth = 62;
+ this.gvMx1fcheckTool.MinWidth = 50;
this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
this.gvMx1fcheckTool.Tag = "query_a.fcheck_tool";
this.gvMx1fcheckTool.Visible = true;
this.gvMx1fcheckTool.VisibleIndex = 1;
- this.gvMx1fcheckTool.Width = 125;
+ this.gvMx1fcheckTool.Width = 100;
//
// gvMx1fcheckItemDesc
//
this.gvMx1fcheckItemDesc.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckItemDesc.Caption = "妫�楠岄」鐩弿杩�";
this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
- this.gvMx1fcheckItemDesc.MinWidth = 62;
+ this.gvMx1fcheckItemDesc.MinWidth = 50;
this.gvMx1fcheckItemDesc.Name = "gvMx1fcheckItemDesc";
this.gvMx1fcheckItemDesc.OptionsEditForm.Visible = DevExpress.Utils.DefaultBoolean.False;
this.gvMx1fcheckItemDesc.Tag = "query_a.fcheck_item_desc";
- this.gvMx1fcheckItemDesc.Width = 150;
+ this.gvMx1fcheckItemDesc.Width = 120;
//
// gvMx1fspecRequ
//
this.gvMx1fspecRequ.AppearanceCell.Options.UseFont = true;
this.gvMx1fspecRequ.Caption = "瑙勬牸瑕佹眰";
this.gvMx1fspecRequ.FieldName = "fspecRequ";
- this.gvMx1fspecRequ.MinWidth = 62;
+ this.gvMx1fspecRequ.MinWidth = 50;
this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
this.gvMx1fspecRequ.Visible = true;
this.gvMx1fspecRequ.VisibleIndex = 2;
- this.gvMx1fspecRequ.Width = 150;
+ this.gvMx1fspecRequ.Width = 120;
//
// gvMx1fupAllow
//
this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fupAllow.Caption = "涓婇檺";
this.gvMx1fupAllow.FieldName = "fupAllow";
- this.gvMx1fupAllow.MinWidth = 62;
+ this.gvMx1fupAllow.MinWidth = 50;
this.gvMx1fupAllow.Name = "gvMx1fupAllow";
this.gvMx1fupAllow.Tag = "query_a.fup_allow";
this.gvMx1fupAllow.Visible = true;
this.gvMx1fupAllow.VisibleIndex = 3;
- this.gvMx1fupAllow.Width = 62;
+ this.gvMx1fupAllow.Width = 50;
//
// gvMx1fstand
//
this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
this.gvMx1fstand.Caption = "鏍囧噯鍊�";
this.gvMx1fstand.FieldName = "fstand";
- this.gvMx1fstand.MinWidth = 62;
+ this.gvMx1fstand.MinWidth = 50;
this.gvMx1fstand.Name = "gvMx1fstand";
this.gvMx1fstand.Tag = "query_a.fstand";
this.gvMx1fstand.Visible = true;
this.gvMx1fstand.VisibleIndex = 4;
- this.gvMx1fstand.Width = 87;
+ this.gvMx1fstand.Width = 70;
//
// gvMx1fdownAllow
//
this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
this.gvMx1fdownAllow.Caption = "涓嬮檺";
this.gvMx1fdownAllow.FieldName = "fdownAllow";
- this.gvMx1fdownAllow.MinWidth = 62;
+ this.gvMx1fdownAllow.MinWidth = 50;
this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
this.gvMx1fdownAllow.Tag = "query_a.fdown_allow";
this.gvMx1fdownAllow.Visible = true;
this.gvMx1fdownAllow.VisibleIndex = 5;
- this.gvMx1fdownAllow.Width = 62;
+ this.gvMx1fdownAllow.Width = 50;
//
// gvMx1freQty
//
this.gvMx1freQty.AppearanceCell.Options.UseFont = true;
this.gvMx1freQty.Caption = "RE鏁伴噺";
this.gvMx1freQty.FieldName = "freQty";
- this.gvMx1freQty.MinWidth = 62;
+ this.gvMx1freQty.MinWidth = 50;
this.gvMx1freQty.Name = "gvMx1freQty";
this.gvMx1freQty.Tag = "query_a.fre_qty";
this.gvMx1freQty.Visible = true;
this.gvMx1freQty.VisibleIndex = 6;
- this.gvMx1freQty.Width = 62;
+ this.gvMx1freQty.Width = 50;
//
// gvMx1checkQyt
//
this.gvMx1checkQyt.AppearanceCell.Options.UseFont = true;
this.gvMx1checkQyt.Caption = "鎶芥鏁伴噺";
this.gvMx1checkQyt.FieldName = "checkQyt";
- this.gvMx1checkQyt.MinWidth = 62;
+ this.gvMx1checkQyt.MinWidth = 50;
this.gvMx1checkQyt.Name = "gvMx1checkQyt";
this.gvMx1checkQyt.Tag = "query_a.check_qyt";
this.gvMx1checkQyt.Visible = true;
this.gvMx1checkQyt.VisibleIndex = 7;
+ this.gvMx1checkQyt.Width = 60;
//
// gvMx1fenterQty
//
this.gvMx1fenterQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fenterQty.Caption = "宸插綍鍏ユ暟閲�";
this.gvMx1fenterQty.FieldName = "fenterQty";
- this.gvMx1fenterQty.MinWidth = 75;
+ this.gvMx1fenterQty.MinWidth = 60;
this.gvMx1fenterQty.Name = "gvMx1fenterQty";
this.gvMx1fenterQty.Tag = "query_a.fenter_qty";
this.gvMx1fenterQty.Visible = true;
this.gvMx1fenterQty.VisibleIndex = 8;
+ this.gvMx1fenterQty.Width = 60;
//
// gvMx1fcheckResu
//
@@ -1624,78 +1580,77 @@
this.gvMx1fcheckResu.AppearanceHeader.Options.UseForeColor = true;
this.gvMx1fcheckResu.Caption = "妫�楠岀粨鏋�";
this.gvMx1fcheckResu.FieldName = "fcheckResu";
- this.gvMx1fcheckResu.MinWidth = 62;
+ this.gvMx1fcheckResu.MinWidth = 50;
this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
this.gvMx1fcheckResu.Visible = true;
this.gvMx1fcheckResu.VisibleIndex = 9;
- this.gvMx1fcheckResu.Width = 117;
+ this.gvMx1fcheckResu.Width = 94;
//
// gvMx1fngRate
//
this.gvMx1fngRate.AppearanceCell.Options.UseFont = true;
this.gvMx1fngRate.Caption = "涓嶈壇鐜�";
this.gvMx1fngRate.FieldName = "fngRateName";
- this.gvMx1fngRate.MinWidth = 62;
+ this.gvMx1fngRate.MinWidth = 50;
this.gvMx1fngRate.Name = "gvMx1fngRate";
this.gvMx1fngRate.Tag = "query_a.fng_rate";
this.gvMx1fngRate.Visible = true;
this.gvMx1fngRate.VisibleIndex = 10;
- this.gvMx1fngRate.Width = 117;
+ this.gvMx1fngRate.Width = 94;
//
// gvMx1fngQty
//
this.gvMx1fngQty.AppearanceCell.Options.UseFont = true;
this.gvMx1fngQty.Caption = "涓嶅悎鏍兼暟";
this.gvMx1fngQty.FieldName = "fngQty";
- this.gvMx1fngQty.MinWidth = 62;
+ this.gvMx1fngQty.MinWidth = 50;
this.gvMx1fngQty.Name = "gvMx1fngQty";
this.gvMx1fngQty.Tag = "query_a.fng_qty";
this.gvMx1fngQty.Visible = true;
this.gvMx1fngQty.VisibleIndex = 11;
- this.gvMx1fngQty.Width = 62;
+ this.gvMx1fngQty.Width = 50;
//
// gvMx1sampleSizeNo
//
this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣鍑嗙紪鐮�";
this.gvMx1sampleSizeNo.FieldName = "sampleSizeNo";
- this.gvMx1sampleSizeNo.MinWidth = 62;
+ this.gvMx1sampleSizeNo.MinWidth = 50;
this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
this.gvMx1sampleSizeNo.Visible = true;
this.gvMx1sampleSizeNo.VisibleIndex = 12;
- this.gvMx1sampleSizeNo.Width = 250;
+ this.gvMx1sampleSizeNo.Width = 200;
//
// gvMx1fcheckLevel
//
this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
- this.gvMx1fcheckLevel.MinWidth = 62;
+ this.gvMx1fcheckLevel.MinWidth = 50;
this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
this.gvMx1fcheckLevel.Visible = true;
this.gvMx1fcheckLevel.VisibleIndex = 13;
- this.gvMx1fcheckLevel.Width = 250;
+ this.gvMx1fcheckLevel.Width = 200;
//
// gvMx1facLevel
//
this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
this.gvMx1facLevel.Caption = "鎷掓敹姘村钩";
this.gvMx1facLevel.FieldName = "facLevel";
- this.gvMx1facLevel.MinWidth = 62;
+ this.gvMx1facLevel.MinWidth = 50;
this.gvMx1facLevel.Name = "gvMx1facLevel";
this.gvMx1facLevel.Tag = "query_a.fac_level";
this.gvMx1facLevel.Visible = true;
this.gvMx1facLevel.VisibleIndex = 14;
- this.gvMx1facLevel.Width = 250;
+ this.gvMx1facLevel.Width = 200;
//
// splitYangLi
//
this.splitYangLi.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitYangLi.Location = new System.Drawing.Point(0, 0);
- this.splitYangLi.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitYangLi.Name = "splitYangLi";
//
// splitYangLi.Panel1
@@ -1707,8 +1662,8 @@
//
this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
this.splitYangLi.Panel2.Text = "Panel2";
- this.splitYangLi.Size = new System.Drawing.Size(1676, 140);
- this.splitYangLi.SplitterPosition = 845;
+ this.splitYangLi.Size = new System.Drawing.Size(1340, 113);
+ this.splitYangLi.SplitterPosition = 676;
this.splitYangLi.TabIndex = 4;
//
// groupControl1
@@ -1716,21 +1671,18 @@
this.groupControl1.Controls.Add(this.gcMx2);
this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl1.Location = new System.Drawing.Point(0, 0);
- this.groupControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupControl1.Name = "groupControl1";
- this.groupControl1.Size = new System.Drawing.Size(845, 140);
+ this.groupControl1.Size = new System.Drawing.Size(676, 113);
this.groupControl1.TabIndex = 3;
this.groupControl1.Text = "妫�娴嬬粨鏋�";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.gcMx2.Location = new System.Drawing.Point(2, 34);
+ this.gcMx2.Location = new System.Drawing.Point(2, 28);
this.gcMx2.MainView = this.gvMx2;
- this.gcMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(841, 104);
+ this.gcMx2.Size = new System.Drawing.Size(672, 83);
this.gcMx2.TabIndex = 0;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1745,7 +1697,6 @@
this.gridColumn20,
this.gridColumn21,
this.gridColumn25});
- this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
//
@@ -1753,86 +1704,83 @@
//
this.gridColumn4.Caption = "guid涓嶈兘鍒犻櫎";
this.gridColumn4.FieldName = "guid";
- this.gridColumn4.MinWidth = 31;
+ this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
- this.gridColumn4.Width = 117;
+ this.gridColumn4.Width = 94;
//
// gridColumn3
//
this.gridColumn3.Caption = "椤圭洰";
this.gridColumn3.FieldName = "fcheckItem";
- this.gridColumn3.MaxWidth = 240;
- this.gridColumn3.MinWidth = 31;
+ this.gridColumn3.MaxWidth = 192;
+ this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 0;
- this.gridColumn3.Width = 240;
+ this.gridColumn3.Width = 192;
//
// gridColumn2
//
this.gridColumn2.Caption = "鎶芥缁撴灉";
this.gridColumn2.FieldName = "fcheckResu";
- this.gridColumn2.MaxWidth = 100;
- this.gridColumn2.MinWidth = 31;
+ this.gridColumn2.MaxWidth = 80;
+ this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.ReadOnly = true;
- this.gridColumn2.Width = 100;
+ this.gridColumn2.Width = 80;
//
// gridColumn20
//
this.gridColumn20.Caption = "鍒ゅ畾鏍囧織";
this.gridColumn20.FieldName = "fstand";
- this.gridColumn20.MinWidth = 31;
+ this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.OptionsColumn.ReadOnly = true;
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 1;
- this.gridColumn20.Width = 117;
+ this.gridColumn20.Width = 94;
//
// gridColumn21
//
this.gridColumn21.Caption = "鎿嶄綔浜�";
- this.gridColumn21.FieldName = "createByName";
- this.gridColumn21.MinWidth = 31;
+ this.gridColumn21.FieldName = "createBy";
+ this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.OptionsColumn.ReadOnly = true;
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 2;
- this.gridColumn21.Width = 117;
+ this.gridColumn21.Width = 94;
//
// gridColumn25
//
this.gridColumn25.Caption = "鎿嶄綔鏃堕棿";
this.gridColumn25.FieldName = "createDate";
- this.gridColumn25.MinWidth = 31;
+ this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.OptionsColumn.ReadOnly = true;
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 3;
- this.gridColumn25.Width = 117;
+ this.gridColumn25.Width = 94;
//
// groupControl2
//
this.groupControl2.Controls.Add(this.gcMx3);
this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupControl2.Location = new System.Drawing.Point(0, 0);
- this.groupControl2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupControl2.Name = "groupControl2";
- this.groupControl2.Size = new System.Drawing.Size(816, 140);
+ this.groupControl2.Size = new System.Drawing.Size(652, 113);
this.groupControl2.TabIndex = 4;
this.groupControl2.Text = "鏍锋湰缁撴灉";
//
// gcMx3
//
this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.gcMx3.Location = new System.Drawing.Point(2, 34);
+ this.gcMx3.Location = new System.Drawing.Point(2, 28);
this.gcMx3.MainView = this.gvMx3;
- this.gcMx3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx3.Name = "gcMx3";
- this.gcMx3.Size = new System.Drawing.Size(812, 104);
+ this.gcMx3.Size = new System.Drawing.Size(648, 83);
this.gcMx3.TabIndex = 0;
this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx3});
@@ -1848,7 +1796,6 @@
this.gridColumn24,
this.gridColumn26,
this.gridColumn27});
- this.gvMx3.DetailHeight = 428;
this.gvMx3.GridControl = this.gcMx3;
this.gvMx3.Name = "gvMx3";
//
@@ -1856,86 +1803,85 @@
//
this.gridColumn1.Caption = "guid涓嶈兘鍒犻櫎";
this.gridColumn1.FieldName = "guid";
- this.gridColumn1.MinWidth = 31;
+ this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.OptionsColumn.ReadOnly = true;
- this.gridColumn1.Width = 117;
+ this.gridColumn1.Width = 94;
//
// gridColumn22
//
this.gridColumn22.Caption = "椤圭洰";
this.gridColumn22.FieldName = "fcheckItemd5";
- this.gridColumn22.MaxWidth = 240;
- this.gridColumn22.MinWidth = 31;
+ this.gridColumn22.MaxWidth = 192;
+ this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.OptionsColumn.ReadOnly = true;
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 0;
- this.gridColumn22.Width = 240;
+ this.gridColumn22.Width = 192;
//
// gridColumn28
//
this.gridColumn28.Caption = "鏍锋湰搴�";
this.gridColumn28.FieldName = "fcheckItem";
- this.gridColumn28.MinWidth = 31;
+ this.gridColumn28.MinWidth = 25;
this.gridColumn28.Name = "gridColumn28";
this.gridColumn28.OptionsColumn.ReadOnly = true;
this.gridColumn28.Visible = true;
this.gridColumn28.VisibleIndex = 1;
- this.gridColumn28.Width = 117;
+ this.gridColumn28.Width = 94;
//
// gridColumn29
//
this.gridColumn29.Caption = "鏍锋湰鍊�";
this.gridColumn29.FieldName = "fcheckResu";
- this.gridColumn29.MinWidth = 31;
+ this.gridColumn29.MinWidth = 25;
this.gridColumn29.Name = "gridColumn29";
this.gridColumn29.OptionsColumn.ReadOnly = true;
this.gridColumn29.Visible = true;
this.gridColumn29.VisibleIndex = 2;
- this.gridColumn29.Width = 117;
+ this.gridColumn29.Width = 94;
//
// gridColumn24
//
this.gridColumn24.Caption = "鍒ゅ畾鏍囧織";
this.gridColumn24.FieldName = "fstand";
- this.gridColumn24.MinWidth = 31;
+ this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.OptionsColumn.ReadOnly = true;
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 3;
- this.gridColumn24.Width = 117;
+ this.gridColumn24.Width = 94;
//
// gridColumn26
//
this.gridColumn26.Caption = "鎿嶄綔浜�";
this.gridColumn26.FieldName = "createBy";
- this.gridColumn26.MinWidth = 31;
+ this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.OptionsColumn.ReadOnly = true;
this.gridColumn26.Visible = true;
this.gridColumn26.VisibleIndex = 4;
- this.gridColumn26.Width = 117;
+ this.gridColumn26.Width = 94;
//
// gridColumn27
//
this.gridColumn27.Caption = "鎿嶄綔鏃堕棿";
this.gridColumn27.FieldName = "createDate";
- this.gridColumn27.MinWidth = 31;
+ this.gridColumn27.MinWidth = 25;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.OptionsColumn.ReadOnly = true;
this.gridColumn27.Visible = true;
this.gridColumn27.VisibleIndex = 5;
- this.gridColumn27.Width = 117;
+ this.gridColumn27.Width = 94;
//
// panMsg
//
this.panMsg.Controls.Add(this.layoutMxMsg);
this.panMsg.Dock = System.Windows.Forms.DockStyle.Top;
this.panMsg.Location = new System.Drawing.Point(0, 0);
- this.panMsg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panMsg.Name = "panMsg";
- this.panMsg.Size = new System.Drawing.Size(1676, 57);
+ this.panMsg.Size = new System.Drawing.Size(1340, 47);
this.panMsg.TabIndex = 1;
//
// layoutMxMsg
@@ -1945,21 +1891,19 @@
this.layoutMxMsg.Controls.Add(this.txtJianYan);
this.layoutMxMsg.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMxMsg.Location = new System.Drawing.Point(2, 2);
- this.layoutMxMsg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMxMsg.Name = "layoutMxMsg";
this.layoutMxMsg.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(348, 385, 812, 500);
this.layoutMxMsg.Root = this.layoutControlGroup1;
- this.layoutMxMsg.Size = new System.Drawing.Size(1672, 53);
+ this.layoutMxMsg.Size = new System.Drawing.Size(1336, 43);
this.layoutMxMsg.TabIndex = 0;
this.layoutMxMsg.Text = "layoutControl1";
//
// btnIpt
//
this.btnIpt.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.calculatenow_32x32;
- this.btnIpt.Location = new System.Drawing.Point(1537, 2);
- this.btnIpt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnIpt.Location = new System.Drawing.Point(1228, 2);
this.btnIpt.Name = "btnIpt";
- this.btnIpt.Size = new System.Drawing.Size(133, 45);
+ this.btnIpt.Size = new System.Drawing.Size(106, 36);
this.btnIpt.StyleController = this.layoutMxMsg;
this.btnIpt.TabIndex = 4;
this.btnIpt.Text = "鏍锋湰绠＄悊";
@@ -1967,22 +1911,20 @@
// btnLoad
//
this.btnLoad.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.refresh_32x321;
- this.btnLoad.Location = new System.Drawing.Point(1330, 2);
- this.btnLoad.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnLoad.Location = new System.Drawing.Point(1062, 2);
this.btnLoad.Name = "btnLoad";
- this.btnLoad.Size = new System.Drawing.Size(203, 45);
+ this.btnLoad.Size = new System.Drawing.Size(162, 36);
this.btnLoad.StyleController = this.layoutMxMsg;
this.btnLoad.TabIndex = 3;
this.btnLoad.Text = "閲嶆柊鍔犺浇妫�楠岄」鐩�";
//
// txtJianYan
//
- this.txtJianYan.Location = new System.Drawing.Point(268, 2);
- this.txtJianYan.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtJianYan.Location = new System.Drawing.Point(221, 2);
this.txtJianYan.Name = "txtJianYan";
this.txtJianYan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
this.txtJianYan.Properties.Appearance.Options.UseFont = true;
- this.txtJianYan.Size = new System.Drawing.Size(753, 42);
+ this.txtJianYan.Size = new System.Drawing.Size(594, 36);
this.txtJianYan.StyleController = this.layoutMxMsg;
this.txtJianYan.TabIndex = 2;
//
@@ -1996,25 +1938,25 @@
this.layoutControlItem19});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition47.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition47.Width = 100D;
- columnDefinition48.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition48.Width = 100D;
- columnDefinition49.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition49.Width = 100D;
- columnDefinition50.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition50.Width = 137D;
+ 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[] {
- columnDefinition47,
- columnDefinition48,
- columnDefinition49,
- columnDefinition50});
- rowDefinition37.Height = 100D;
- rowDefinition37.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition37});
+ rowDefinition7});
this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup1.Size = new System.Drawing.Size(1672, 53);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem11
@@ -2024,20 +1966,20 @@
this.layoutControlItem11.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(1023, 53);
+ this.layoutControlItem11.Size = new System.Drawing.Size(817, 43);
this.layoutControlItem11.Text = "褰曞叆妫�楠岀粨鏋滐紙OK-19,NG-19锛�";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(251, 22);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(207, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
this.layoutControlItem20.Control = this.btnIpt;
- this.layoutControlItem20.Location = new System.Drawing.Point(1535, 0);
- this.layoutControlItem20.MaxSize = new System.Drawing.Size(137, 49);
- this.layoutControlItem20.MinSize = new System.Drawing.Size(137, 49);
+ this.layoutControlItem20.Location = new System.Drawing.Point(1226, 0);
+ this.layoutControlItem20.MaxSize = new System.Drawing.Size(110, 40);
+ this.layoutControlItem20.MinSize = new System.Drawing.Size(110, 40);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(137, 53);
+ this.layoutControlItem20.Size = new System.Drawing.Size(110, 43);
this.layoutControlItem20.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem20.Text = "鏍锋湰绠＄悊";
this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
@@ -2047,12 +1989,12 @@
//
this.layoutControlItem19.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
this.layoutControlItem19.Control = this.btnLoad;
- this.layoutControlItem19.Location = new System.Drawing.Point(1023, 0);
- this.layoutControlItem19.MaxSize = new System.Drawing.Size(207, 49);
- this.layoutControlItem19.MinSize = new System.Drawing.Size(207, 49);
+ this.layoutControlItem19.Location = new System.Drawing.Point(817, 0);
+ this.layoutControlItem19.MaxSize = new System.Drawing.Size(166, 40);
+ this.layoutControlItem19.MinSize = new System.Drawing.Size(166, 40);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem19.Size = new System.Drawing.Size(512, 53);
+ this.layoutControlItem19.Size = new System.Drawing.Size(409, 43);
this.layoutControlItem19.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem19.Text = "閲嶆柊鍔犺浇";
this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
@@ -2061,28 +2003,25 @@
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.ucUpFileList1);
- this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1676, 558);
+ this.tabMxPage2.Size = new System.Drawing.Size(1340, 459);
this.tabMxPage2.Text = "闄勪欢淇℃伅";
//
// ucUpFileList1
//
this.ucUpFileList1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ucUpFileList1.Location = new System.Drawing.Point(0, 0);
- this.ucUpFileList1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.ucUpFileList1.Name = "ucUpFileList1";
this.ucUpFileList1.parentGroup = null;
this.ucUpFileList1.pGuid = null;
- this.ucUpFileList1.Size = new System.Drawing.Size(1676, 558);
+ this.ucUpFileList1.Size = new System.Drawing.Size(1340, 459);
this.ucUpFileList1.TabIndex = 0;
//
// tabMxPage3
//
this.tabMxPage3.Controls.Add(this.split99);
- this.tabMxPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage3.Name = "tabMxPage3";
- this.tabMxPage3.Size = new System.Drawing.Size(1676, 563);
+ this.tabMxPage3.Size = new System.Drawing.Size(1340, 459);
this.tabMxPage3.Text = "鎵撳嵃鏉＄爜";
//
// split99
@@ -2090,7 +2029,6 @@
this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
this.split99.Horizontal = false;
this.split99.Location = new System.Drawing.Point(0, 0);
- this.split99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.split99.Name = "split99";
//
// split99.Panel1
@@ -2103,8 +2041,8 @@
this.split99.Panel2.Controls.Add(this.gcMx8);
this.split99.Panel2.Text = "Panel2";
this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split99.Size = new System.Drawing.Size(1676, 563);
- this.split99.SplitterPosition = 126;
+ this.split99.Size = new System.Drawing.Size(1340, 459);
+ this.split99.SplitterPosition = 103;
this.split99.TabIndex = 3;
//
// layout99
@@ -2118,11 +2056,10 @@
this.layout99.Controls.Add(this.txtYdy);
this.layout99.Dock = System.Windows.Forms.DockStyle.Fill;
this.layout99.Location = new System.Drawing.Point(0, 0);
- this.layout99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layout99.Name = "layout99";
this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(383, 617, 812, 500);
this.layout99.Root = this.layoutControlGroup3;
- this.layout99.Size = new System.Drawing.Size(1676, 126);
+ this.layout99.Size = new System.Drawing.Size(1340, 103);
this.layout99.TabIndex = 0;
this.layout99.Text = "layoutControl1";
//
@@ -2130,32 +2067,29 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(427, 65);
- this.layoutControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.layoutControl1.Location = new System.Drawing.Point(352, 53);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(409, 47);
+ this.layoutControl1.Size = new System.Drawing.Size(336, 38);
this.layoutControl1.TabIndex = 475;
this.layoutControl1.Text = "layoutControl1";
//
// txt_iCount_1
//
- this.txt_iCount_1.Location = new System.Drawing.Point(125, 2);
- this.txt_iCount_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(77, 28);
+ this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
this.txt_iCount_1.StyleController = this.layoutControl1;
this.txt_iCount_1.TabIndex = 228;
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(329, 2);
- this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2);
this.txt_yuliang_1.Name = "txt_yuliang_1";
this.txt_yuliang_1.Properties.ReadOnly = true;
- this.txt_yuliang_1.Size = new System.Drawing.Size(78, 28);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
this.txt_yuliang_1.StyleController = this.layoutControl1;
this.txt_yuliang_1.TabIndex = 229;
//
@@ -2168,19 +2102,19 @@
this.layoutControlItem31});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "layoutControlGroup2";
- columnDefinition51.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition51.Width = 100D;
- columnDefinition52.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition52.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition51,
- columnDefinition52});
- rowDefinition38.Height = 100D;
- rowDefinition38.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9,
+ columnDefinition10});
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition38});
+ rowDefinition8});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(409, 47);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 38);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem30
@@ -2188,23 +2122,23 @@
this.layoutControlItem30.Control = this.txt_iCount_1;
this.layoutControlItem30.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem30.Name = "layoutControlItem30";
- this.layoutControlItem30.Size = new System.Drawing.Size(204, 47);
+ this.layoutControlItem30.Size = new System.Drawing.Size(168, 38);
this.layoutControlItem30.Text = "鎵撳嵃鏁村紶鏁板��";
- this.layoutControlItem30.TextSize = new System.Drawing.Size(108, 22);
+ this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem31
//
this.layoutControlItem31.Control = this.txt_yuliang_1;
- this.layoutControlItem31.Location = new System.Drawing.Point(204, 0);
+ this.layoutControlItem31.Location = new System.Drawing.Point(168, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem31.Size = new System.Drawing.Size(205, 47);
+ this.layoutControlItem31.Size = new System.Drawing.Size(168, 38);
this.layoutControlItem31.Text = "鎵撳嵃浣欐暟";
- this.layoutControlItem31.TextSize = new System.Drawing.Size(108, 22);
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(1251, 12);
+ this.radOut.Location = new System.Drawing.Point(1030, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2213,7 +2147,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(413, 51);
+ this.radOut.Size = new System.Drawing.Size(340, 41);
this.radOut.StyleController = this.layout99;
this.radOut.TabIndex = 474;
//
@@ -2221,55 +2155,51 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1253, 65);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 53);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(409, 47);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(336, 38);
this.ucBtnPrint1.TabIndex = 231;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(963, 65);
- this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(794, 53);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(286, 28);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
this.txt_psnQty_1.StyleController = this.layout99;
this.txt_psnQty_1.TabIndex = 226;
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(963, 14);
- this.txt_kQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_kQty.Location = new System.Drawing.Point(794, 12);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(286, 28);
+ this.txt_kQty.Size = new System.Drawing.Size(234, 24);
this.txt_kQty.StyleController = this.layout99;
this.txt_kQty.TabIndex = 224;
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(137, 14);
- this.txtQuantity.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtQuantity.Location = new System.Drawing.Point(114, 12);
this.txtQuantity.Name = "txtQuantity";
this.txtQuantity.Properties.Appearance.Options.UseFont = true;
this.txtQuantity.Properties.ReadOnly = true;
- this.txtQuantity.Size = new System.Drawing.Size(286, 28);
+ this.txtQuantity.Size = new System.Drawing.Size(234, 24);
this.txtQuantity.StyleController = this.layout99;
this.txtQuantity.TabIndex = 220;
//
// txtYdy
//
- this.txtYdy.Location = new System.Drawing.Point(550, 14);
- this.txtYdy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtYdy.Location = new System.Drawing.Point(454, 12);
this.txtYdy.Name = "txtYdy";
this.txtYdy.Properties.Appearance.Options.UseFont = true;
this.txtYdy.Properties.ReadOnly = true;
- this.txtYdy.Size = new System.Drawing.Size(286, 28);
+ this.txtYdy.Size = new System.Drawing.Size(234, 24);
this.txtYdy.StyleController = this.layout99;
this.txtYdy.TabIndex = 222;
//
@@ -2287,58 +2217,58 @@
this.layoutControlItem24});
this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup3.Name = "Root";
- columnDefinition53.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition53.Width = 100D;
- columnDefinition54.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition54.Width = 100D;
- columnDefinition55.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition55.Width = 100D;
- columnDefinition56.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition56.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.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition53,
- columnDefinition54,
- columnDefinition55,
- columnDefinition56});
- rowDefinition39.Height = 100D;
- rowDefinition39.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition40.Height = 100D;
- rowDefinition40.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11,
+ columnDefinition12,
+ columnDefinition13,
+ columnDefinition14});
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition39,
- rowDefinition40});
- this.layoutControlGroup3.Size = new System.Drawing.Size(1676, 126);
+ rowDefinition9,
+ rowDefinition10});
+ this.layoutControlGroup3.Size = new System.Drawing.Size(1380, 103);
this.layoutControlGroup3.TextVisible = false;
//
// layoutControlItem29
//
this.layoutControlItem29.Control = this.txt_kQty;
- this.layoutControlItem29.Location = new System.Drawing.Point(826, 0);
+ this.layoutControlItem29.Location = new System.Drawing.Point(680, 0);
this.layoutControlItem29.Name = "layoutControlItem24";
this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem29.Size = new System.Drawing.Size(413, 51);
+ this.layoutControlItem29.Size = new System.Drawing.Size(340, 41);
this.layoutControlItem29.Text = "鍙墦鍗版�绘暟";
- this.layoutControlItem29.TextSize = new System.Drawing.Size(108, 22);
+ this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.txt_psnQty_1;
- this.layoutControlItem32.Location = new System.Drawing.Point(826, 51);
+ this.layoutControlItem32.Location = new System.Drawing.Point(680, 41);
this.layoutControlItem32.Name = "layoutControlItem25";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem32.Size = new System.Drawing.Size(413, 51);
+ this.layoutControlItem32.Size = new System.Drawing.Size(340, 42);
this.layoutControlItem32.Text = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem32.TextSize = new System.Drawing.Size(108, 22);
+ this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem33
//
this.layoutControlItem33.Control = this.ucBtnPrint1;
- this.layoutControlItem33.Location = new System.Drawing.Point(1239, 51);
+ this.layoutControlItem33.Location = new System.Drawing.Point(1020, 41);
this.layoutControlItem33.Name = "layoutControlItem27";
this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem33.Size = new System.Drawing.Size(413, 51);
+ this.layoutControlItem33.Size = new System.Drawing.Size(340, 42);
this.layoutControlItem33.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem33.TextVisible = false;
@@ -2347,11 +2277,11 @@
//
this.layoutControlItem34.Control = this.radOut;
this.layoutControlItem34.CustomizationFormText = "鑷姩璁＄畻鎸夐挳";
- this.layoutControlItem34.Location = new System.Drawing.Point(1239, 0);
+ this.layoutControlItem34.Location = new System.Drawing.Point(1020, 0);
this.layoutControlItem34.Name = "layoutControlItem28";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem34.Size = new System.Drawing.Size(413, 51);
+ this.layoutControlItem34.Size = new System.Drawing.Size(340, 41);
this.layoutControlItem34.Text = "鑷姩璁＄畻";
this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem34.TextVisible = false;
@@ -2361,28 +2291,28 @@
this.layoutControlItem13.Control = this.txtQuantity;
this.layoutControlItem13.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.Size = new System.Drawing.Size(413, 51);
+ this.layoutControlItem13.Size = new System.Drawing.Size(340, 41);
this.layoutControlItem13.Text = "鐢宠鎬婚噺";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(108, 22);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txtYdy;
- this.layoutControlItem18.Location = new System.Drawing.Point(413, 0);
+ this.layoutControlItem18.Location = new System.Drawing.Point(340, 0);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem18.Size = new System.Drawing.Size(413, 51);
+ this.layoutControlItem18.Size = new System.Drawing.Size(340, 41);
this.layoutControlItem18.Text = "宸叉墦鍗版�婚噺";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(108, 22);
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.layoutControl1;
- this.layoutControlItem24.Location = new System.Drawing.Point(413, 51);
+ this.layoutControlItem24.Location = new System.Drawing.Point(340, 41);
this.layoutControlItem24.Name = "item0";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem24.Size = new System.Drawing.Size(413, 51);
+ this.layoutControlItem24.Size = new System.Drawing.Size(340, 42);
this.layoutControlItem24.Text = "鑷姩璁＄畻";
this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem24.TextVisible = false;
@@ -2390,12 +2320,10 @@
// gcMx8
//
this.gcMx8.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx8.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx8.Location = new System.Drawing.Point(0, 0);
this.gcMx8.MainView = this.gvMx8;
- this.gcMx8.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx8.Name = "gcMx8";
- this.gcMx8.Size = new System.Drawing.Size(1676, 422);
+ this.gcMx8.Size = new System.Drawing.Size(1340, 344);
this.gcMx8.TabIndex = 2;
this.gcMx8.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx8});
@@ -2417,7 +2345,6 @@
this.gridColumn13,
this.gridColumn16,
this.gridColumn23});
- this.gvMx8.DetailHeight = 428;
this.gvMx8.GridControl = this.gcMx8;
this.gvMx8.Name = "gvMx8";
this.gvMx8.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -2429,138 +2356,138 @@
this.gridColumn7.AppearanceCell.Options.UseFont = true;
this.gridColumn7.Caption = "guid";
this.gridColumn7.FieldName = "guid";
- this.gridColumn7.MinWidth = 62;
+ this.gridColumn7.MinWidth = 50;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Tag = "query_a.guid";
- this.gridColumn7.Width = 117;
+ this.gridColumn7.Width = 94;
//
// gridColumn8
//
this.gridColumn8.Caption = "鏄惁鍏ュ簱";
this.gridColumn8.FieldName = "isRk";
- this.gridColumn8.MinWidth = 31;
+ this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 0;
- this.gridColumn8.Width = 117;
+ this.gridColumn8.Width = 94;
//
// gvMx1itemBarcode
//
this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
this.gvMx1itemBarcode.Caption = "鐗╂枡鏉＄爜";
this.gvMx1itemBarcode.FieldName = "itemBarcode";
- this.gvMx1itemBarcode.MinWidth = 375;
+ this.gvMx1itemBarcode.MinWidth = 300;
this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
this.gvMx1itemBarcode.Visible = true;
this.gvMx1itemBarcode.VisibleIndex = 1;
- this.gvMx1itemBarcode.Width = 375;
+ this.gvMx1itemBarcode.Width = 300;
//
// gridColumn9
//
this.gridColumn9.Caption = "鐗╂枡缂栫爜";
this.gridColumn9.FieldName = "itemNo";
- this.gridColumn9.MinWidth = 31;
+ this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 2;
- this.gridColumn9.Width = 117;
+ this.gridColumn9.Width = 94;
//
// gridColumn10
//
this.gridColumn10.Caption = "鐗╂枡鍚嶇О";
this.gridColumn10.FieldName = "itemName";
- this.gridColumn10.MinWidth = 31;
+ this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 3;
- this.gridColumn10.Width = 117;
+ this.gridColumn10.Width = 94;
//
// gridColumn11
//
this.gridColumn11.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn11.FieldName = "itemModel";
- this.gridColumn11.MinWidth = 31;
+ this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 4;
- this.gridColumn11.Width = 117;
+ this.gridColumn11.Width = 94;
//
// gvMx1quantity
//
this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
this.gvMx1quantity.Caption = "鏁伴噺";
this.gvMx1quantity.FieldName = "quantity";
- this.gvMx1quantity.MinWidth = 62;
+ this.gvMx1quantity.MinWidth = 50;
this.gvMx1quantity.Name = "gvMx1quantity";
this.gvMx1quantity.Tag = "query_a.QUANTITY";
this.gvMx1quantity.Visible = true;
this.gvMx1quantity.VisibleIndex = 5;
- this.gvMx1quantity.Width = 117;
+ this.gvMx1quantity.Width = 94;
//
// gridColumn12
//
this.gridColumn12.Caption = "鍗曚綅";
this.gridColumn12.FieldName = "dwName";
- this.gridColumn12.MinWidth = 31;
+ this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
this.gridColumn12.VisibleIndex = 6;
- this.gridColumn12.Width = 117;
+ this.gridColumn12.Width = 94;
//
// gvMx1createBy
//
this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
this.gvMx1createBy.Caption = "鍒涘缓浜�";
this.gvMx1createBy.FieldName = "createBy";
- this.gvMx1createBy.MinWidth = 62;
+ this.gvMx1createBy.MinWidth = 50;
this.gvMx1createBy.Name = "gvMx1createBy";
this.gvMx1createBy.Tag = "query_a.CREATE_BY";
this.gvMx1createBy.Visible = true;
this.gvMx1createBy.VisibleIndex = 7;
- this.gvMx1createBy.Width = 117;
+ this.gvMx1createBy.Width = 94;
//
// gvMx1lotDate
//
this.gvMx1lotDate.AppearanceCell.Options.UseFont = true;
this.gvMx1lotDate.Caption = "鍒涘缓鏃ユ湡";
this.gvMx1lotDate.FieldName = "createDate";
- this.gvMx1lotDate.MinWidth = 62;
+ this.gvMx1lotDate.MinWidth = 50;
this.gvMx1lotDate.Name = "gvMx1lotDate";
this.gvMx1lotDate.Tag = "query_a.LOT_DATE";
this.gvMx1lotDate.Visible = true;
this.gvMx1lotDate.VisibleIndex = 8;
- this.gvMx1lotDate.Width = 117;
+ this.gvMx1lotDate.Width = 94;
//
// gridColumn13
//
this.gridColumn13.Caption = "鍏ュ簱浜�";
- this.gridColumn13.FieldName = "rkUserName";
- this.gridColumn13.MinWidth = 31;
+ this.gridColumn13.FieldName = "rkUser";
+ this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 9;
- this.gridColumn13.Width = 117;
+ this.gridColumn13.Width = 94;
//
// gridColumn16
//
this.gridColumn16.Caption = "鍏ュ簱浣�";
this.gridColumn16.FieldName = "rkPositon";
- this.gridColumn16.MinWidth = 31;
+ this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 10;
- this.gridColumn16.Width = 117;
+ this.gridColumn16.Width = 94;
//
// gridColumn23
//
this.gridColumn23.Caption = "鍏ュ簱鏃ユ湡";
this.gridColumn23.FieldName = "rkDate";
- this.gridColumn23.MinWidth = 31;
+ this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
this.gridColumn23.VisibleIndex = 11;
- this.gridColumn23.Width = 117;
+ this.gridColumn23.Width = 94;
//
// repositoryItemComboBox2
//
@@ -2575,10 +2502,9 @@
// picCheckBox
//
this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(1151, 51);
- this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.picCheckBox.Location = new System.Drawing.Point(921, 42);
this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(125, 61);
+ this.picCheckBox.Size = new System.Drawing.Size(100, 50);
this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.picCheckBox.TabIndex = 6;
this.picCheckBox.TabStop = false;
@@ -2596,16 +2522,25 @@
//
this.gridView4.Name = "gridView4";
//
+ // gridColumn31
+ //
+ this.gridColumn31.Caption = "鍏ュ簱缁勭粐";
+ this.gridColumn31.FieldName = "receivingOrg";
+ this.gridColumn31.MinWidth = 25;
+ this.gridColumn31.Name = "gridColumn31";
+ this.gridColumn31.Visible = true;
+ this.gridColumn31.VisibleIndex = 20;
+ this.gridColumn31.Width = 94;
+ //
// RkDetect01
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "RkDetect01";
- this.Size = new System.Drawing.Size(1680, 978);
+ this.Size = new System.Drawing.Size(1344, 800);
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -2636,7 +2571,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckByName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).EndInit();
@@ -2780,7 +2715,7 @@
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_lotNo;
private DevExpress.XtraEditors.TextEdit txt_fbatchQty;
- private DevExpress.XtraEditors.TextEdit txt_fcheckByName;
+ private DevExpress.XtraEditors.TextEdit txt_fcheckBy;
private DevExpress.XtraEditors.TextEdit txt_fcheckDate;
private DevExpress.XtraEditors.TextEdit txt_releaseNo;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.cs
index 20d3f95..172743f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WOTraceCodes.cs
@@ -4,9 +4,7 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
-using System.Configuration;
using System.Data;
-using System.Net;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -22,7 +20,6 @@
InitializeComponent();
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- toolBarMenu1.btnOutClick += ToolBarMenu1_btnOutClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) =>
{
@@ -129,51 +126,6 @@
catch (Exception ex)
{
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
- }
- }
-
- private void ToolBarMenu1_btnOutClick(object sender, EventArgs e)
- {
- using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
- {
- folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
- DialogResult dialogResult = folderBrowserDialog.ShowDialog();
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- if (dialogResult == DialogResult.OK)
- {
- string _folder = folderBrowserDialog.SelectedPath;
- var _params = new
- {
- inSortName = "",
- inSortOrder = "",
- inQueryWhere = _sbSqlWhere.ToString()
- };
- var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsout_WOTraceCodes", "", "", "", _params);
- try
- {
- string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView_NEW", JsonConvert.SerializeObject(_obj));
- ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- string _file = _rtn.rtnData.fileUrl.ToString();
- string _folderName = _folder + "\\" + _file.Replace("down/", "");
- string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
- using (WebClient client = new WebClient())
- {
- client.DownloadFile(_url, _folderName);
- }
- ToolBox.MsgHelper.ShowInformation("瀵煎嚭鎴愬姛锛�");
- }
- else
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- }
- catch (Exception ex)
- {
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs
index 903a21a..15f5c7f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.Designer.cs
@@ -35,7 +35,6 @@
DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
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.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -53,6 +52,7 @@
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -67,9 +67,6 @@
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptBtnView = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.btnBOMQuery = new DevExpress.XtraEditors.SimpleButton();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
this.splitContainerControl1.Panel1.SuspendLayout();
@@ -86,12 +83,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptBtnView)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
this.SuspendLayout();
//
// splitContainerControl1
@@ -118,7 +114,6 @@
//
// layoutControl1
//
- this.layoutControl1.Controls.Add(this.btnBOMQuery);
this.layoutControl1.Controls.Add(this.btnOutput);
this.layoutControl1.Controls.Add(this.ucLookOrg1);
this.layoutControl1.Controls.Add(this.dateEdit1);
@@ -201,9 +196,8 @@
this.layoutControlItem2,
this.layoutControlItem1,
this.layoutControlItem3,
- this.layoutControlItem4,
this.layoutControlItem5,
- this.layoutControlItem6});
+ this.layoutControlItem4});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Absolute;
@@ -216,18 +210,15 @@
columnDefinition4.Width = 187D;
columnDefinition5.SizeType = System.Windows.Forms.SizeType.Absolute;
columnDefinition5.Width = 187D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Absolute;
- columnDefinition6.Width = 187D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition7.Width = 264D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ columnDefinition6.Width = 451D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition1,
columnDefinition2,
columnDefinition3,
columnDefinition4,
columnDefinition5,
- columnDefinition6,
- columnDefinition7});
+ columnDefinition6});
rowDefinition1.Height = 100D;
rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
@@ -265,6 +256,16 @@
this.layoutControlItem3.Text = "纭畾鏌ヨ";
this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem3.TextVisible = false;
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.btnOutput;
+ this.layoutControlItem5.Location = new System.Drawing.Point(1062, 0);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 4;
+ this.layoutControlItem5.Size = new System.Drawing.Size(187, 36);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem5.TextVisible = false;
//
// layoutControlItem4
//
@@ -407,38 +408,6 @@
this.rptBtnView.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptBtnView.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBtnView_ButtonClick);
//
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.btnOutput;
- this.layoutControlItem5.Location = new System.Drawing.Point(1062, 0);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 4;
- this.layoutControlItem5.Size = new System.Drawing.Size(187, 36);
- this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem5.TextVisible = false;
- //
- // btnBOMQuery
- //
- this.btnBOMQuery.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.viewmergeddata_16x16;
- this.btnBOMQuery.Location = new System.Drawing.Point(1261, 12);
- this.btnBOMQuery.Margin = new System.Windows.Forms.Padding(4);
- this.btnBOMQuery.Name = "btnBOMQuery";
- this.btnBOMQuery.Size = new System.Drawing.Size(183, 32);
- this.btnBOMQuery.StyleController = this.layoutControl1;
- this.btnBOMQuery.TabIndex = 9;
- this.btnBOMQuery.Text = "BOM鏌ヨ";
- this.btnBOMQuery.Click += new System.EventHandler(this.btnBOMQuery_Click);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.btnBOMQuery;
- this.layoutControlItem6.Location = new System.Drawing.Point(1249, 0);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 5;
- this.layoutControlItem6.Size = new System.Drawing.Size(187, 36);
- this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem6.TextVisible = false;
- //
// WomShjh
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
@@ -464,12 +433,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptBtnView)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
this.ResumeLayout(false);
}
@@ -500,9 +468,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraEditors.SimpleButton btnOutput;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraEditors.SimpleButton btnBOMQuery;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
index ff06c06..4ffa9c7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/WomShjh.cs
@@ -1,5 +1,4 @@
-锘縰sing DevExpress.Pdf.Native.BouncyCastle.Asn1.X509;
-using DevExpress.Utils;
+锘縰sing DevExpress.Utils;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -190,25 +189,6 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
- }
- }
-
- private void btnBOMQuery_Click(object sender, EventArgs e)
- {
- try
- {
- var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetErpBOM","");
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- if (_rtn.rtnCode > 0)
- {
- MsgHelper.ShowInformation("BOM鏁版嵁鏇存柊鎴愬姛");
- }
- else
- MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
index 2634e0d..2657df0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
@@ -31,17 +31,17 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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 rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- 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.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -62,7 +62,6 @@
this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -76,7 +75,7 @@
this.lbGuid = new System.Windows.Forms.Label();
this.txt_gdbh = new DevExpress.XtraEditors.TextEdit();
this.txt_processNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_createByName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.txt_barCode111 = new DevExpress.XtraEditors.TextEdit();
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
@@ -156,6 +155,7 @@
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -185,7 +185,7 @@
this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_gdbh.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_processNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_barCode111.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
@@ -235,10 +235,9 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1566, 98);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1253, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -246,11 +245,10 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1566, 736);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1253, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -259,9 +257,8 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1564, 698);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1251, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -270,7 +267,6 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -283,22 +279,20 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1564, 698);
+ this.split1.Size = new System.Drawing.Size(1251, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemMemoEdit1,
this.repositoryItemMemoEdit2});
- this.gcMain1.Size = new System.Drawing.Size(1564, 635);
+ this.gcMain1.Size = new System.Drawing.Size(1251, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -322,7 +316,6 @@
this.gridColumn38,
this.gridColumn3,
this.gridColumn19});
- this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -334,153 +327,140 @@
this.gv_operationTime.AppearanceCell.Options.UseFont = true;
this.gv_operationTime.Caption = "鐢熶骇绾垮埆";
this.gv_operationTime.FieldName = "lineName";
- this.gv_operationTime.MinWidth = 25;
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 = 225;
+ this.gv_operationTime.Width = 180;
//
// gv_userName
//
this.gv_userName.AppearanceCell.Options.UseFont = true;
this.gv_userName.Caption = "鐢熶骇鐘舵��";
this.gv_userName.FieldName = "daaStatus";
- this.gv_userName.MinWidth = 25;
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 = 2;
- this.gv_userName.Width = 117;
+ this.gv_userName.Width = 94;
//
// gv_operationTable
//
this.gv_operationTable.AppearanceCell.Options.UseFont = true;
this.gv_operationTable.Caption = "宸ュ崟鍙�";
this.gv_operationTable.FieldName = "daaNo";
- this.gv_operationTable.MinWidth = 25;
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 = 0;
- this.gv_operationTable.Width = 125;
+ this.gv_operationTable.Width = 100;
//
// gridColumn1
//
this.gridColumn1.Caption = "涓婃姤鏃堕棿";
this.gridColumn1.FieldName = "createDate";
- this.gridColumn1.MinWidth = 31;
+ this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 4;
- this.gridColumn1.Width = 117;
+ this.gridColumn1.Width = 94;
//
// gridColumn22
//
this.gridColumn22.Caption = "浜у搧ID";
this.gridColumn22.FieldName = "itemId";
- this.gridColumn22.MinWidth = 31;
+ this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
- this.gridColumn22.Width = 117;
+ this.gridColumn22.Width = 94;
//
// gridColumn11
//
this.gridColumn11.Caption = "浜у搧缂栫爜";
this.gridColumn11.FieldName = "itemNo";
- this.gridColumn11.MinWidth = 31;
+ this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 6;
- this.gridColumn11.Width = 117;
+ this.gridColumn11.Width = 94;
//
// gridColumn13
//
this.gridColumn13.Caption = "浜у搧鍚嶇О";
this.gridColumn13.FieldName = "itemName";
- this.gridColumn13.MinWidth = 31;
+ this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
this.gridColumn13.VisibleIndex = 7;
- this.gridColumn13.Width = 117;
+ this.gridColumn13.Width = 94;
//
// gridColumn18
//
this.gridColumn18.Caption = "浜у搧瑙勬牸";
this.gridColumn18.FieldName = "itemModel";
- this.gridColumn18.MinWidth = 31;
+ this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
this.gridColumn18.VisibleIndex = 8;
- this.gridColumn18.Width = 117;
+ this.gridColumn18.Width = 94;
//
// gridColumn20
//
this.gridColumn20.Caption = "Mes棰勮寮�宸�";
this.gridColumn20.FieldName = "mesStartProd";
- this.gridColumn20.MinWidth = 31;
+ this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
- this.gridColumn20.Width = 117;
+ this.gridColumn20.Width = 94;
//
// gridColumn21
//
this.gridColumn21.Caption = "涓嶈壇鎻忚堪";
this.gridColumn21.FieldName = "badDescription";
- this.gridColumn21.MinWidth = 31;
+ this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
this.gridColumn21.Visible = true;
this.gridColumn21.VisibleIndex = 5;
- this.gridColumn21.Width = 117;
+ this.gridColumn21.Width = 94;
//
// gridColumn23
//
this.gridColumn23.Caption = "涓婃姤宸ュ簭";
this.gridColumn23.FieldName = "processNo";
- this.gridColumn23.MinWidth = 31;
+ this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
this.gridColumn23.VisibleIndex = 3;
- this.gridColumn23.Width = 117;
+ this.gridColumn23.Width = 94;
//
// gridColumn37
//
this.gridColumn37.Caption = "杩芥函鐮�";
this.gridColumn37.FieldName = "barCode";
- this.gridColumn37.MinWidth = 31;
+ this.gridColumn37.MinWidth = 25;
this.gridColumn37.Name = "gridColumn37";
this.gridColumn37.Visible = true;
this.gridColumn37.VisibleIndex = 9;
- this.gridColumn37.Width = 117;
+ this.gridColumn37.Width = 94;
//
// gridColumn38
//
this.gridColumn38.Caption = "涓婚敭Guid";
this.gridColumn38.FieldName = "guid";
- this.gridColumn38.MinWidth = 31;
+ this.gridColumn38.MinWidth = 25;
this.gridColumn38.Name = "gridColumn38";
- this.gridColumn38.Width = 117;
+ this.gridColumn38.Width = 94;
//
// gridColumn3
//
this.gridColumn3.Caption = "淇悊鐘舵��";
this.gridColumn3.FieldName = "repairResult";
- this.gridColumn3.MinWidth = 31;
+ this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 10;
- this.gridColumn3.Width = 117;
- //
- // gridColumn19
- //
- this.gridColumn19.Caption = "鐢熶骇缁勭粐";
- this.gridColumn19.FieldName = "fSubsidiary";
- this.gridColumn19.MinWidth = 31;
- this.gridColumn19.Name = "gridColumn19";
- this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 11;
- this.gridColumn19.Width = 117;
+ this.gridColumn3.Width = 94;
//
// repositoryItemMemoEdit1
//
@@ -494,20 +474,19 @@
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 635);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1564, 48);
+ this.pageBar1.Size = new System.Drawing.Size(1251, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
- this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1564, 698);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1251, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -515,7 +494,6 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -528,8 +506,8 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1564, 698);
- this.splitMx1.SplitterPosition = 318;
+ this.splitMx1.Size = new System.Drawing.Size(1251, 570);
+ this.splitMx1.SplitterPosition = 260;
this.splitMx1.TabIndex = 1;
//
// splitTop1
@@ -537,7 +515,6 @@
this.splitTop1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitTop1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.splitTop1.Location = new System.Drawing.Point(0, 0);
- this.splitTop1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitTop1.Name = "splitTop1";
//
// splitTop1.Panel1
@@ -551,8 +528,8 @@
this.splitTop1.Panel2.Controls.Add(this.panel3);
this.splitTop1.Panel2.Text = "Panel2";
this.splitTop1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitTop1.Size = new System.Drawing.Size(1564, 318);
- this.splitTop1.SplitterPosition = 487;
+ this.splitTop1.Size = new System.Drawing.Size(1251, 260);
+ this.splitTop1.SplitterPosition = 390;
this.splitTop1.TabIndex = 0;
//
// layoutMx1
@@ -563,7 +540,7 @@
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_gdbh);
this.layoutMx1.Controls.Add(this.txt_processNo);
- this.layoutMx1.Controls.Add(this.txt_createByName);
+ this.layoutMx1.Controls.Add(this.txt_createBy);
this.layoutMx1.Controls.Add(this.txt_barCode111);
this.layoutMx1.Controls.Add(this.txt_itemNo);
this.layoutMx1.Controls.Add(this.txt_itemName);
@@ -576,21 +553,19 @@
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem5});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(699, 264, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1062, 318);
+ this.layoutMx1.Size = new System.Drawing.Size(849, 260);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// txt_repairReson
//
this.txt_repairReson.BtnTxt = "涓嶈壇鍘熷洜";
- this.txt_repairReson.Location = new System.Drawing.Point(14, 224);
- this.txt_repairReson.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.txt_repairReson.Location = new System.Drawing.Point(12, 182);
this.txt_repairReson.Name = "txt_repairReson";
- this.txt_repairReson.Size = new System.Drawing.Size(514, 80);
+ this.txt_repairReson.Size = new System.Drawing.Size(410, 66);
this.txt_repairReson.TabIndex = 26;
this.txt_repairReson.TextTxt = "";
this.txt_repairReson.WhereTxt = " a.s_type=\'宸ュ簭涓嶈壇鍘熷洜\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
@@ -598,10 +573,9 @@
// txt_badDescription
//
this.txt_badDescription.BtnTxt = "涓嶈壇鎻忚堪";
- this.txt_badDescription.Location = new System.Drawing.Point(14, 140);
- this.txt_badDescription.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.txt_badDescription.Location = new System.Drawing.Point(12, 114);
this.txt_badDescription.Name = "txt_badDescription";
- this.txt_badDescription.Size = new System.Drawing.Size(514, 80);
+ this.txt_badDescription.Size = new System.Drawing.Size(410, 64);
this.txt_badDescription.TabIndex = 25;
this.txt_badDescription.TextTxt = "";
this.txt_badDescription.WhereTxt = "s_type=\'鐜板満缁翠慨涓嶈壇鐜拌薄\'";
@@ -609,133 +583,120 @@
// txt_repairMethd
//
this.txt_repairMethd.BtnTxt = "涓嶈壇瀵圭瓥";
- this.txt_repairMethd.Location = new System.Drawing.Point(532, 182);
- this.txt_repairMethd.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+ this.txt_repairMethd.Location = new System.Drawing.Point(426, 148);
this.txt_repairMethd.Name = "txt_repairMethd";
- this.txt_repairMethd.Size = new System.Drawing.Size(516, 122);
+ this.txt_repairMethd.Size = new System.Drawing.Size(411, 100);
this.txt_repairMethd.TabIndex = 24;
this.txt_repairMethd.TextTxt = "";
this.txt_repairMethd.WhereTxt = " a.s_type=\'宸ュ簭涓嶈壇瀵圭瓥\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(15, 244);
- this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbGuid.Location = new System.Drawing.Point(12, 200);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(186, 53);
+ this.lbGuid.Size = new System.Drawing.Size(149, 43);
this.lbGuid.TabIndex = 21;
this.lbGuid.Text = "lbGuid";
//
// txt_gdbh
//
- this.txt_gdbh.Location = new System.Drawing.Point(119, 98);
- this.txt_gdbh.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_gdbh.Location = new System.Drawing.Point(99, 80);
this.txt_gdbh.Name = "txt_gdbh";
this.txt_gdbh.Properties.ReadOnly = true;
- this.txt_gdbh.Size = new System.Drawing.Size(150, 28);
+ this.txt_gdbh.Size = new System.Drawing.Size(116, 24);
this.txt_gdbh.StyleController = this.layoutMx1;
this.txt_gdbh.TabIndex = 4;
//
// txt_processNo
//
- this.txt_processNo.Location = new System.Drawing.Point(637, 140);
- this.txt_processNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_processNo.Location = new System.Drawing.Point(513, 114);
this.txt_processNo.Name = "txt_processNo";
this.txt_processNo.Properties.ReadOnly = true;
- this.txt_processNo.Size = new System.Drawing.Size(150, 28);
+ this.txt_processNo.Size = new System.Drawing.Size(116, 24);
this.txt_processNo.StyleController = this.layoutMx1;
this.txt_processNo.TabIndex = 5;
//
- // txt_createByName
+ // txt_createBy
//
- this.txt_createByName.Location = new System.Drawing.Point(896, 140);
- this.txt_createByName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.txt_createByName.Name = "txt_createByName";
- this.txt_createByName.Properties.ReadOnly = true;
- this.txt_createByName.Size = new System.Drawing.Size(152, 28);
- this.txt_createByName.StyleController = this.layoutMx1;
- this.txt_createByName.TabIndex = 6;
+ this.txt_createBy.Location = new System.Drawing.Point(720, 114);
+ this.txt_createBy.Name = "txt_createBy";
+ this.txt_createBy.Properties.ReadOnly = true;
+ this.txt_createBy.Size = new System.Drawing.Size(117, 24);
+ this.txt_createBy.StyleController = this.layoutMx1;
+ this.txt_createBy.TabIndex = 6;
//
// txt_barCode111
//
- this.txt_barCode111.Location = new System.Drawing.Point(119, 14);
- this.txt_barCode111.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_barCode111.Location = new System.Drawing.Point(99, 12);
this.txt_barCode111.Name = "txt_barCode111";
this.txt_barCode111.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold);
this.txt_barCode111.Properties.Appearance.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Hyperlink;
this.txt_barCode111.Properties.Appearance.Options.UseFont = true;
this.txt_barCode111.Properties.Appearance.Options.UseForeColor = true;
- this.txt_barCode111.Size = new System.Drawing.Size(409, 36);
+ this.txt_barCode111.Size = new System.Drawing.Size(323, 30);
this.txt_barCode111.StyleController = this.layoutMx1;
this.txt_barCode111.TabIndex = 7;
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(637, 56);
- this.txt_itemNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_itemNo.Location = new System.Drawing.Point(513, 46);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.ReadOnly = true;
- this.txt_itemNo.Size = new System.Drawing.Size(150, 28);
+ this.txt_itemNo.Size = new System.Drawing.Size(116, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 10;
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(896, 56);
- this.txt_itemName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_itemName.Location = new System.Drawing.Point(720, 46);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.ReadOnly = true;
- this.txt_itemName.Size = new System.Drawing.Size(152, 28);
+ this.txt_itemName.Size = new System.Drawing.Size(117, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 13;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(637, 98);
- this.txt_itemModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_itemModel.Location = new System.Drawing.Point(513, 80);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.ReadOnly = true;
- this.txt_itemModel.Size = new System.Drawing.Size(411, 28);
+ this.txt_itemModel.Size = new System.Drawing.Size(324, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 14;
//
// txt_sjXt
//
- this.txt_sjXt.Location = new System.Drawing.Point(378, 98);
- this.txt_sjXt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_sjXt.Location = new System.Drawing.Point(306, 80);
this.txt_sjXt.Name = "txt_sjXt";
this.txt_sjXt.Properties.ReadOnly = true;
- this.txt_sjXt.Size = new System.Drawing.Size(150, 28);
+ this.txt_sjXt.Size = new System.Drawing.Size(116, 24);
this.txt_sjXt.StyleController = this.layoutMx1;
this.txt_sjXt.TabIndex = 16;
//
// txt_yjDate
//
- this.txt_yjDate.Location = new System.Drawing.Point(637, 14);
- this.txt_yjDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_yjDate.Location = new System.Drawing.Point(513, 12);
this.txt_yjDate.Name = "txt_yjDate";
this.txt_yjDate.Properties.ReadOnly = true;
- this.txt_yjDate.Size = new System.Drawing.Size(150, 28);
+ this.txt_yjDate.Size = new System.Drawing.Size(116, 24);
this.txt_yjDate.StyleController = this.layoutMx1;
this.txt_yjDate.TabIndex = 17;
//
// txt_sjDate
//
- this.txt_sjDate.Location = new System.Drawing.Point(896, 14);
- this.txt_sjDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_sjDate.Location = new System.Drawing.Point(720, 12);
this.txt_sjDate.Name = "txt_sjDate";
this.txt_sjDate.Properties.ReadOnly = true;
- this.txt_sjDate.Size = new System.Drawing.Size(152, 28);
+ this.txt_sjDate.Size = new System.Drawing.Size(117, 24);
this.txt_sjDate.StyleController = this.layoutMx1;
this.txt_sjDate.TabIndex = 18;
//
// txt_barCode
//
- this.txt_barCode.Location = new System.Drawing.Point(119, 56);
- this.txt_barCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_barCode.Location = new System.Drawing.Point(99, 46);
this.txt_barCode.Name = "txt_barCode";
this.txt_barCode.Properties.ReadOnly = true;
- this.txt_barCode.Size = new System.Drawing.Size(409, 28);
+ this.txt_barCode.Size = new System.Drawing.Size(323, 24);
this.txt_barCode.StyleController = this.layoutMx1;
this.txt_barCode.TabIndex = 27;
//
@@ -771,63 +732,63 @@
this.layoutControlItem10});
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});
- 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;
- 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;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition8,
- rowDefinition9,
- rowDefinition10,
- rowDefinition11,
- rowDefinition12,
- rowDefinition13,
- rowDefinition14});
- this.Root.Size = new System.Drawing.Size(1062, 318);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6,
+ rowDefinition7});
+ this.Root.Size = new System.Drawing.Size(849, 260);
this.Root.TextVisible = false;
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_yjDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(518, 0);
+ this.layoutControlItem14.Location = new System.Drawing.Point(414, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(259, 42);
+ this.layoutControlItem14.Size = new System.Drawing.Size(207, 34);
this.layoutControlItem14.Text = "璁″垝鏃堕棿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_sjDate;
- this.layoutControlItem15.Location = new System.Drawing.Point(777, 0);
+ this.layoutControlItem15.Location = new System.Drawing.Point(621, 0);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(261, 42);
+ this.layoutControlItem15.Size = new System.Drawing.Size(208, 34);
this.layoutControlItem15.Text = "瀹為檯鏃堕棿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem4
//
@@ -835,19 +796,19 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(518, 42);
+ this.layoutControlItem4.Size = new System.Drawing.Size(414, 34);
this.layoutControlItem4.Text = "鎵拷婧爜";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_repairReson;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 210);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 170);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 5;
this.layoutControlItem9.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(518, 84);
+ this.layoutControlItem9.Size = new System.Drawing.Size(414, 70);
this.layoutControlItem9.Text = "涓嶈壇鍘熷洜";
this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem9.TextVisible = false;
@@ -855,66 +816,66 @@
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_gdbh;
- this.layoutControlItem1.Location = new System.Drawing.Point(0, 84);
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 68);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem1.Size = new System.Drawing.Size(259, 42);
+ this.layoutControlItem1.Size = new System.Drawing.Size(207, 34);
this.layoutControlItem1.Text = "宸ュ崟缂栧彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_sjXt;
- this.layoutControlItem13.Location = new System.Drawing.Point(259, 84);
+ this.layoutControlItem13.Location = new System.Drawing.Point(207, 68);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(259, 42);
+ this.layoutControlItem13.Size = new System.Drawing.Size(207, 34);
this.layoutControlItem13.Text = "鐢熶骇绾垮埆";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_processNo;
- this.layoutControlItem2.Location = new System.Drawing.Point(518, 126);
+ this.layoutControlItem2.Location = new System.Drawing.Point(414, 102);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem2.Size = new System.Drawing.Size(259, 42);
+ this.layoutControlItem2.Size = new System.Drawing.Size(207, 34);
this.layoutControlItem2.Text = "涓婃姤宸ュ簭";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem3
//
- this.layoutControlItem3.Control = this.txt_createByName;
- this.layoutControlItem3.Location = new System.Drawing.Point(777, 126);
+ this.layoutControlItem3.Control = this.txt_createBy;
+ this.layoutControlItem3.Location = new System.Drawing.Point(621, 102);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem3.Size = new System.Drawing.Size(261, 42);
+ this.layoutControlItem3.Size = new System.Drawing.Size(208, 34);
this.layoutControlItem3.Text = "涓婃姤鍛樺伐";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_barCode;
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 42);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 34);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(518, 42);
+ this.layoutControlItem6.Size = new System.Drawing.Size(414, 34);
this.layoutControlItem6.Text = "褰撳墠杩芥函鐮�";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_badDescription;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 126);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 102);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(518, 84);
+ this.layoutControlItem16.Size = new System.Drawing.Size(414, 68);
this.layoutControlItem16.Text = "涓嶈壇鎻忚堪";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem16.TextVisible = false;
@@ -922,13 +883,13 @@
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_repairMethd;
- this.layoutControlItem18.Location = new System.Drawing.Point(518, 168);
+ this.layoutControlItem18.Location = new System.Drawing.Point(414, 136);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
this.layoutControlItem18.OptionsTableLayoutItem.RowSpan = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(520, 126);
+ this.layoutControlItem18.Size = new System.Drawing.Size(415, 104);
this.layoutControlItem18.Text = "涓嶈壇瀵圭瓥";
this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem18.TextVisible = false;
@@ -936,36 +897,36 @@
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_itemModel;
- this.layoutControlItem11.Location = new System.Drawing.Point(518, 84);
+ this.layoutControlItem11.Location = new System.Drawing.Point(414, 68);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(520, 42);
+ this.layoutControlItem11.Size = new System.Drawing.Size(415, 34);
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_itemNo;
- this.layoutControlItem7.Location = new System.Drawing.Point(518, 42);
+ this.layoutControlItem7.Location = new System.Drawing.Point(414, 34);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(259, 42);
+ this.layoutControlItem7.Size = new System.Drawing.Size(207, 34);
this.layoutControlItem7.Text = "浜у搧缂栫爜";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_itemName;
- this.layoutControlItem10.Location = new System.Drawing.Point(777, 42);
+ this.layoutControlItem10.Location = new System.Drawing.Point(621, 34);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(261, 42);
+ this.layoutControlItem10.Size = new System.Drawing.Size(208, 34);
this.layoutControlItem10.Text = "浜у搧鍚嶇О";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 22);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
//
// panel5
//
@@ -975,9 +936,8 @@
this.panel5.Controls.Add(this.panel2);
this.panel5.Dock = System.Windows.Forms.DockStyle.Top;
this.panel5.Location = new System.Drawing.Point(0, 0);
- this.panel5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(487, 143);
+ this.panel5.Size = new System.Drawing.Size(390, 117);
this.panel5.TabIndex = 22;
//
// panel1
@@ -985,29 +945,26 @@
this.panel1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
this.panel1.Controls.Add(this.lbSum1);
this.panel1.Controls.Add(this.label1);
- this.panel1.Location = new System.Drawing.Point(4, 4);
- this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panel1.Location = new System.Drawing.Point(3, 3);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(124, 95);
+ this.panel1.Size = new System.Drawing.Size(99, 78);
this.panel1.TabIndex = 0;
//
// lbSum1
//
this.lbSum1.AutoSize = true;
- this.lbSum1.Location = new System.Drawing.Point(56, 54);
- this.lbSum1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbSum1.Location = new System.Drawing.Point(45, 44);
this.lbSum1.Name = "lbSum1";
- this.lbSum1.Size = new System.Drawing.Size(20, 22);
+ this.lbSum1.Size = new System.Drawing.Size(16, 18);
this.lbSum1.TabIndex = 1;
this.lbSum1.Text = "0";
//
// label1
//
this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(22, 18);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(18, 15);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(82, 22);
+ this.label1.Size = new System.Drawing.Size(68, 18);
this.label1.TabIndex = 0;
this.label1.Text = "宸ュ崟鏁伴噺";
//
@@ -1016,39 +973,35 @@
this.panel4.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
this.panel4.Controls.Add(this.lbSum2);
this.panel4.Controls.Add(this.label8);
- this.panel4.Location = new System.Drawing.Point(166, 4);
- this.panel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panel4.Location = new System.Drawing.Point(133, 3);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(124, 95);
+ this.panel4.Size = new System.Drawing.Size(99, 78);
this.panel4.TabIndex = 2;
//
// lbSum2
//
this.lbSum2.AutoSize = true;
- this.lbSum2.Location = new System.Drawing.Point(56, 54);
- this.lbSum2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbSum2.Location = new System.Drawing.Point(45, 44);
this.lbSum2.Name = "lbSum2";
- this.lbSum2.Size = new System.Drawing.Size(20, 22);
+ this.lbSum2.Size = new System.Drawing.Size(16, 18);
this.lbSum2.TabIndex = 1;
this.lbSum2.Text = "0";
//
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(22, 18);
- this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label8.Location = new System.Drawing.Point(18, 15);
this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(64, 22);
+ this.label8.Size = new System.Drawing.Size(53, 18);
this.label8.TabIndex = 0;
this.label8.Text = "寰呬慨鐞�";
//
// prog1
//
- this.prog1.Location = new System.Drawing.Point(4, 106);
- this.prog1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.prog1.Location = new System.Drawing.Point(3, 87);
this.prog1.Name = "prog1";
this.prog1.Properties.ShowTitle = true;
- this.prog1.Size = new System.Drawing.Size(449, 27);
+ this.prog1.Size = new System.Drawing.Size(359, 22);
this.prog1.TabIndex = 5;
//
// panel2
@@ -1056,29 +1009,26 @@
this.panel2.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
this.panel2.Controls.Add(this.lbSum3);
this.panel2.Controls.Add(this.label4);
- this.panel2.Location = new System.Drawing.Point(329, 4);
- this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panel2.Location = new System.Drawing.Point(263, 3);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(124, 95);
+ this.panel2.Size = new System.Drawing.Size(99, 78);
this.panel2.TabIndex = 3;
//
// lbSum3
//
this.lbSum3.AutoSize = true;
- this.lbSum3.Location = new System.Drawing.Point(56, 54);
- this.lbSum3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbSum3.Location = new System.Drawing.Point(45, 44);
this.lbSum3.Name = "lbSum3";
- this.lbSum3.Size = new System.Drawing.Size(20, 22);
+ this.lbSum3.Size = new System.Drawing.Size(16, 18);
this.lbSum3.TabIndex = 1;
this.lbSum3.Text = "0";
//
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(22, 18);
- this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label4.Location = new System.Drawing.Point(18, 15);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(64, 22);
+ this.label4.Size = new System.Drawing.Size(53, 18);
this.label4.TabIndex = 0;
this.label4.Text = "宸蹭慨鐞�";
//
@@ -1092,20 +1042,18 @@
this.panel3.Controls.Add(this.simpleButton3);
this.panel3.Controls.Add(this.simpleButton4);
this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel3.Location = new System.Drawing.Point(0, 151);
- this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panel3.Location = new System.Drawing.Point(0, 123);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(487, 167);
+ this.panel3.Size = new System.Drawing.Size(390, 137);
this.panel3.TabIndex = 21;
//
// simpleButton7
//
this.simpleButton7.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton7.Appearance.Options.UseBackColor = true;
- this.simpleButton7.Location = new System.Drawing.Point(101, 5);
- this.simpleButton7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.simpleButton7.Location = new System.Drawing.Point(81, 4);
this.simpleButton7.Name = "simpleButton7";
- this.simpleButton7.Size = new System.Drawing.Size(76, 53);
+ this.simpleButton7.Size = new System.Drawing.Size(61, 43);
this.simpleButton7.TabIndex = 10;
this.simpleButton7.Text = "璁惧";
//
@@ -1113,10 +1061,9 @@
//
this.btnBad.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
this.btnBad.Appearance.Options.UseBackColor = true;
- this.btnBad.Location = new System.Drawing.Point(248, 72);
- this.btnBad.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnBad.Location = new System.Drawing.Point(198, 59);
this.btnBad.Name = "btnBad";
- this.btnBad.Size = new System.Drawing.Size(208, 86);
+ this.btnBad.Size = new System.Drawing.Size(166, 70);
this.btnBad.TabIndex = 20;
this.btnBad.Text = "NG";
//
@@ -1124,10 +1071,9 @@
//
this.simpleButton6.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton6.Appearance.Options.UseBackColor = true;
- this.simpleButton6.Location = new System.Drawing.Point(379, 6);
- this.simpleButton6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.simpleButton6.Location = new System.Drawing.Point(303, 5);
this.simpleButton6.Name = "simpleButton6";
- this.simpleButton6.Size = new System.Drawing.Size(76, 53);
+ this.simpleButton6.Size = new System.Drawing.Size(61, 43);
this.simpleButton6.TabIndex = 9;
this.simpleButton6.Text = "鍙栨秷";
//
@@ -1135,10 +1081,9 @@
//
this.btnGood.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
this.btnGood.Appearance.Options.UseBackColor = true;
- this.btnGood.Location = new System.Drawing.Point(9, 72);
- this.btnGood.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.btnGood.Location = new System.Drawing.Point(7, 59);
this.btnGood.Name = "btnGood";
- this.btnGood.Size = new System.Drawing.Size(208, 86);
+ this.btnGood.Size = new System.Drawing.Size(166, 70);
this.btnGood.TabIndex = 19;
this.btnGood.Text = "OK";
//
@@ -1146,10 +1091,9 @@
//
this.simpleButton5.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton5.Appearance.Options.UseBackColor = true;
- this.simpleButton5.Location = new System.Drawing.Point(194, 5);
- this.simpleButton5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.simpleButton5.Location = new System.Drawing.Point(155, 4);
this.simpleButton5.Name = "simpleButton5";
- this.simpleButton5.Size = new System.Drawing.Size(76, 53);
+ this.simpleButton5.Size = new System.Drawing.Size(61, 43);
this.simpleButton5.TabIndex = 8;
this.simpleButton5.Text = "鍝佽川";
//
@@ -1157,10 +1101,9 @@
//
this.simpleButton3.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton3.Appearance.Options.UseBackColor = true;
- this.simpleButton3.Location = new System.Drawing.Point(9, 5);
- this.simpleButton3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.simpleButton3.Location = new System.Drawing.Point(7, 4);
this.simpleButton3.Name = "simpleButton3";
- this.simpleButton3.Size = new System.Drawing.Size(76, 53);
+ this.simpleButton3.Size = new System.Drawing.Size(61, 43);
this.simpleButton3.TabIndex = 6;
this.simpleButton3.Text = "鐗╂枡";
//
@@ -1168,10 +1111,9 @@
//
this.simpleButton4.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton4.Appearance.Options.UseBackColor = true;
- this.simpleButton4.Location = new System.Drawing.Point(286, 5);
- this.simpleButton4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.simpleButton4.Location = new System.Drawing.Point(229, 4);
this.simpleButton4.Name = "simpleButton4";
- this.simpleButton4.Size = new System.Drawing.Size(76, 53);
+ this.simpleButton4.Size = new System.Drawing.Size(61, 43);
this.simpleButton4.TabIndex = 7;
this.simpleButton4.Text = "鍏跺畠";
//
@@ -1179,10 +1121,9 @@
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabMx.Location = new System.Drawing.Point(0, 0);
- this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage2;
- this.tabMx.Size = new System.Drawing.Size(1564, 365);
+ this.tabMx.Size = new System.Drawing.Size(1251, 298);
this.tabMx.TabIndex = 4;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1191,20 +1132,17 @@
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx2);
- this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1562, 327);
+ this.tabMxPage2.Size = new System.Drawing.Size(1249, 266);
this.tabMxPage2.Text = "寰呬慨鐞嗘槑缁�";
//
// gcMx2
//
this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
- this.gcMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1562, 327);
+ this.gcMx2.Size = new System.Drawing.Size(1249, 266);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1227,7 +1165,6 @@
this.gridColumn34,
this.gridColumn35,
this.gridColumn36});
- this.gvMx2.DetailHeight = 428;
this.gvMx2.GridControl = this.gcMx2;
this.gvMx2.Name = "gvMx2";
this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1238,81 +1175,77 @@
//
this.gridColumn8.Caption = "guid";
this.gridColumn8.FieldName = "guid";
- this.gridColumn8.MinWidth = 31;
+ this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.OptionsColumn.ReadOnly = true;
- this.gridColumn8.Width = 117;
+ this.gridColumn8.Width = 94;
//
// gridColumn9
//
this.gridColumn9.Caption = "浜х嚎";
this.gridColumn9.FieldName = "lineName";
- this.gridColumn9.MinWidth = 31;
+ this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
this.gridColumn9.VisibleIndex = 0;
- this.gridColumn9.Width = 117;
+ this.gridColumn9.Width = 94;
//
// gridColumn10
//
this.gridColumn10.AppearanceCell.Options.UseFont = true;
this.gridColumn10.Caption = "宸ュ崟缂栧彿";
this.gridColumn10.FieldName = "gdbh";
- this.gridColumn10.MinWidth = 12;
+ this.gridColumn10.MinWidth = 10;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.OptionsColumn.ReadOnly = true;
this.gridColumn10.Tag = "query_a.status";
this.gridColumn10.Visible = true;
this.gridColumn10.VisibleIndex = 1;
- this.gridColumn10.Width = 89;
+ this.gridColumn10.Width = 71;
//
// gridColumn16
//
this.gridColumn16.AppearanceCell.Options.UseFont = true;
this.gridColumn16.Caption = "杩芥函鐮�";
this.gridColumn16.FieldName = "barCode";
- this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.OptionsColumn.ReadOnly = true;
this.gridColumn16.Tag = "query_a.pbill_no";
this.gridColumn16.Visible = true;
this.gridColumn16.VisibleIndex = 2;
- this.gridColumn16.Width = 114;
+ this.gridColumn16.Width = 91;
//
// gridColumn17
//
this.gridColumn17.AppearanceCell.Options.UseFont = true;
this.gridColumn17.Caption = "鐗╂枡缂栫爜";
this.gridColumn17.FieldName = "itemNo";
- this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.OptionsColumn.ReadOnly = true;
this.gridColumn17.Tag = "query_a.item_no";
this.gridColumn17.Visible = true;
this.gridColumn17.VisibleIndex = 3;
- this.gridColumn17.Width = 114;
+ this.gridColumn17.Width = 91;
//
// gridColumn27
//
this.gridColumn27.Caption = "鐗╂枡鍚嶇О";
this.gridColumn27.FieldName = "itemName";
- this.gridColumn27.MinWidth = 25;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.OptionsColumn.ReadOnly = true;
this.gridColumn27.Visible = true;
this.gridColumn27.VisibleIndex = 4;
- this.gridColumn27.Width = 114;
+ this.gridColumn27.Width = 91;
//
// gridColumn28
//
this.gridColumn28.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn28.FieldName = "itemModel";
- this.gridColumn28.MinWidth = 25;
this.gridColumn28.Name = "gridColumn28";
this.gridColumn28.OptionsColumn.ReadOnly = true;
this.gridColumn28.Visible = true;
this.gridColumn28.VisibleIndex = 5;
- this.gridColumn28.Width = 114;
+ this.gridColumn28.Width = 91;
//
// gridColumn30
//
@@ -1322,89 +1255,86 @@
this.gridColumn30.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn30.Caption = "淇悊鐘舵��";
this.gridColumn30.FieldName = "repairResult";
- this.gridColumn30.MinWidth = 31;
+ this.gridColumn30.MinWidth = 25;
this.gridColumn30.Name = "gridColumn30";
this.gridColumn30.Visible = true;
this.gridColumn30.VisibleIndex = 6;
- this.gridColumn30.Width = 114;
+ this.gridColumn30.Width = 91;
//
// gridColumn31
//
this.gridColumn31.Caption = "閫佷慨宸ュ簭";
this.gridColumn31.FieldName = "processNo";
- this.gridColumn31.MinWidth = 31;
+ this.gridColumn31.MinWidth = 25;
this.gridColumn31.Name = "gridColumn31";
this.gridColumn31.Visible = true;
this.gridColumn31.VisibleIndex = 7;
- this.gridColumn31.Width = 114;
+ this.gridColumn31.Width = 91;
//
// gridColumn32
//
this.gridColumn32.Caption = "閫佷慨鍛�";
this.gridColumn32.FieldName = "collectByName";
- this.gridColumn32.MinWidth = 31;
+ this.gridColumn32.MinWidth = 25;
this.gridColumn32.Name = "gridColumn32";
this.gridColumn32.Visible = true;
this.gridColumn32.VisibleIndex = 8;
- this.gridColumn32.Width = 117;
+ this.gridColumn32.Width = 94;
//
// gridColumn33
//
this.gridColumn33.Caption = "閫佷慨鏃堕棿";
this.gridColumn33.FieldName = "createDate";
- this.gridColumn33.MinWidth = 31;
+ this.gridColumn33.MinWidth = 25;
this.gridColumn33.Name = "gridColumn33";
this.gridColumn33.Visible = true;
this.gridColumn33.VisibleIndex = 9;
- this.gridColumn33.Width = 141;
+ this.gridColumn33.Width = 113;
//
// gridColumn34
//
this.gridColumn34.Caption = "涓嶈壇鐜拌薄";
this.gridColumn34.FieldName = "badDescription";
- this.gridColumn34.MinWidth = 31;
+ this.gridColumn34.MinWidth = 25;
this.gridColumn34.Name = "gridColumn34";
this.gridColumn34.Visible = true;
this.gridColumn34.VisibleIndex = 10;
- this.gridColumn34.Width = 114;
+ this.gridColumn34.Width = 91;
//
// gridColumn35
//
this.gridColumn35.Caption = "涓嶈壇鍘熷洜";
this.gridColumn35.FieldName = "badReson";
- this.gridColumn35.MinWidth = 31;
+ this.gridColumn35.MinWidth = 25;
this.gridColumn35.Name = "gridColumn35";
this.gridColumn35.Visible = true;
this.gridColumn35.VisibleIndex = 11;
- this.gridColumn35.Width = 117;
+ this.gridColumn35.Width = 94;
//
// gridColumn36
//
this.gridColumn36.Caption = "涓嶈壇瀵圭瓥";
this.gridColumn36.FieldName = "repairMethd";
- this.gridColumn36.MinWidth = 31;
+ this.gridColumn36.MinWidth = 25;
this.gridColumn36.Name = "gridColumn36";
this.gridColumn36.Visible = true;
this.gridColumn36.VisibleIndex = 12;
- this.gridColumn36.Width = 117;
+ this.gridColumn36.Width = 94;
//
// tabMxPage1
//
this.tabMxPage1.Controls.Add(this.gcMx1);
- this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1562, 327);
+ this.tabMxPage1.Size = new System.Drawing.Size(1249, 266);
this.tabMxPage1.Text = "宸蹭慨鐞嗘槑缁�";
//
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1562, 327);
+ this.gcMx1.Size = new System.Drawing.Size(1249, 266);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1427,7 +1357,6 @@
this.gridColumn4,
this.gridColumn14,
this.gridColumn25});
- this.gvMx1.DetailHeight = 428;
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1438,81 +1367,77 @@
//
this.gridColumn12.Caption = "guid";
this.gridColumn12.FieldName = "guid";
- this.gridColumn12.MinWidth = 31;
+ this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.OptionsColumn.ReadOnly = true;
- this.gridColumn12.Width = 117;
+ this.gridColumn12.Width = 94;
//
// gridColumn24
//
this.gridColumn24.Caption = "浜х嚎";
this.gridColumn24.FieldName = "lineName";
- this.gridColumn24.MinWidth = 31;
+ this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 0;
- this.gridColumn24.Width = 117;
+ this.gridColumn24.Width = 94;
//
// gvMx2status
//
this.gvMx2status.AppearanceCell.Options.UseFont = true;
this.gvMx2status.Caption = "宸ュ崟缂栧彿";
this.gvMx2status.FieldName = "gdbh";
- this.gvMx2status.MinWidth = 12;
+ this.gvMx2status.MinWidth = 10;
this.gvMx2status.Name = "gvMx2status";
this.gvMx2status.OptionsColumn.ReadOnly = true;
this.gvMx2status.Tag = "query_a.status";
this.gvMx2status.Visible = true;
this.gvMx2status.VisibleIndex = 1;
- this.gvMx2status.Width = 89;
+ this.gvMx2status.Width = 71;
//
// gvMx2pbillNo
//
this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true;
this.gvMx2pbillNo.Caption = "杩芥函鐮�";
this.gvMx2pbillNo.FieldName = "barCode";
- this.gvMx2pbillNo.MinWidth = 25;
this.gvMx2pbillNo.Name = "gvMx2pbillNo";
this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
this.gvMx2pbillNo.Tag = "query_a.pbill_no";
this.gvMx2pbillNo.Visible = true;
this.gvMx2pbillNo.VisibleIndex = 2;
- this.gvMx2pbillNo.Width = 114;
+ this.gvMx2pbillNo.Width = 91;
//
// gvMx2itemNo
//
this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜";
this.gvMx2itemNo.FieldName = "itemNo";
- this.gvMx2itemNo.MinWidth = 25;
this.gvMx2itemNo.Name = "gvMx2itemNo";
this.gvMx2itemNo.OptionsColumn.ReadOnly = true;
this.gvMx2itemNo.Tag = "query_a.item_no";
this.gvMx2itemNo.Visible = true;
this.gvMx2itemNo.VisibleIndex = 3;
- this.gvMx2itemNo.Width = 114;
+ this.gvMx2itemNo.Width = 91;
//
// gridColumn5
//
this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
this.gridColumn5.FieldName = "itemName";
- this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 4;
- this.gridColumn5.Width = 114;
+ this.gridColumn5.Width = 91;
//
// gridColumn6
//
this.gridColumn6.Caption = "瑙勬牸鍨嬪彿";
this.gridColumn6.FieldName = "itemModel";
- this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 5;
- this.gridColumn6.Width = 114;
+ this.gridColumn6.Width = 91;
//
// gridColumn7
//
@@ -1522,80 +1447,89 @@
this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn7.Caption = "淇悊鐘舵��";
this.gridColumn7.FieldName = "repairResult";
- this.gridColumn7.MinWidth = 31;
+ this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 6;
- this.gridColumn7.Width = 114;
+ this.gridColumn7.Width = 91;
//
// gridColumn2
//
this.gridColumn2.Caption = "閫佷慨宸ュ簭";
this.gridColumn2.FieldName = "processNo";
- this.gridColumn2.MinWidth = 31;
+ this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 7;
- this.gridColumn2.Width = 114;
+ this.gridColumn2.Width = 91;
//
// gridColumn26
//
this.gridColumn26.Caption = "閫佷慨鍛�";
- this.gridColumn26.FieldName = "createByName";
- this.gridColumn26.MinWidth = 31;
+ this.gridColumn26.FieldName = "createBy";
+ this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
this.gridColumn26.VisibleIndex = 8;
- this.gridColumn26.Width = 117;
+ this.gridColumn26.Width = 94;
//
// gridColumn15
//
this.gridColumn15.Caption = "閫佷慨鏃堕棿";
this.gridColumn15.FieldName = "createDate";
- this.gridColumn15.MinWidth = 31;
+ this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
this.gridColumn15.VisibleIndex = 9;
- this.gridColumn15.Width = 141;
+ this.gridColumn15.Width = 113;
//
// gridColumn4
//
this.gridColumn4.Caption = "涓嶈壇鎻忚堪";
this.gridColumn4.FieldName = "badDescription";
- this.gridColumn4.MinWidth = 31;
+ this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 10;
- this.gridColumn4.Width = 114;
+ this.gridColumn4.Width = 91;
//
// gridColumn14
//
this.gridColumn14.Caption = "涓嶈壇鍘熷洜";
this.gridColumn14.FieldName = "repairReson";
- this.gridColumn14.MinWidth = 31;
+ this.gridColumn14.MinWidth = 25;
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.Visible = true;
this.gridColumn14.VisibleIndex = 11;
- this.gridColumn14.Width = 117;
+ this.gridColumn14.Width = 94;
//
// gridColumn25
//
this.gridColumn25.Caption = "涓嶈壇瀵圭瓥";
this.gridColumn25.FieldName = "repairMethd";
- this.gridColumn25.MinWidth = 31;
+ this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 12;
- this.gridColumn25.Width = 117;
+ this.gridColumn25.Width = 94;
+ //
+ // gridColumn19
+ //
+ this.gridColumn19.Caption = "鐢熶骇缁勭粐";
+ this.gridColumn19.FieldName = "fSubsidiary";
+ this.gridColumn19.MinWidth = 25;
+ this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.Visible = true;
+ this.gridColumn19.VisibleIndex = 11;
+ this.gridColumn19.Width = 94;
//
// Frm_Repair
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1566, 834);
+ this.ClientSize = new System.Drawing.Size(1253, 682);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_Repair";
this.Text = "鐜板満淇悊";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1627,7 +1561,7 @@
this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_gdbh.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_processNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_barCode111.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
@@ -1692,7 +1626,7 @@
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraEditors.TextEdit txt_gdbh;
private DevExpress.XtraEditors.TextEdit txt_processNo;
- private DevExpress.XtraEditors.TextEdit txt_createByName;
+ private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.TextEdit txt_barCode111;
private DevExpress.XtraEditors.TextEdit txt_itemNo;
private DevExpress.XtraEditors.TextEdit txt_itemName;
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs
index 6c7dbf3..d3bcf0c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs
@@ -30,13 +30,13 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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 rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -147,10 +147,9 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -158,11 +157,10 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -171,9 +169,8 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -182,7 +179,6 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -195,19 +191,17 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1408, 698);
+ this.split1.Size = new System.Drawing.Size(1126, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1408, 635);
+ this.gcMain1.Size = new System.Drawing.Size(1126, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -229,9 +223,8 @@
this.gv_lastUpdateBy,
this.gv_lastUpdateDate,
this.gridColumn2});
- this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 62;
+ this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -242,180 +235,179 @@
this.gv_guid.AppearanceCell.Options.UseFont = true;
this.gv_guid.Caption = "涓婚敭GUID ";
this.gv_guid.FieldName = "guid";
- this.gv_guid.MinWidth = 62;
+ this.gv_guid.MinWidth = 50;
this.gv_guid.Name = "gv_guid";
this.gv_guid.OptionsColumn.AllowEdit = false;
this.gv_guid.Tag = "query_a.guid";
- this.gv_guid.Width = 117;
+ this.gv_guid.Width = 94;
//
// gv_processNo
//
this.gv_processNo.AppearanceCell.Options.UseFont = true;
this.gv_processNo.Caption = "宸ュ簭浠ｇ爜";
this.gv_processNo.FieldName = "processNo";
- this.gv_processNo.MinWidth = 62;
+ this.gv_processNo.MinWidth = 50;
this.gv_processNo.Name = "gv_processNo";
this.gv_processNo.OptionsColumn.AllowEdit = false;
this.gv_processNo.Tag = "query_a.hNo";
this.gv_processNo.Visible = true;
this.gv_processNo.VisibleIndex = 0;
- this.gv_processNo.Width = 117;
+ this.gv_processNo.Width = 94;
//
// gv_processName
//
this.gv_processName.AppearanceCell.Options.UseFont = true;
this.gv_processName.Caption = "宸ュ簭鍚嶇О ";
this.gv_processName.FieldName = "processName";
- this.gv_processName.MinWidth = 62;
+ this.gv_processName.MinWidth = 50;
this.gv_processName.Name = "gv_processName";
this.gv_processName.OptionsColumn.AllowEdit = false;
this.gv_processName.Tag = "query_a.name";
this.gv_processName.Visible = true;
this.gv_processName.VisibleIndex = 1;
- this.gv_processName.Width = 117;
+ this.gv_processName.Width = 94;
//
// gv_remark
//
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "宸ュ簭澶囨敞 ";
this.gv_remark.FieldName = "remark";
- this.gv_remark.MinWidth = 62;
+ this.gv_remark.MinWidth = 50;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
this.gv_remark.VisibleIndex = 2;
- this.gv_remark.Width = 117;
+ this.gv_remark.Width = 94;
//
// gv_isBack
//
this.gv_isBack.AppearanceCell.Options.UseFont = true;
this.gv_isBack.Caption = "鏄惁杩斿伐";
this.gv_isBack.FieldName = "isBack";
- this.gv_isBack.MinWidth = 62;
+ this.gv_isBack.MinWidth = 50;
this.gv_isBack.Name = "gv_isBack";
this.gv_isBack.OptionsColumn.AllowEdit = false;
this.gv_isBack.Tag = "query_a.isBack";
this.gv_isBack.Visible = true;
this.gv_isBack.VisibleIndex = 3;
- this.gv_isBack.Width = 117;
+ this.gv_isBack.Width = 94;
//
// gridColumn1
//
this.gridColumn1.Caption = "鏄惁鍙嶈拷婧爜";
this.gridColumn1.FieldName = "isZsm";
- this.gridColumn1.MinWidth = 31;
+ this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 4;
- this.gridColumn1.Width = 117;
+ this.gridColumn1.Width = 94;
//
// gv_isStatus
//
this.gv_isStatus.AppearanceCell.Options.UseFont = true;
this.gv_isStatus.Caption = "浣跨敤鐘舵�� ";
this.gv_isStatus.FieldName = "isStatus";
- this.gv_isStatus.MinWidth = 62;
+ this.gv_isStatus.MinWidth = 50;
this.gv_isStatus.Name = "gv_isStatus";
this.gv_isStatus.OptionsColumn.AllowEdit = false;
this.gv_isStatus.Tag = "query_a.isStatus";
this.gv_isStatus.Visible = true;
this.gv_isStatus.VisibleIndex = 6;
- this.gv_isStatus.Width = 117;
+ this.gv_isStatus.Width = 94;
//
// gv_description
//
this.gv_description.AppearanceCell.Options.UseFont = true;
this.gv_description.Caption = "鎻忚堪 ";
this.gv_description.FieldName = "description";
- this.gv_description.MinWidth = 62;
+ this.gv_description.MinWidth = 50;
this.gv_description.Name = "gv_description";
this.gv_description.OptionsColumn.AllowEdit = false;
this.gv_description.Tag = "query_a.description";
this.gv_description.Visible = true;
this.gv_description.VisibleIndex = 7;
- this.gv_description.Width = 117;
+ this.gv_description.Width = 94;
//
// gv_createBy
//
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "寤虹珛鑰� ";
- this.gv_createBy.FieldName = "createByName";
- this.gv_createBy.MinWidth = 62;
+ this.gv_createBy.FieldName = "createBy";
+ this.gv_createBy.MinWidth = 50;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
- this.gv_createBy.Tag = "cj.USER_NAME";
+ this.gv_createBy.Tag = "query_a.createBy";
this.gv_createBy.Visible = true;
this.gv_createBy.VisibleIndex = 8;
- this.gv_createBy.Width = 117;
+ this.gv_createBy.Width = 94;
//
// gv_createDate
//
this.gv_createDate.AppearanceCell.Options.UseFont = true;
this.gv_createDate.Caption = "寤虹珛鏃堕棿 ";
this.gv_createDate.FieldName = "createDate";
- this.gv_createDate.MinWidth = 62;
+ this.gv_createDate.MinWidth = 50;
this.gv_createDate.Name = "gv_createDate";
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.createDate";
this.gv_createDate.Visible = true;
this.gv_createDate.VisibleIndex = 9;
- this.gv_createDate.Width = 117;
+ this.gv_createDate.Width = 94;
//
// gv_lastUpdateBy
//
this.gv_lastUpdateBy.AppearanceCell.Options.UseFont = true;
this.gv_lastUpdateBy.Caption = "鏇存柊鑰� ";
- this.gv_lastUpdateBy.FieldName = "lastupdateByName";
- this.gv_lastUpdateBy.MinWidth = 62;
+ this.gv_lastUpdateBy.FieldName = "lastUpdateBy";
+ this.gv_lastUpdateBy.MinWidth = 50;
this.gv_lastUpdateBy.Name = "gv_lastUpdateBy";
this.gv_lastUpdateBy.OptionsColumn.AllowEdit = false;
- this.gv_lastUpdateBy.Tag = "gx.USER_NAME";
+ this.gv_lastUpdateBy.Tag = "query_a.lastUpdateBy";
this.gv_lastUpdateBy.Visible = true;
this.gv_lastUpdateBy.VisibleIndex = 10;
- this.gv_lastUpdateBy.Width = 117;
+ this.gv_lastUpdateBy.Width = 94;
//
// gv_lastUpdateDate
//
this.gv_lastUpdateDate.AppearanceCell.Options.UseFont = true;
this.gv_lastUpdateDate.Caption = "鏇存柊鏃堕棿 ";
this.gv_lastUpdateDate.FieldName = "lastUpdateDate";
- this.gv_lastUpdateDate.MinWidth = 62;
+ this.gv_lastUpdateDate.MinWidth = 50;
this.gv_lastUpdateDate.Name = "gv_lastUpdateDate";
this.gv_lastUpdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastUpdateDate.Tag = "query_a.lastUpdateDate";
this.gv_lastUpdateDate.Visible = true;
this.gv_lastUpdateDate.VisibleIndex = 11;
- this.gv_lastUpdateDate.Width = 117;
+ this.gv_lastUpdateDate.Width = 94;
//
// gridColumn2
//
this.gridColumn2.Caption = "鏄惁鍙嶆墭鏉跨爜";
this.gridColumn2.FieldName = "isTbm";
- this.gridColumn2.MinWidth = 31;
+ this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 5;
- this.gridColumn2.Width = 117;
+ this.gridColumn2.Width = 94;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 635);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1408, 48);
+ this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// xtraTabPage2
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
- this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -423,7 +415,6 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
@@ -435,8 +426,8 @@
//
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1408, 698);
- this.splitMx1.SplitterPosition = 130;
+ this.splitMx1.Size = new System.Drawing.Size(1126, 570);
+ this.splitMx1.SplitterPosition = 106;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -460,154 +451,139 @@
this.layoutControlItem12,
this.layoutControlItem1});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
- this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(431, 476, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1408, 130);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 106);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// lbGuid
//
- this.lbGuid.Location = new System.Drawing.Point(1050, 164);
- this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbGuid.Location = new System.Drawing.Point(840, 134);
this.lbGuid.Name = "lbGuid";
- this.lbGuid.Size = new System.Drawing.Size(342, 71);
+ this.lbGuid.Size = new System.Drawing.Size(274, 58);
this.lbGuid.TabIndex = 1;
this.lbGuid.Text = "lbGuid";
//
// txt_description
//
- this.txt_description.Location = new System.Drawing.Point(101, 84);
- this.txt_description.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_description.Location = new System.Drawing.Point(84, 69);
this.txt_description.Name = "txt_description";
this.txt_description.Properties.Appearance.Options.UseFont = true;
- this.txt_description.Size = new System.Drawing.Size(255, 28);
+ this.txt_description.Size = new System.Drawing.Size(200, 24);
this.txt_description.StyleController = this.layoutMx1;
this.txt_description.TabIndex = 222;
//
// txt_lastUpdateDate
//
- this.txt_lastUpdateDate.Location = new System.Drawing.Point(1139, 49);
- this.txt_lastUpdateDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_lastUpdateDate.Location = new System.Drawing.Point(912, 40);
this.txt_lastUpdateDate.Name = "txt_lastUpdateDate";
this.txt_lastUpdateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_lastUpdateDate.Size = new System.Drawing.Size(255, 28);
+ this.txt_lastUpdateDate.Size = new System.Drawing.Size(202, 24);
this.txt_lastUpdateDate.StyleController = this.layoutMx1;
this.txt_lastUpdateDate.TabIndex = 235;
this.txt_lastUpdateDate.Tag = "readonly";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(793, 84);
- this.txt_remark.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_remark.Location = new System.Drawing.Point(636, 69);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(255, 28);
+ this.txt_remark.Size = new System.Drawing.Size(200, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 216;
//
// txt_guid
//
- this.txt_guid.Location = new System.Drawing.Point(1148, 100);
- this.txt_guid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_guid.Location = new System.Drawing.Point(918, 82);
this.txt_guid.Name = "txt_guid";
this.txt_guid.Properties.Appearance.Options.UseFont = true;
- this.txt_guid.Size = new System.Drawing.Size(245, 28);
+ this.txt_guid.Size = new System.Drawing.Size(196, 24);
this.txt_guid.StyleController = this.layoutMx1;
this.txt_guid.TabIndex = 210;
//
// txt_lastUpdateBy
//
- this.txt_lastUpdateBy.Location = new System.Drawing.Point(1139, 14);
- this.txt_lastUpdateBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_lastUpdateBy.Location = new System.Drawing.Point(912, 12);
this.txt_lastUpdateBy.Name = "txt_lastUpdateBy";
this.txt_lastUpdateBy.Properties.Appearance.Options.UseFont = true;
- this.txt_lastUpdateBy.Size = new System.Drawing.Size(255, 28);
+ this.txt_lastUpdateBy.Size = new System.Drawing.Size(202, 24);
this.txt_lastUpdateBy.StyleController = this.layoutMx1;
this.txt_lastUpdateBy.TabIndex = 231;
this.txt_lastUpdateBy.Tag = "readonly";
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(793, 14);
- this.txt_createBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_createBy.Location = new System.Drawing.Point(636, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(255, 28);
+ this.txt_createBy.Size = new System.Drawing.Size(200, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 226;
this.txt_createBy.Tag = "readonly";
//
// txt_processName
//
- this.txt_processName.Location = new System.Drawing.Point(101, 49);
- this.txt_processName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_processName.Location = new System.Drawing.Point(84, 40);
this.txt_processName.Name = "txt_processName";
this.txt_processName.Properties.Appearance.Options.UseFont = true;
- this.txt_processName.Size = new System.Drawing.Size(255, 28);
+ this.txt_processName.Size = new System.Drawing.Size(200, 24);
this.txt_processName.StyleController = this.layoutMx1;
this.txt_processName.TabIndex = 213;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(793, 49);
- this.txt_createDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_createDate.Location = new System.Drawing.Point(636, 40);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(255, 28);
+ this.txt_createDate.Size = new System.Drawing.Size(200, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 228;
this.txt_createDate.Tag = "readonly";
//
// txt_processNo
//
- this.txt_processNo.Location = new System.Drawing.Point(101, 14);
- this.txt_processNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_processNo.Location = new System.Drawing.Point(84, 12);
this.txt_processNo.Name = "txt_processNo";
this.txt_processNo.Properties.Appearance.Options.UseFont = true;
- this.txt_processNo.Size = new System.Drawing.Size(255, 28);
+ this.txt_processNo.Size = new System.Drawing.Size(200, 24);
this.txt_processNo.StyleController = this.layoutMx1;
this.txt_processNo.TabIndex = 211;
//
// txt_isBack
//
- this.txt_isBack.Location = new System.Drawing.Point(360, 14);
- this.txt_isBack.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_isBack.Location = new System.Drawing.Point(288, 12);
this.txt_isBack.Name = "txt_isBack";
this.txt_isBack.Properties.Caption = "鏄惁杩斿伐鐐�";
- this.txt_isBack.Size = new System.Drawing.Size(342, 27);
+ this.txt_isBack.Size = new System.Drawing.Size(272, 24);
this.txt_isBack.StyleController = this.layoutMx1;
this.txt_isBack.TabIndex = 236;
//
// txt_isStatus
//
- this.txt_isStatus.Location = new System.Drawing.Point(1052, 84);
- this.txt_isStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_isStatus.Location = new System.Drawing.Point(840, 69);
this.txt_isStatus.Name = "txt_isStatus";
this.txt_isStatus.Properties.Caption = "浣跨敤鐘舵��";
- this.txt_isStatus.Size = new System.Drawing.Size(342, 27);
+ this.txt_isStatus.Size = new System.Drawing.Size(274, 24);
this.txt_isStatus.StyleController = this.layoutMx1;
this.txt_isStatus.TabIndex = 237;
//
// txt_isZsm
//
- this.txt_isZsm.Location = new System.Drawing.Point(360, 49);
- this.txt_isZsm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_isZsm.Location = new System.Drawing.Point(288, 40);
this.txt_isZsm.Name = "txt_isZsm";
this.txt_isZsm.Properties.Caption = "鏄惁鍙嶈拷婧爜";
- this.txt_isZsm.Size = new System.Drawing.Size(342, 27);
+ this.txt_isZsm.Size = new System.Drawing.Size(272, 24);
this.txt_isZsm.StyleController = this.layoutMx1;
this.txt_isZsm.TabIndex = 238;
//
// txt_isTbm
//
- this.txt_isTbm.Location = new System.Drawing.Point(360, 84);
- this.txt_isTbm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txt_isTbm.Location = new System.Drawing.Point(288, 69);
this.txt_isTbm.Name = "txt_isTbm";
this.txt_isTbm.Properties.Caption = "鏄惁鍙嶆墭鏉跨爜";
- this.txt_isTbm.Size = new System.Drawing.Size(342, 27);
+ this.txt_isTbm.Size = new System.Drawing.Size(272, 24);
this.txt_isTbm.StyleController = this.layoutMx1;
this.txt_isTbm.TabIndex = 239;
//
@@ -632,7 +608,7 @@
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem1.Size = new System.Drawing.Size(278, 35);
this.layoutControlItem1.Text = "涓婚敭GUID";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(155, 22);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(124, 18);
//
// Root
//
@@ -653,92 +629,92 @@
this.layoutControlItem14});
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});
- 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;
+ 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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition4,
- rowDefinition5,
- rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1408, 130);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3});
+ this.Root.Size = new System.Drawing.Size(1126, 106);
this.Root.TextVisible = false;
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_createDate;
- this.layoutControlItem3.Location = new System.Drawing.Point(692, 35);
+ this.layoutControlItem3.Location = new System.Drawing.Point(552, 28);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(346, 35);
+ this.layoutControlItem3.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem3.Text = "寤虹珛鏃堕棿";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_createBy;
- this.layoutControlItem6.Location = new System.Drawing.Point(692, 0);
+ this.layoutControlItem6.Location = new System.Drawing.Point(552, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(346, 35);
+ this.layoutControlItem6.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem6.Text = "寤虹珛浜哄憳";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_lastUpdateBy;
this.layoutControlItem7.CustomizationFormText = "鏇存柊浜哄憳";
- this.layoutControlItem7.Location = new System.Drawing.Point(1038, 0);
+ this.layoutControlItem7.Location = new System.Drawing.Point(828, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem7.Size = new System.Drawing.Size(346, 35);
+ this.layoutControlItem7.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem7.Text = "鏇存柊浜哄憳";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_lastUpdateDate;
- this.layoutControlItem8.Location = new System.Drawing.Point(1038, 35);
+ this.layoutControlItem8.Location = new System.Drawing.Point(828, 28);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(346, 35);
+ this.layoutControlItem8.Size = new System.Drawing.Size(278, 29);
this.layoutControlItem8.Text = "鏇存柊鏃堕棿";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_description;
- this.layoutControlItem10.Location = new System.Drawing.Point(0, 70);
+ this.layoutControlItem10.Location = new System.Drawing.Point(0, 57);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(346, 36);
+ this.layoutControlItem10.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem10.Text = "宸ュ簭鎻忚堪";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_isBack;
- this.layoutControlItem2.Location = new System.Drawing.Point(346, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(346, 35);
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem2.Text = "鏄惁杩斿伐";
this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem2.TextVisible = false;
@@ -748,28 +724,28 @@
this.layoutControlItem4.Control = this.txt_processNo;
this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.Size = new System.Drawing.Size(346, 35);
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem4.Text = "宸ュ簭浠ｇ爜";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_processName;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 35);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(346, 35);
+ this.layoutControlItem9.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem9.Text = "宸ュ簭鍚嶇О";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_isZsm;
- this.layoutControlItem13.Location = new System.Drawing.Point(346, 35);
+ this.layoutControlItem13.Location = new System.Drawing.Point(276, 28);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem13.Size = new System.Drawing.Size(346, 35);
+ this.layoutControlItem13.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem13.Text = "鏄惁鍙嶈拷婧爜";
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem13.TextVisible = false;
@@ -777,11 +753,11 @@
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_isStatus;
- this.layoutControlItem5.Location = new System.Drawing.Point(1038, 70);
+ this.layoutControlItem5.Location = new System.Drawing.Point(828, 57);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(346, 36);
+ this.layoutControlItem5.Size = new System.Drawing.Size(278, 29);
this.layoutControlItem5.Text = "鐘舵��";
this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem5.TextVisible = false;
@@ -789,34 +765,33 @@
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_remark;
- this.layoutControlItem11.Location = new System.Drawing.Point(692, 70);
+ this.layoutControlItem11.Location = new System.Drawing.Point(552, 57);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(346, 36);
+ this.layoutControlItem11.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem11.Text = "宸ュ簭澶囨敞";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 22);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_isTbm;
- this.layoutControlItem14.Location = new System.Drawing.Point(346, 70);
+ this.layoutControlItem14.Location = new System.Drawing.Point(276, 57);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(346, 36);
+ this.layoutControlItem14.Size = new System.Drawing.Size(276, 29);
this.layoutControlItem14.Text = "鏄惁鍙嶆墭鏉跨爜";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem14.TextVisible = false;
//
// Frm_WorkProcesses
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1410, 834);
+ this.ClientSize = new System.Drawing.Size(1128, 682);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "Frm_WorkProcesses";
this.Text = "宸ュ簭";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index c4c52d1..15ba8e0 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -641,6 +641,24 @@
<Compile Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.Designer.cs">
<DependentUpon>Frm_MesQaItemsDetect01Input.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\QC\Frm_MesQmCheckitemDtByLeiBie.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\Frm_MesQmCheckitemDtByLeiBie.Designer.cs">
+ <DependentUpon>Frm_MesQmCheckitemDtByLeiBie.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\QC\JyxmByLeiBie.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\JyxmByLeiBie.Designer.cs">
+ <DependentUpon>JyxmByLeiBie.cs</DependentUpon>
+ </Compile>
+ <Compile Include="DevFrm\QC\JyxmShowByLeiBie.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\QC\JyxmShowByLeiBie.Designer.cs">
+ <DependentUpon>JyxmShowByLeiBie.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\QC\JyxmShowCopy.cs">
<SubType>Form</SubType>
</Compile>
@@ -705,12 +723,6 @@
<Compile Include="DevFrm\QC\Models\MesQmCheckitemDt.cs" />
<Compile Include="DevFrm\QC\Models\MesSysLookups.cs" />
<Compile Include="DevFrm\QC\Models\MesSysLookupTypes.cs" />
- <Compile Include="DevFrm\QC\SelOutType.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Include="DevFrm\QC\SelOutType.Designer.cs">
- <DependentUpon>SelOutType.cs</DependentUpon>
- </Compile>
<Compile Include="DevFrm\QC\Xls.cs">
<SubType>Form</SubType>
</Compile>
@@ -1931,8 +1943,17 @@
<EmbeddedResource Include="DevFrm\QC\Frm_MesQaItemsDetect01Input.resx">
<DependentUpon>Frm_MesQaItemsDetect01Input.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\Frm_MesQmCheckitemDtByLeiBie.resx">
+ <DependentUpon>Frm_MesQmCheckitemDtByLeiBie.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\JyxmByLeiBie.resx">
+ <DependentUpon>JyxmByLeiBie.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\JyxmShow.resx">
<DependentUpon>JyxmShow.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\QC\JyxmShowByLeiBie.resx">
+ <DependentUpon>JyxmShowByLeiBie.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\JyxmShowCopy.resx">
<DependentUpon>JyxmShowCopy.cs</DependentUpon>
@@ -1957,9 +1978,6 @@
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\MesQcExceptional.resx">
<DependentUpon>MesQcExceptional.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="DevFrm\QC\SelOutType.resx">
- <DependentUpon>SelOutType.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DevFrm\QC\Xls.resx">
<DependentUpon>Xls.cs</DependentUpon>
--
Gitblit v1.9.3