From 77f9269e1bef71f475c72f85fa64cdfd09a503f6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 29 三月 2025 21:51:14 +0800
Subject: [PATCH] 委外
---
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs | 17
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs | 2
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs | 419 ++++++++++--------
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs | 32
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs | 180 ++++---
DevApp/Gs.DevApp/UserControl/SelectWwPc.Designer.cs | 8
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs | 3
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs | 311 +++++++-------
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs | 88 ++--
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs | 7
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs | 241 +++++-----
11 files changed, 673 insertions(+), 635 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
index 4a8b4b2..b747d35 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
@@ -92,6 +92,7 @@
this.txt_cgdxh = new DevExpress.XtraEditors.TextEdit();
this.txt_erpProductionOrderNo = new DevExpress.XtraEditors.TextEdit();
this.txt_pcHNo = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -108,11 +109,10 @@
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -178,6 +178,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_cgdxh.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpProductionOrderNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_pcHNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -194,11 +195,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -211,6 +211,7 @@
//
this.toolBarMenu1.chkParameter = null;
this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -329,7 +330,7 @@
//
this.gv_daa001.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_daa001.AppearanceCell.Options.UseFont = true;
- this.gv_daa001.Caption = "宸ュ崟鍙� ";
+ this.gv_daa001.Caption = "濮斿宸ュ崟鍙� ";
this.gv_daa001.FieldName = "daa001";
this.gv_daa001.MinWidth = 50;
this.gv_daa001.Name = "gv_daa001";
@@ -667,6 +668,8 @@
this.layoutMx1.Controls.Add(this.txt_erpProductionOrderNo);
this.layoutMx1.Controls.Add(this.txt_pcHNo);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem16});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
@@ -686,18 +689,18 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(119, 108);
+ this.txt_remark.Location = new System.Drawing.Point(119, 140);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
this.txt_remark.Properties.ReadOnly = true;
- this.txt_remark.Size = new System.Drawing.Size(160, 28);
+ this.txt_remark.Size = new System.Drawing.Size(431, 28);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 312;
//
// txt_blUser
//
- this.txt_blUser.Location = new System.Drawing.Point(390, 108);
+ this.txt_blUser.Location = new System.Drawing.Point(119, 108);
this.txt_blUser.Name = "txt_blUser";
this.txt_blUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_blUser.Properties.Appearance.Options.UseFont = true;
@@ -708,7 +711,7 @@
//
// txt_blTime
//
- this.txt_blTime.Location = new System.Drawing.Point(661, 108);
+ this.txt_blTime.Location = new System.Drawing.Point(390, 108);
this.txt_blTime.Name = "txt_blTime";
this.txt_blTime.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_blTime.Properties.Appearance.Options.UseFont = true;
@@ -851,7 +854,7 @@
//
// txt_cgd
//
- this.txt_cgd.Location = new System.Drawing.Point(119, 140);
+ this.txt_cgd.Location = new System.Drawing.Point(661, 140);
this.txt_cgd.Name = "txt_cgd";
this.txt_cgd.Size = new System.Drawing.Size(160, 24);
this.txt_cgd.StyleController = this.layoutMx1;
@@ -859,27 +862,39 @@
//
// txt_cgdxh
//
- this.txt_cgdxh.Location = new System.Drawing.Point(390, 140);
+ this.txt_cgdxh.Location = new System.Drawing.Point(932, 140);
this.txt_cgdxh.Name = "txt_cgdxh";
- this.txt_cgdxh.Size = new System.Drawing.Size(160, 24);
+ this.txt_cgdxh.Size = new System.Drawing.Size(161, 24);
this.txt_cgdxh.StyleController = this.layoutMx1;
this.txt_cgdxh.TabIndex = 314;
//
// txt_erpProductionOrderNo
//
- this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(661, 140);
+ this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(932, 108);
this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
- this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(160, 24);
+ this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(161, 24);
this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
this.txt_erpProductionOrderNo.TabIndex = 315;
//
// txt_pcHNo
//
- this.txt_pcHNo.Location = new System.Drawing.Point(932, 140);
+ this.txt_pcHNo.Location = new System.Drawing.Point(661, 108);
this.txt_pcHNo.Name = "txt_pcHNo";
- this.txt_pcHNo.Size = new System.Drawing.Size(161, 24);
+ this.txt_pcHNo.Size = new System.Drawing.Size(160, 24);
this.txt_pcHNo.StyleController = this.layoutMx1;
this.txt_pcHNo.TabIndex = 316;
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.lbGuid;
+ this.layoutControlItem16.Location = new System.Drawing.Point(813, 96);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem16.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem16.Text = "lbGuid";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem16.TextVisible = false;
//
// Root
//
@@ -901,11 +916,10 @@
this.layoutControlItem13,
this.layoutControlItem14,
this.layoutControlItem15,
- this.layoutControlItem16,
- this.layoutControlItem17,
- this.layoutControlItem18,
+ this.layoutControlItem20,
this.layoutControlItem19,
- this.layoutControlItem20});
+ this.layoutControlItem18,
+ this.layoutControlItem17});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -943,10 +957,11 @@
// layoutControlItem1
//
this.layoutControlItem1.Control = this.txt_daa001;
+ this.layoutControlItem1.CustomizationFormText = "濮斿宸ュ崟鍙�";
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem1.Text = "宸ュ崟鍙�";
+ this.layoutControlItem1.Text = "濮斿宸ュ崟鍙�";
this.layoutControlItem1.TextSize = new System.Drawing.Size(95, 18);
//
// layoutControlItem2
@@ -986,7 +1001,7 @@
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem5.Text = "鐗╂枡";
+ this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(95, 18);
//
// layoutControlItem6
@@ -1068,19 +1083,19 @@
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_remark;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 128);
this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem13.Size = new System.Drawing.Size(542, 32);
this.layoutControlItem13.Text = "澶囨敞";
this.layoutControlItem13.TextSize = new System.Drawing.Size(95, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_blUser;
- this.layoutControlItem14.Location = new System.Drawing.Point(271, 96);
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 96);
this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem14.Text = "澶囨枡浜� ";
@@ -1089,68 +1104,57 @@
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_blTime;
- this.layoutControlItem15.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem15.Location = new System.Drawing.Point(271, 96);
this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem15.Text = "澶囨枡鏃堕棿 ";
this.layoutControlItem15.TextSize = new System.Drawing.Size(95, 18);
//
- // layoutControlItem16
+ // layoutControlItem20
//
- this.layoutControlItem16.Control = this.lbGuid;
- this.layoutControlItem16.Location = new System.Drawing.Point(813, 96);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem16.Text = "lbGuid";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem16.TextVisible = false;
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_cgd;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 128);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem17.Text = "閲囪喘鍗曞彿";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(95, 18);
- //
- // layoutControlItem18
- //
- this.layoutControlItem18.Control = this.txt_cgdxh;
- this.layoutControlItem18.Location = new System.Drawing.Point(271, 128);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem18.Text = "閲囪喘鍗曡鍙�";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(95, 18);
+ this.layoutControlItem20.Control = this.txt_pcHNo;
+ this.layoutControlItem20.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem20.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem20.Text = "鎺掍骇缂栧彿";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(95, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_erpProductionOrderNo;
- this.layoutControlItem19.Location = new System.Drawing.Point(542, 128);
+ this.layoutControlItem19.Location = new System.Drawing.Point(813, 96);
this.layoutControlItem19.Name = "layoutControlItem19";
- this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem19.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem19.Size = new System.Drawing.Size(272, 32);
this.layoutControlItem19.Text = "浠诲姟鍗曞彿";
this.layoutControlItem19.TextSize = new System.Drawing.Size(95, 18);
//
- // layoutControlItem20
+ // layoutControlItem18
//
- this.layoutControlItem20.Control = this.txt_pcHNo;
- this.layoutControlItem20.Location = new System.Drawing.Point(813, 128);
- this.layoutControlItem20.Name = "layoutControlItem20";
- this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem20.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem20.Text = "鎺掍骇缂栧彿";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(95, 18);
+ this.layoutControlItem18.Control = this.txt_cgdxh;
+ this.layoutControlItem18.Location = new System.Drawing.Point(813, 128);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem18.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem18.Text = "閲囪喘鍗曡鍙�";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(95, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_cgd;
+ this.layoutControlItem17.Location = new System.Drawing.Point(542, 128);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem17.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem17.Text = "閲囪喘鍗曞彿";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(95, 18);
//
// tabMx
//
@@ -1185,6 +1189,8 @@
//
this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMx1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1.Appearance.Row.Options.UseFont = true;
this.gvMx1.ColumnPanelRowHeight = 50;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1id,
@@ -1540,6 +1546,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_cgdxh.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpProductionOrderNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_pcHNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1556,11 +1563,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1631,9 +1637,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -1668,9 +1671,12 @@
private DevExpress.XtraEditors.TextEdit txt_cgdxh;
private DevExpress.XtraEditors.TextEdit txt_erpProductionOrderNo;
private DevExpress.XtraEditors.TextEdit txt_pcHNo;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
index 04b0287..1c0036e 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.cs
@@ -28,10 +28,7 @@
this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gridView1);
- gvList.Add(gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
+ this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx( gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, picCheckBox, this, "pcShChk", "", (value) =>
{
@@ -49,7 +46,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs
index e1c765b..765badd 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.Designer.cs
@@ -29,14 +29,14 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -79,22 +79,25 @@
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
+ this.txt_tldh = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -123,7 +126,6 @@
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -158,22 +160,25 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tldh.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -183,7 +188,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -331,7 +335,7 @@
//
this.gv_pbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_pbillNo.AppearanceCell.Options.UseFont = true;
- this.gv_pbillNo.Caption = "宸ュ崟鍗曞彿";
+ this.gv_pbillNo.Caption = "濮斿宸ュ崟鍙�";
this.gv_pbillNo.FieldName = "pbillNo";
this.gv_pbillNo.MinWidth = 50;
this.gv_pbillNo.Name = "gv_pbillNo";
@@ -527,7 +531,7 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 136;
+ this.splitMx1.SplitterPosition = 139;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -548,6 +552,7 @@
this.layoutMx1.Controls.Add(this.txt_itemNo);
this.layoutMx1.Controls.Add(this.txt_itemName);
this.layoutMx1.Controls.Add(this.txt_itemModel);
+ this.layoutMx1.Controls.Add(this.txt_tldh);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem12,
@@ -556,7 +561,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(553, 530, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 136);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 139);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -571,107 +576,107 @@
//
// txt_depotName
//
- this.txt_depotName.Location = new System.Drawing.Point(355, 0);
+ this.txt_depotName.Location = new System.Drawing.Point(370, 12);
this.txt_depotName.Name = "txt_depotName";
this.txt_depotName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_depotName.Properties.Appearance.Options.UseFont = true;
- this.txt_depotName.Size = new System.Drawing.Size(195, 28);
+ this.txt_depotName.Size = new System.Drawing.Size(180, 28);
this.txt_depotName.StyleController = this.layoutMx1;
this.txt_depotName.TabIndex = 575;
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(355, 64);
+ this.txt_remark.Location = new System.Drawing.Point(99, 108);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(466, 28);
+ this.txt_remark.Size = new System.Drawing.Size(451, 28);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 243;
//
// txt_outType
//
- this.txt_outType.Location = new System.Drawing.Point(355, 32);
+ this.txt_outType.Location = new System.Drawing.Point(370, 44);
this.txt_outType.Name = "txt_outType";
this.txt_outType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_outType.Properties.Appearance.Options.UseFont = true;
- this.txt_outType.Size = new System.Drawing.Size(195, 28);
+ this.txt_outType.Size = new System.Drawing.Size(180, 28);
this.txt_outType.StyleController = this.layoutMx1;
this.txt_outType.TabIndex = 450;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(897, 32);
+ this.txt_checkDate.Location = new System.Drawing.Point(912, 44);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(196, 28);
+ this.txt_checkDate.Size = new System.Drawing.Size(181, 28);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 262;
//
// txt_pbillNo
//
- this.txt_pbillNo.Location = new System.Drawing.Point(84, 64);
+ this.txt_pbillNo.Location = new System.Drawing.Point(99, 44);
this.txt_pbillNo.Name = "txt_pbillNo";
this.txt_pbillNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_pbillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_pbillNo.Size = new System.Drawing.Size(195, 28);
+ this.txt_pbillNo.Size = new System.Drawing.Size(180, 28);
this.txt_pbillNo.StyleController = this.layoutMx1;
this.txt_pbillNo.TabIndex = 216;
//
// txt_itemOutNo
//
- this.txt_itemOutNo.Location = new System.Drawing.Point(84, 0);
+ this.txt_itemOutNo.Location = new System.Drawing.Point(99, 12);
this.txt_itemOutNo.Name = "txt_itemOutNo";
this.txt_itemOutNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemOutNo.Size = new System.Drawing.Size(195, 28);
+ this.txt_itemOutNo.Size = new System.Drawing.Size(180, 28);
this.txt_itemOutNo.StyleController = this.layoutMx1;
this.txt_itemOutNo.TabIndex = 213;
//
// txt_workNo
//
- this.txt_workNo.Location = new System.Drawing.Point(84, 32);
+ this.txt_workNo.Location = new System.Drawing.Point(641, 108);
this.txt_workNo.Name = "txt_workNo";
this.txt_workNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_workNo.Properties.Appearance.Options.UseFont = true;
- this.txt_workNo.Size = new System.Drawing.Size(195, 28);
+ this.txt_workNo.Size = new System.Drawing.Size(180, 28);
this.txt_workNo.StyleController = this.layoutMx1;
this.txt_workNo.TabIndex = 387;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(626, 0);
+ this.txt_createBy.Location = new System.Drawing.Point(641, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(195, 28);
+ this.txt_createBy.Size = new System.Drawing.Size(180, 28);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 222;
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(897, 0);
+ this.txt_checkUser.Location = new System.Drawing.Point(912, 12);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(196, 28);
+ this.txt_checkUser.Size = new System.Drawing.Size(181, 28);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 258;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(626, 32);
+ this.txt_createDate.Location = new System.Drawing.Point(641, 44);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createDate.Size = new System.Drawing.Size(195, 28);
+ this.txt_createDate.Size = new System.Drawing.Size(180, 28);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 226;
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(825, 64);
+ this.txt_status.Location = new System.Drawing.Point(825, 76);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
this.txt_status.Size = new System.Drawing.Size(268, 24);
@@ -688,27 +693,35 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(84, 96);
+ this.txt_itemNo.Location = new System.Drawing.Point(99, 76);
this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Size = new System.Drawing.Size(195, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(180, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 578;
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(355, 96);
+ this.txt_itemName.Location = new System.Drawing.Point(641, 76);
this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(195, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(180, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 579;
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(626, 96);
+ this.txt_itemModel.Location = new System.Drawing.Point(370, 76);
this.txt_itemModel.Name = "txt_itemModel";
- this.txt_itemModel.Size = new System.Drawing.Size(195, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(180, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 580;
+ //
+ // txt_tldh
+ //
+ this.txt_tldh.Location = new System.Drawing.Point(912, 108);
+ this.txt_tldh.Name = "txt_tldh";
+ this.txt_tldh.Size = new System.Drawing.Size(181, 24);
+ this.txt_tldh.StyleController = this.layoutMx1;
+ this.txt_tldh.TabIndex = 581;
//
// layoutControlItem12
//
@@ -722,6 +735,17 @@
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
//
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_guid;
+ 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(272, 32);
+ this.layoutControlItem13.Text = "涓婚敭Guid";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(50, 20);
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -731,44 +755,45 @@
this.layoutControlItem2,
this.layoutControlItem3,
this.layoutControlItem4,
- this.layoutControlItem5,
this.layoutControlItem6,
- this.layoutControlItem7,
this.layoutControlItem8,
+ this.layoutControlItem11,
+ this.layoutControlItem17,
this.layoutControlItem9,
- this.layoutControlItem10,
this.layoutControlItem14,
- this.layoutControlItem15,
this.layoutControlItem16,
- this.layoutControlItem11});
+ this.layoutControlItem10,
+ this.layoutControlItem7,
+ this.layoutControlItem5,
+ this.layoutControlItem15});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5,
- rowDefinition6,
- rowDefinition7,
- rowDefinition8});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
this.Root.Size = new System.Drawing.Size(1105, 148);
this.Root.TextVisible = false;
//
@@ -779,7 +804,7 @@
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem1.Text = "棰嗘枡鍗曞彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem2
//
@@ -789,7 +814,7 @@
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem2.Text = "鍙戣揣浠撳簱";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem3
//
@@ -799,7 +824,7 @@
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem3.Text = "鍒涘缓浜�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem4
//
@@ -809,17 +834,7 @@
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem4.Size = new System.Drawing.Size(272, 32);
this.layoutControlItem4.Text = "瀹℃牳浜�";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_workNo;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 32);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem5.Text = "鎶曟枡鍗曞彿";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem6
//
@@ -830,18 +845,7 @@
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem6.Text = "鍑哄簱绫诲埆";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_createDate;
- this.layoutControlItem7.Location = new System.Drawing.Point(542, 32);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem7.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem8
//
@@ -852,61 +856,7 @@
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem8.Size = new System.Drawing.Size(272, 32);
this.layoutControlItem8.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_pbillNo;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 64);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem9.Text = "鐢熶骇璁㈠崟";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_remark;
- this.layoutControlItem10.Location = new System.Drawing.Point(271, 64);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(542, 32);
- this.layoutControlItem10.Text = "澶囨敞淇℃伅";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_itemNo;
- this.layoutControlItem14.Location = new System.Drawing.Point(0, 96);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem14.Text = "浜у搧缂栫爜";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_itemName;
- this.layoutControlItem15.Location = new System.Drawing.Point(271, 96);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem15.Text = "浜у搧鍚嶇О";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_itemModel;
- this.layoutControlItem16.Location = new System.Drawing.Point(542, 96);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem16.Text = "浜у搧瑙勬牸";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem11
//
@@ -920,13 +870,99 @@
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
//
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_tldh;
+ this.layoutControlItem17.Location = new System.Drawing.Point(813, 96);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem17.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem17.Text = "鎶曟枡鍗曞彿";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_pbillNo;
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem9.Text = "濮斿宸ュ崟鍙�";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_itemNo;
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem14.Text = "浜у搧缂栫爜";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_itemModel;
+ this.layoutControlItem16.Location = new System.Drawing.Point(271, 64);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem16.Text = "浜у搧瑙勬牸";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_remark;
+ this.layoutControlItem10.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem10.Size = new System.Drawing.Size(542, 32);
+ this.layoutControlItem10.Text = "澶囨敞淇℃伅";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_createDate;
+ this.layoutControlItem7.Location = new System.Drawing.Point(542, 32);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem7.Text = "鍒涘缓鏃堕棿";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_workNo;
+ this.layoutControlItem5.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem5.Text = "浠诲姟鍗曞彿";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_itemName;
+ this.layoutControlItem15.Location = new System.Drawing.Point(542, 64);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem15.Text = "浜у搧鍚嶇О";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
+ //
// 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(1126, 422);
+ this.tabMx.Size = new System.Drawing.Size(1126, 419);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -936,7 +972,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 390);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 387);
this.tabMxPage1.Text = "鍑哄簱鏄庣粏";
//
// gcMx1
@@ -945,7 +981,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 390);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 387);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1095,7 +1131,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1124, 390);
+ this.tabMxPage2.Size = new System.Drawing.Size(1124, 387);
this.tabMxPage2.Text = "鍑哄簱鏉＄爜";
//
// gcMx2
@@ -1104,7 +1140,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1124, 390);
+ this.gcMx2.Size = new System.Drawing.Size(1124, 387);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1260,17 +1296,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_guid;
- 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(272, 32);
- this.layoutControlItem13.Text = "涓婚敭Guid";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(50, 20);
- //
// Frm_WwLlDj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1315,22 +1340,25 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_tldh.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1340,7 +1368,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
this.ResumeLayout(false);
}
@@ -1387,12 +1414,8 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraEditors.CheckEdit txt_status;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -1426,11 +1449,17 @@
private DevExpress.XtraEditors.TextEdit txt_itemNo;
private DevExpress.XtraEditors.TextEdit txt_itemName;
private DevExpress.XtraEditors.TextEdit txt_itemModel;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraEditors.TextEdit txt_tldh;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
index eff4e45..291655e 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwLlDj.cs
@@ -44,7 +44,7 @@
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
index dd015e2..30ec60e 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.Designer.cs
@@ -63,13 +63,13 @@
this.txt_shBy = new DevExpress.XtraEditors.TextEdit();
this.txt_shTime = new DevExpress.XtraEditors.TextEdit();
this.txt_shState = new DevExpress.XtraEditors.CheckEdit();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -120,13 +120,13 @@
((System.ComponentModel.ISupportInitialize)(this.txt_shBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shTime.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shState.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -433,6 +433,18 @@
this.txt_shState.TabIndex = 220;
this.txt_shState.Tag = "readonly";
//
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.lbGuid;
+ this.layoutControlItem6.Location = new System.Drawing.Point(828, 43);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem6.Size = new System.Drawing.Size(278, 43);
+ this.layoutControlItem6.Text = "lbGuid";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem6.TextVisible = false;
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -522,18 +534,6 @@
this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem5.TextVisible = false;
//
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.lbGuid;
- this.layoutControlItem6.Location = new System.Drawing.Point(828, 43);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(278, 43);
- this.layoutControlItem6.Text = "lbGuid";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem6.TextVisible = false;
- //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -571,6 +571,8 @@
//
this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMx1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1.Appearance.Row.Options.UseFont = true;
this.gvMx1.ColumnPanelRowHeight = 50;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1id,
@@ -919,13 +921,13 @@
((System.ComponentModel.ISupportInitialize)(this.txt_shBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shTime.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_shState.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
index 95411c0..5c79944 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwPc.cs
@@ -79,7 +79,7 @@
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList= Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -100,7 +100,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- Gs.DevApp.UserControl.ShowFilter frm = new Gs.DevApp.UserControl.ShowFilter(gridView1.Columns, _filterList);
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -111,12 +114,8 @@
/// <param name="e"></param>
private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
{
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
- frm.UpdateParent += Frm_UpdateParent;
- frm.ShowDialog();
+ _filterList = e.FilterList;
+ getPageList(1);
}
/// <summary>
/// 瀹℃牳浜嬩欢
@@ -318,6 +317,7 @@
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
+ toolBarMenu1.currentAction = "";
}
}
catch (Exception ex)
@@ -412,6 +412,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
index 41ee9b7..a20d3e8 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
@@ -86,6 +86,7 @@
this.txt_tbl013 = new DevExpress.XtraEditors.CheckEdit();
this.txt_tbl020 = new DevExpress.XtraEditors.CheckEdit();
this.txt_erpProductionOrderNo = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -100,7 +101,7 @@
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = 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();
@@ -153,7 +154,6 @@
this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -185,6 +185,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_tbl013.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpProductionOrderNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -199,7 +200,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -221,7 +222,6 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -585,7 +585,7 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 96);
+ this.btnSelect.Location = new System.Drawing.Point(12, 108);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(86, 27);
this.btnSelect.StyleController = this.layoutMx1;
@@ -594,7 +594,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(626, 32);
+ this.txt_itemName.Location = new System.Drawing.Point(626, 44);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
@@ -606,7 +606,7 @@
// txt_tbl005
//
this.txt_tbl005.EditValue = "-璇烽�夋嫨-";
- this.txt_tbl005.Location = new System.Drawing.Point(84, 64);
+ this.txt_tbl005.Location = new System.Drawing.Point(84, 76);
this.txt_tbl005.Name = "txt_tbl005";
this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -623,14 +623,14 @@
// txt_tbl002
//
this.txt_tbl002.IsReadly = false;
- this.txt_tbl002.Location = new System.Drawing.Point(84, 32);
+ this.txt_tbl002.Location = new System.Drawing.Point(84, 44);
this.txt_tbl002.Name = "txt_tbl002";
this.txt_tbl002.Size = new System.Drawing.Size(195, 28);
this.txt_tbl002.TabIndex = 462;
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(84, 0);
+ this.txt_billNo.Location = new System.Drawing.Point(84, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
@@ -641,7 +641,7 @@
//
// txt_tbl012
//
- this.txt_tbl012.Location = new System.Drawing.Point(897, 32);
+ this.txt_tbl012.Location = new System.Drawing.Point(897, 44);
this.txt_tbl012.Name = "txt_tbl012";
this.txt_tbl012.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
@@ -652,7 +652,7 @@
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(355, 0);
+ this.txt_daa014.Location = new System.Drawing.Point(355, 12);
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_daa014.Properties.Appearance.Options.UseFont = true;
@@ -663,7 +663,7 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(626, 0);
+ this.txt_itemNo.Location = new System.Drawing.Point(626, 12);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
@@ -674,7 +674,7 @@
//
// txt_tbl011
//
- this.txt_tbl011.Location = new System.Drawing.Point(897, 0);
+ this.txt_tbl011.Location = new System.Drawing.Point(897, 12);
this.txt_tbl011.Name = "txt_tbl011";
this.txt_tbl011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
@@ -685,7 +685,7 @@
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(626, 64);
+ this.txt_itemModel.Location = new System.Drawing.Point(626, 76);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
@@ -696,7 +696,7 @@
//
// txt_tbl006
//
- this.txt_tbl006.Location = new System.Drawing.Point(355, 64);
+ this.txt_tbl006.Location = new System.Drawing.Point(355, 76);
this.txt_tbl006.Name = "txt_tbl006";
this.txt_tbl006.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
@@ -706,7 +706,7 @@
//
// txt_tbl013
//
- this.txt_tbl013.Location = new System.Drawing.Point(825, 64);
+ this.txt_tbl013.Location = new System.Drawing.Point(825, 76);
this.txt_tbl013.Name = "txt_tbl013";
this.txt_tbl013.Properties.Caption = "瀹℃牳鐘舵��";
this.txt_tbl013.Size = new System.Drawing.Size(268, 24);
@@ -716,7 +716,7 @@
//
// txt_tbl020
//
- this.txt_tbl020.Location = new System.Drawing.Point(825, 96);
+ this.txt_tbl020.Location = new System.Drawing.Point(825, 108);
this.txt_tbl020.Name = "txt_tbl020";
this.txt_tbl020.Properties.Caption = "瀹岀粨鏍囪瘑 ";
this.txt_tbl020.Size = new System.Drawing.Size(268, 24);
@@ -726,12 +726,24 @@
//
// txt_erpProductionOrderNo
//
- this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(355, 32);
+ this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(355, 44);
this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(195, 24);
this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
this.txt_erpProductionOrderNo.TabIndex = 467;
this.txt_erpProductionOrderNo.Tag = "readonly";
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.lbGuid;
+ this.layoutControlItem14.Location = new System.Drawing.Point(813, 96);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem14.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem14.Text = "lbGuid";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem14.TextVisible = false;
//
// Root
//
@@ -923,17 +935,17 @@
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem13.TextVisible = false;
//
- // layoutControlItem14
+ // layoutControlItem12
//
- this.layoutControlItem14.Control = this.lbGuid;
- this.layoutControlItem14.Location = new System.Drawing.Point(813, 96);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem14.Text = "lbGuid";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem14.TextVisible = false;
+ this.layoutControlItem12.Control = this.txt_tbl020;
+ this.layoutControlItem12.Location = new System.Drawing.Point(813, 96);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem12.TextVisible = false;
//
// tabMx
//
@@ -1187,11 +1199,11 @@
// ucBtnPrint1
//
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(543, 59);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(543, 68);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(207, 25);
this.ucBtnPrint1.TabIndex = 231;
//
// lbMxGuid
@@ -1521,18 +1533,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_tbl020;
- this.layoutControlItem12.Location = new System.Drawing.Point(813, 96);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem12.TextVisible = false;
- //
// Frm_WwTbl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1574,6 +1574,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_tbl013.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_erpProductionOrderNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1588,7 +1589,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1611,7 +1612,6 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
index 8a66c2d..9800d75 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
@@ -445,6 +445,7 @@
}
private void getModel(string strGuid)
{
+ gcMx1.DataSource = null;
bool isEdit = false;
if (toolBarMenu1.currentAction == "add") return;
if (toolBarMenu1.currentAction == "edit") isEdit = true;
@@ -586,7 +587,7 @@
try
{
var strJson = UtilityHelper.HttpPost("",
- _webServiceName + "DeleteBarcode",
+ "VArrivalBarcodeManager/DeleteBarcode",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs
index 16757bc..7db85e3 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTblDj.Designer.cs
@@ -85,6 +85,7 @@
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -95,14 +96,7 @@
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -128,6 +122,12 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -163,6 +163,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -173,14 +174,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -190,6 +184,12 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -585,7 +585,7 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 143;
+ this.splitMx1.SplitterPosition = 133;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -614,7 +614,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(644, 199, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 143);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 133);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -659,11 +659,11 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(114, 76);
+ this.txt_remark.Location = new System.Drawing.Point(114, 108);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(165, 28);
+ this.txt_remark.Size = new System.Drawing.Size(436, 28);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 243;
//
@@ -745,7 +745,7 @@
//
// txt_cbillNo
//
- this.txt_cbillNo.Location = new System.Drawing.Point(656, 76);
+ this.txt_cbillNo.Location = new System.Drawing.Point(114, 76);
this.txt_cbillNo.Name = "txt_cbillNo";
this.txt_cbillNo.Size = new System.Drawing.Size(165, 24);
this.txt_cbillNo.StyleController = this.layoutMx1;
@@ -753,16 +753,16 @@
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(554, 108);
+ this.txt_status.Location = new System.Drawing.Point(825, 140);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_status.Size = new System.Drawing.Size(267, 24);
+ this.txt_status.Size = new System.Drawing.Size(268, 24);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 578;
//
// txt_lastupdateBy
//
- this.txt_lastupdateBy.Location = new System.Drawing.Point(114, 108);
+ this.txt_lastupdateBy.Location = new System.Drawing.Point(656, 76);
this.txt_lastupdateBy.Name = "txt_lastupdateBy";
this.txt_lastupdateBy.Size = new System.Drawing.Size(165, 24);
this.txt_lastupdateBy.StyleController = this.layoutMx1;
@@ -770,11 +770,23 @@
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(385, 108);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(656, 108);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
this.txt_lastupdateDate.Size = new System.Drawing.Size(165, 24);
this.txt_lastupdateDate.StyleController = this.layoutMx1;
this.txt_lastupdateDate.TabIndex = 580;
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.lbGuid;
+ this.layoutControlItem17.Location = new System.Drawing.Point(813, 128);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem17.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem17.Text = "lbGuid";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem17.TextVisible = false;
//
// Root
//
@@ -790,11 +802,11 @@
this.layoutControlItem7,
this.layoutControlItem8,
this.layoutControlItem9,
+ this.layoutControlItem12,
+ this.layoutControlItem14,
this.layoutControlItem10,
this.layoutControlItem11,
- this.layoutControlItem12,
this.layoutControlItem13,
- this.layoutControlItem14,
this.layoutControlItem15,
this.layoutControlItem16});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
@@ -924,27 +936,6 @@
this.layoutControlItem9.Text = "閫�鏂欑被鍨�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_remark;
- this.layoutControlItem10.Location = new System.Drawing.Point(0, 64);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem10.Text = "澶囨敞淇℃伅";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_workNo;
- this.layoutControlItem11.Location = new System.Drawing.Point(271, 64);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem11.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
- //
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_daa014;
@@ -956,69 +947,13 @@
this.layoutControlItem12.Text = "鎶曟枡鍗曞彿";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_cbillNo;
- this.layoutControlItem13.Location = new System.Drawing.Point(542, 64);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem13.Text = "濮斿宸ュ崟鍙�";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_status;
- this.layoutControlItem14.Location = new System.Drawing.Point(542, 96);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem14.TextVisible = false;
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_lastupdateBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(0, 96);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem15.Text = "鏈�鍚庢洿鏂颁汉";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_lastupdateDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(271, 96);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem16.Text = "鏈�鍚庢洿鏂版椂闂�";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.lbGuid;
- this.layoutControlItem17.Location = new System.Drawing.Point(813, 128);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem17.Text = "lbGuid";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem17.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(1126, 415);
+ this.tabMx.Size = new System.Drawing.Size(1126, 425);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1028,7 +963,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 383);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 393);
this.tabMxPage1.Text = "鍑哄簱鏄庣粏";
//
// gcMx1
@@ -1037,7 +972,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1124, 383);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 393);
this.gcMx1.TabIndex = 2;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1141,7 +1076,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1124, 359);
+ this.tabMxPage2.Size = new System.Drawing.Size(1124, 383);
this.tabMxPage2.Text = "鍑哄簱鏉＄爜";
//
// gcMx2
@@ -1150,7 +1085,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1124, 359);
+ this.gcMx2.Size = new System.Drawing.Size(1124, 383);
this.gcMx2.TabIndex = 2;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1309,6 +1244,72 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_status;
+ this.layoutControlItem14.Location = new System.Drawing.Point(813, 128);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem14.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem14.TextVisible = false;
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_remark;
+ this.layoutControlItem10.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem10.Size = new System.Drawing.Size(542, 32);
+ this.layoutControlItem10.Text = "澶囨敞淇℃伅";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_workNo;
+ this.layoutControlItem11.Location = new System.Drawing.Point(271, 64);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem11.Text = "浠诲姟鍗曞彿";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_cbillNo;
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem13.Text = "濮斿宸ュ崟鍙�";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_lastupdateBy;
+ this.layoutControlItem15.Location = new System.Drawing.Point(542, 64);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem15.Text = "鏈�鍚庢洿鏂颁汉";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_lastupdateDate;
+ this.layoutControlItem16.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem16.Text = "鏈�鍚庢洿鏂版椂闂�";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
+ //
// Frm_WwTblDj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1354,6 +1355,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1364,14 +1366,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1381,6 +1376,12 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
this.ResumeLayout(false);
}
@@ -1438,18 +1439,12 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraEditors.TextEdit txt_reason;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraEditors.TextEdit txt_daa014;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraEditors.TextEdit txt_cbillNo;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraEditors.CheckEdit txt_status;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -1475,5 +1470,11 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
index 441bb4e..e6a661c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
@@ -38,7 +38,6 @@
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();
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();
@@ -84,6 +83,8 @@
this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
this.txt_isCheck = new DevExpress.XtraEditors.CheckEdit();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -99,12 +100,8 @@
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -126,6 +123,8 @@
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -170,6 +169,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isCheck.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
@@ -185,12 +186,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
@@ -205,6 +202,8 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -392,7 +391,7 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.Size = new System.Drawing.Size(720, 632);
- this.splitMx1.SplitterPosition = 244;
+ this.splitMx1.SplitterPosition = 205;
this.splitMx1.TabIndex = 1;
//
// layoutMx1
@@ -423,11 +422,14 @@
this.layoutMx1.Controls.Add(this.txt_checkDate);
this.layoutMx1.Controls.Add(this.txt_isCheck);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem16,
+ this.layoutControlItem24});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(72, 11, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(720, 244);
+ this.layoutMx1.Size = new System.Drawing.Size(720, 205);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -442,22 +444,22 @@
//
// txt_fMaxWeight
//
- this.txt_fMaxWeight.Location = new System.Drawing.Point(449, 76);
+ this.txt_fMaxWeight.Location = new System.Drawing.Point(438, 76);
this.txt_fMaxWeight.Name = "txt_fMaxWeight";
this.txt_fMaxWeight.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fMaxWeight.Properties.Appearance.Options.UseFont = true;
- this.txt_fMaxWeight.Size = new System.Drawing.Size(84, 28);
+ this.txt_fMaxWeight.Size = new System.Drawing.Size(79, 28);
this.txt_fMaxWeight.StyleController = this.layoutMx1;
this.txt_fMaxWeight.TabIndex = 378;
this.txt_fMaxWeight.Tag = "fissueType";
//
// txt_fMinWeight
//
- this.txt_fMinWeight.Location = new System.Drawing.Point(449, 108);
+ this.txt_fMinWeight.Location = new System.Drawing.Point(438, 108);
this.txt_fMinWeight.Name = "txt_fMinWeight";
this.txt_fMinWeight.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fMinWeight.Properties.Appearance.Options.UseFont = true;
- this.txt_fMinWeight.Size = new System.Drawing.Size(84, 28);
+ this.txt_fMinWeight.Size = new System.Drawing.Size(79, 28);
this.txt_fMinWeight.StyleController = this.layoutMx1;
this.txt_fMinWeight.TabIndex = 370;
this.txt_fMinWeight.Tag = "finishRate";
@@ -468,7 +470,7 @@
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(84, 28);
+ this.txt_itemName.Size = new System.Drawing.Size(78, 28);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 216;
this.txt_itemName.Tag = "itemName";
@@ -479,7 +481,7 @@
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(84, 28);
+ this.txt_itemModel.Size = new System.Drawing.Size(78, 28);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 219;
this.txt_itemModel.Tag = "itemModel";
@@ -490,62 +492,62 @@
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(84, 28);
+ this.txt_itemNo.Size = new System.Drawing.Size(78, 28);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 213;
this.txt_itemNo.Tag = "itemNo";
//
// txt_fSumPeople
//
- this.txt_fSumPeople.Location = new System.Drawing.Point(274, 76);
+ this.txt_fSumPeople.Location = new System.Drawing.Point(268, 76);
this.txt_fSumPeople.Name = "txt_fSumPeople";
this.txt_fSumPeople.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fSumPeople.Properties.Appearance.Options.UseFont = true;
- this.txt_fSumPeople.Size = new System.Drawing.Size(84, 28);
+ this.txt_fSumPeople.Size = new System.Drawing.Size(79, 28);
this.txt_fSumPeople.StyleController = this.layoutMx1;
this.txt_fSumPeople.TabIndex = 231;
this.txt_fSumPeople.Tag = "itemVersion";
//
// txt_fCapacity
//
- this.txt_fCapacity.Location = new System.Drawing.Point(274, 108);
+ this.txt_fCapacity.Location = new System.Drawing.Point(268, 108);
this.txt_fCapacity.Name = "txt_fCapacity";
this.txt_fCapacity.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fCapacity.Properties.Appearance.Options.UseFont = true;
- this.txt_fCapacity.Size = new System.Drawing.Size(84, 28);
+ this.txt_fCapacity.Size = new System.Drawing.Size(79, 28);
this.txt_fCapacity.StyleController = this.layoutMx1;
this.txt_fCapacity.TabIndex = 319;
this.txt_fCapacity.Tag = "bomNo";
//
// txt_fNo
//
- this.txt_fNo.Location = new System.Drawing.Point(274, 140);
+ this.txt_fNo.Location = new System.Drawing.Point(268, 140);
this.txt_fNo.Name = "txt_fNo";
this.txt_fNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fNo.Properties.Appearance.Options.UseFont = true;
- this.txt_fNo.Size = new System.Drawing.Size(84, 28);
+ this.txt_fNo.Size = new System.Drawing.Size(79, 28);
this.txt_fNo.StyleController = this.layoutMx1;
this.txt_fNo.TabIndex = 336;
this.txt_fNo.Tag = "produceWorkNo";
//
// txt_fLayer
//
- this.txt_fLayer.Location = new System.Drawing.Point(449, 140);
+ this.txt_fLayer.Location = new System.Drawing.Point(438, 140);
this.txt_fLayer.Name = "txt_fLayer";
this.txt_fLayer.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fLayer.Properties.Appearance.Options.UseFont = true;
- this.txt_fLayer.Size = new System.Drawing.Size(84, 28);
+ this.txt_fLayer.Size = new System.Drawing.Size(79, 28);
this.txt_fLayer.StyleController = this.layoutMx1;
this.txt_fLayer.TabIndex = 262;
this.txt_fLayer.Tag = "highLimt";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(274, 172);
+ this.txt_remark.Location = new System.Drawing.Point(268, 172);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(259, 28);
+ this.txt_remark.Size = new System.Drawing.Size(249, 28);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 258;
this.txt_remark.Tag = "lowLimt";
@@ -556,7 +558,7 @@
this.txt_fVersion.Name = "txt_fVersion";
this.txt_fVersion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fVersion.Properties.Appearance.Options.UseFont = true;
- this.txt_fVersion.Size = new System.Drawing.Size(84, 28);
+ this.txt_fVersion.Size = new System.Drawing.Size(78, 28);
this.txt_fVersion.StyleController = this.layoutMx1;
this.txt_fVersion.TabIndex = 267;
this.txt_fVersion.Tag = "prdPack";
@@ -564,7 +566,7 @@
// txt_fJingDu
//
this.txt_fJingDu.EditValue = "PSC娴�";
- this.txt_fJingDu.Location = new System.Drawing.Point(274, 44);
+ this.txt_fJingDu.Location = new System.Drawing.Point(268, 44);
this.txt_fJingDu.Name = "txt_fJingDu";
this.txt_fJingDu.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -572,42 +574,42 @@
"PSC娴�",
"LOT娴�"});
this.txt_fJingDu.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fJingDu.Size = new System.Drawing.Size(84, 24);
+ this.txt_fJingDu.Size = new System.Drawing.Size(79, 24);
this.txt_fJingDu.StyleController = this.layoutMx1;
this.txt_fJingDu.TabIndex = 413;
//
// txt_fBegDate
//
this.txt_fBegDate.EditValue = null;
- this.txt_fBegDate.Location = new System.Drawing.Point(449, 12);
+ this.txt_fBegDate.Location = new System.Drawing.Point(438, 12);
this.txt_fBegDate.Name = "txt_fBegDate";
this.txt_fBegDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fBegDate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_fBegDate.Size = new System.Drawing.Size(84, 24);
+ this.txt_fBegDate.Size = new System.Drawing.Size(79, 24);
this.txt_fBegDate.StyleController = this.layoutMx1;
this.txt_fBegDate.TabIndex = 414;
//
// txt_fEndDate
//
this.txt_fEndDate.EditValue = null;
- this.txt_fEndDate.Location = new System.Drawing.Point(449, 44);
+ this.txt_fEndDate.Location = new System.Drawing.Point(438, 44);
this.txt_fEndDate.Name = "txt_fEndDate";
this.txt_fEndDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_fEndDate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.txt_fEndDate.Size = new System.Drawing.Size(84, 24);
+ this.txt_fEndDate.Size = new System.Drawing.Size(79, 24);
this.txt_fEndDate.StyleController = this.layoutMx1;
this.txt_fEndDate.TabIndex = 415;
//
// txt_fStatus
//
- this.txt_fStatus.Location = new System.Drawing.Point(12, 172);
+ this.txt_fStatus.Location = new System.Drawing.Point(521, 172);
this.txt_fStatus.Name = "txt_fStatus";
this.txt_fStatus.Properties.Caption = "鍚敤鐘舵��";
- this.txt_fStatus.Size = new System.Drawing.Size(171, 24);
+ this.txt_fStatus.Size = new System.Drawing.Size(166, 24);
this.txt_fStatus.StyleController = this.layoutMx1;
this.txt_fStatus.TabIndex = 416;
//
@@ -615,14 +617,14 @@
//
this.txt_orgName.Location = new System.Drawing.Point(99, 12);
this.txt_orgName.Name = "txt_orgName";
- this.txt_orgName.Size = new System.Drawing.Size(84, 24);
+ this.txt_orgName.Size = new System.Drawing.Size(78, 24);
this.txt_orgName.StyleController = this.layoutMx1;
this.txt_orgName.TabIndex = 417;
//
// txt_fType
//
this.txt_fType.EditValue = "-璇烽�夋嫨-";
- this.txt_fType.Location = new System.Drawing.Point(274, 12);
+ this.txt_fType.Location = new System.Drawing.Point(268, 12);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -631,7 +633,7 @@
"F-閲忎骇",
"S-璇曚綔"});
this.txt_fType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fType.Size = new System.Drawing.Size(84, 24);
+ this.txt_fType.Size = new System.Drawing.Size(79, 24);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 418;
//
@@ -640,7 +642,7 @@
this.btnSelect.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
this.btnSelect.Appearance.Options.UseBackColor = true;
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 204);
+ this.btnSelect.Location = new System.Drawing.Point(12, 172);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(96, 27);
this.btnSelect.StyleController = this.layoutMx1;
@@ -657,44 +659,67 @@
//
// txt_lastUpdateBy
//
- this.txt_lastUpdateBy.Location = new System.Drawing.Point(624, 12);
+ this.txt_lastUpdateBy.Location = new System.Drawing.Point(608, 12);
this.txt_lastUpdateBy.Name = "txt_lastUpdateBy";
- this.txt_lastUpdateBy.Size = new System.Drawing.Size(84, 24);
+ this.txt_lastUpdateBy.Size = new System.Drawing.Size(79, 24);
this.txt_lastUpdateBy.StyleController = this.layoutMx1;
this.txt_lastUpdateBy.TabIndex = 421;
//
// txt_lastUpdateDate
//
- this.txt_lastUpdateDate.Location = new System.Drawing.Point(624, 44);
+ this.txt_lastUpdateDate.Location = new System.Drawing.Point(608, 44);
this.txt_lastUpdateDate.Name = "txt_lastUpdateDate";
- this.txt_lastUpdateDate.Size = new System.Drawing.Size(84, 24);
+ this.txt_lastUpdateDate.Size = new System.Drawing.Size(79, 24);
this.txt_lastUpdateDate.StyleController = this.layoutMx1;
this.txt_lastUpdateDate.TabIndex = 422;
//
// txt_checkBy
//
- this.txt_checkBy.Location = new System.Drawing.Point(624, 76);
+ this.txt_checkBy.Location = new System.Drawing.Point(608, 76);
this.txt_checkBy.Name = "txt_checkBy";
- this.txt_checkBy.Size = new System.Drawing.Size(84, 24);
+ this.txt_checkBy.Size = new System.Drawing.Size(79, 24);
this.txt_checkBy.StyleController = this.layoutMx1;
this.txt_checkBy.TabIndex = 423;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(624, 108);
+ this.txt_checkDate.Location = new System.Drawing.Point(608, 108);
this.txt_checkDate.Name = "txt_checkDate";
- this.txt_checkDate.Size = new System.Drawing.Size(84, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(79, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 424;
//
// txt_isCheck
//
- this.txt_isCheck.Location = new System.Drawing.Point(537, 140);
+ this.txt_isCheck.Location = new System.Drawing.Point(521, 140);
this.txt_isCheck.Name = "txt_isCheck";
this.txt_isCheck.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_isCheck.Size = new System.Drawing.Size(171, 24);
+ this.txt_isCheck.Size = new System.Drawing.Size(166, 24);
this.txt_isCheck.StyleController = this.layoutMx1;
this.txt_isCheck.TabIndex = 425;
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_guid;
+ this.layoutControlItem16.Location = new System.Drawing.Point(175, 192);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem16.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem16.Text = "浜у搧GUID";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem24
+ //
+ this.layoutControlItem24.Control = this.lbGuid;
+ this.layoutControlItem24.Location = new System.Drawing.Point(350, 192);
+ this.layoutControlItem24.Name = "layoutControlItem24";
+ this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem24.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem24.Text = "lbGuid";
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem24.TextVisible = false;
//
// Root
//
@@ -715,17 +740,15 @@
this.layoutControlItem14,
this.layoutControlItem17,
this.layoutControlItem6,
- this.layoutControlItem13,
this.layoutControlItem11,
this.layoutControlItem12,
- this.layoutControlItem15,
- this.layoutControlItem24,
- this.layoutControlItem16,
this.layoutControlItem20,
this.layoutControlItem21,
this.layoutControlItem22,
this.layoutControlItem23,
- this.layoutControlItem25});
+ this.layoutControlItem25,
+ this.layoutControlItem13,
+ this.layoutControlItem15});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -753,59 +776,56 @@
rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition6.Height = 100D;
rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
rowDefinition3,
rowDefinition4,
rowDefinition5,
- rowDefinition6,
- rowDefinition7});
- this.Root.Size = new System.Drawing.Size(720, 244);
+ rowDefinition6});
+ this.Root.Size = new System.Drawing.Size(699, 212);
this.Root.TextVisible = false;
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_fBegDate;
- this.layoutControlItem4.Location = new System.Drawing.Point(350, 0);
+ this.layoutControlItem4.Location = new System.Drawing.Point(339, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem4.Size = new System.Drawing.Size(170, 32);
this.layoutControlItem4.Text = "鐢熸晥鏃ユ湡";
this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fEndDate;
- this.layoutControlItem9.Location = new System.Drawing.Point(350, 32);
+ this.layoutControlItem9.Location = new System.Drawing.Point(339, 32);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem9.Size = new System.Drawing.Size(170, 32);
this.layoutControlItem9.Text = "澶辨晥鏃ユ湡";
this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_fMaxWeight;
- this.layoutControlItem18.Location = new System.Drawing.Point(350, 64);
+ this.layoutControlItem18.Location = new System.Drawing.Point(339, 64);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem18.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem18.Size = new System.Drawing.Size(170, 32);
this.layoutControlItem18.Text = "閲嶉噺涓婇檺";
this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_fMinWeight;
- this.layoutControlItem19.Location = new System.Drawing.Point(350, 96);
+ this.layoutControlItem19.Location = new System.Drawing.Point(339, 96);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem19.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem19.Size = new System.Drawing.Size(170, 32);
this.layoutControlItem19.Text = "閲嶉噺涓嬮檺";
this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
//
@@ -813,44 +833,44 @@
//
this.layoutControlItem8.Control = this.txt_fCapacity;
this.layoutControlItem8.CustomizationFormText = "鏍囧噯浜ц兘(PCS?H)";
- this.layoutControlItem8.Location = new System.Drawing.Point(175, 96);
+ this.layoutControlItem8.Location = new System.Drawing.Point(169, 96);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem8.Size = new System.Drawing.Size(170, 32);
this.layoutControlItem8.Text = "鏍囧噯浜ц兘";
this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_fSumPeople;
- this.layoutControlItem7.Location = new System.Drawing.Point(175, 64);
+ this.layoutControlItem7.Location = new System.Drawing.Point(169, 64);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem7.Size = new System.Drawing.Size(170, 32);
this.layoutControlItem7.Text = "鎬诲畾鍛�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_fJingDu;
- this.layoutControlItem3.Location = new System.Drawing.Point(175, 32);
+ this.layoutControlItem3.Location = new System.Drawing.Point(169, 32);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem3.Size = new System.Drawing.Size(170, 32);
this.layoutControlItem3.Text = "绠＄悊绮惧害";
this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fNo;
- this.layoutControlItem10.Location = new System.Drawing.Point(175, 128);
+ this.layoutControlItem10.Location = new System.Drawing.Point(169, 128);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem10.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem10.Size = new System.Drawing.Size(170, 32);
this.layoutControlItem10.Text = "娴佺▼缂栧彿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
//
@@ -860,7 +880,7 @@
this.layoutControlItem2.Location = new System.Drawing.Point(0, 96);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem2.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem2.Size = new System.Drawing.Size(169, 32);
this.layoutControlItem2.Text = "瑙勬牸鍨嬪彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
@@ -870,7 +890,7 @@
this.layoutControlItem1.Location = new System.Drawing.Point(0, 64);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem1.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem1.Size = new System.Drawing.Size(169, 32);
this.layoutControlItem1.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
//
@@ -880,7 +900,7 @@
this.layoutControlItem5.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem5.Size = new System.Drawing.Size(169, 32);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
//
@@ -889,7 +909,7 @@
this.layoutControlItem14.Control = this.txt_orgName;
this.layoutControlItem14.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem14.Size = new System.Drawing.Size(169, 32);
this.layoutControlItem14.Text = "浣跨敤缁勭粐";
this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
//
@@ -899,142 +919,95 @@
this.layoutControlItem17.Location = new System.Drawing.Point(0, 128);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem17.Size = new System.Drawing.Size(169, 32);
this.layoutControlItem17.Text = "鐗堟湰鍙�";
this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_fType;
- this.layoutControlItem6.Location = new System.Drawing.Point(175, 0);
+ this.layoutControlItem6.Location = new System.Drawing.Point(169, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem6.Size = new System.Drawing.Size(170, 32);
this.layoutControlItem6.Text = "鐢熶骇绫诲瀷";
this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_fStatus;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 160);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem13.Size = new System.Drawing.Size(175, 32);
- this.layoutControlItem13.Text = "绂佺敤鐘舵��";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem13.TextVisible = false;
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_fLayer;
- this.layoutControlItem11.Location = new System.Drawing.Point(350, 128);
+ this.layoutControlItem11.Location = new System.Drawing.Point(339, 128);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem11.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem11.Size = new System.Drawing.Size(170, 32);
this.layoutControlItem11.Text = "娴佺▼绾у埆";
this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_remark;
- this.layoutControlItem12.Location = new System.Drawing.Point(175, 160);
+ this.layoutControlItem12.Location = new System.Drawing.Point(169, 160);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem12.Size = new System.Drawing.Size(350, 32);
+ this.layoutControlItem12.Size = new System.Drawing.Size(340, 32);
this.layoutControlItem12.Text = "娴佺▼鎻忚堪";
this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.btnSelect;
- this.layoutControlItem15.Location = new System.Drawing.Point(0, 192);
- this.layoutControlItem15.MaxSize = new System.Drawing.Size(100, 31);
- this.layoutControlItem15.MinSize = new System.Drawing.Size(90, 31);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem15.Size = new System.Drawing.Size(175, 32);
- this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem15.Text = "閫夋嫨宸ュ簭";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem15.TextVisible = false;
- //
- // layoutControlItem24
- //
- this.layoutControlItem24.Control = this.lbGuid;
- this.layoutControlItem24.Location = new System.Drawing.Point(350, 192);
- this.layoutControlItem24.Name = "layoutControlItem24";
- this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem24.Size = new System.Drawing.Size(175, 32);
- this.layoutControlItem24.Text = "lbGuid";
- this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem24.TextVisible = false;
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_guid;
- this.layoutControlItem16.Location = new System.Drawing.Point(175, 192);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem16.Size = new System.Drawing.Size(175, 32);
- this.layoutControlItem16.Text = "浜у搧GUID";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_lastUpdateBy;
- this.layoutControlItem20.Location = new System.Drawing.Point(525, 0);
+ this.layoutControlItem20.Location = new System.Drawing.Point(509, 0);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem20.Size = new System.Drawing.Size(170, 32);
this.layoutControlItem20.Text = "鏈�鍚庢洿鏂颁汉";
this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_lastUpdateDate;
- this.layoutControlItem21.Location = new System.Drawing.Point(525, 32);
+ this.layoutControlItem21.Location = new System.Drawing.Point(509, 32);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem21.Size = new System.Drawing.Size(170, 32);
this.layoutControlItem21.Text = "鏇存柊鏃堕棿";
this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_checkBy;
- this.layoutControlItem22.Location = new System.Drawing.Point(525, 64);
+ this.layoutControlItem22.Location = new System.Drawing.Point(509, 64);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem22.Size = new System.Drawing.Size(170, 32);
this.layoutControlItem22.Text = "瀹℃牳浜�";
this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txt_checkDate;
- this.layoutControlItem23.Location = new System.Drawing.Point(525, 96);
+ this.layoutControlItem23.Location = new System.Drawing.Point(509, 96);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem23.Size = new System.Drawing.Size(170, 32);
this.layoutControlItem23.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_isCheck;
- this.layoutControlItem25.Location = new System.Drawing.Point(525, 128);
+ this.layoutControlItem25.Location = new System.Drawing.Point(509, 128);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem25.Size = new System.Drawing.Size(175, 32);
+ this.layoutControlItem25.Size = new System.Drawing.Size(170, 32);
+ this.layoutControlItem25.Text = "瀹℃牳鐘舵��";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
//
@@ -1044,7 +1017,7 @@
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(720, 376);
+ this.tabMx.Size = new System.Drawing.Size(720, 415);
this.tabMx.TabIndex = 4;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1053,7 +1026,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(718, 344);
+ this.tabMxPage1.Size = new System.Drawing.Size(718, 383);
this.tabMxPage1.Text = "宸ュ簭淇℃伅";
//
// gcMx1
@@ -1066,7 +1039,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemComboBox1,
this.repositoryItemComboBox2});
- this.gcMx1.Size = new System.Drawing.Size(718, 344);
+ this.gcMx1.Size = new System.Drawing.Size(718, 383);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1244,6 +1217,32 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_fStatus;
+ this.layoutControlItem13.Location = new System.Drawing.Point(509, 160);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem13.Size = new System.Drawing.Size(170, 32);
+ this.layoutControlItem13.Text = "绂佺敤鐘舵��";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem13.TextVisible = false;
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.btnSelect;
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 160);
+ this.layoutControlItem15.MaxSize = new System.Drawing.Size(100, 31);
+ this.layoutControlItem15.MinSize = new System.Drawing.Size(90, 31);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem15.Size = new System.Drawing.Size(169, 32);
+ this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem15.Text = "閫夋嫨宸ュ簭";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem15.TextVisible = false;
+ //
// Frm_WorkTechnique
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1298,6 +1297,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isCheck.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
@@ -1313,12 +1314,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
@@ -1333,6 +1330,8 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
this.ResumeLayout(false);
}
@@ -1395,12 +1394,10 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private DevExpress.XtraEditors.SimpleButton btnSelect;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
@@ -1418,5 +1415,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
private System.Windows.Forms.PictureBox picCheckBox;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectWwPc.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectWwPc.Designer.cs
index afefd4e..a1afefc 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectWwPc.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectWwPc.Designer.cs
@@ -313,8 +313,10 @@
//
// btnIn
//
+ this.btnIn.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
+ this.btnIn.Appearance.Options.UseBackColor = true;
this.btnIn.Dock = System.Windows.Forms.DockStyle.Right;
- this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.checkbuttons_16x161;
+ this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16;
this.btnIn.Location = new System.Drawing.Point(918, 2);
this.btnIn.Name = "btnIn";
this.btnIn.Size = new System.Drawing.Size(94, 39);
@@ -329,7 +331,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(984, 39);
+ this.pageBar1.Size = new System.Drawing.Size(889, 39);
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
//
@@ -344,7 +346,7 @@
this.MinimizeBox = false;
this.Name = "SelectWwPc";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "閫夊彇濮斿浠诲姟鍗�";
+ this.Text = "閫夊彇濮斿浠诲姟鍗曘�愪笅杈俱�佺敤鏂欐竻鍗曞鏍搞�佸澶栭噰璐鍗曞嵆鍙帓浜э紝浣嗛�氱煡澶囨枡闇�瑕佸澶栭噰璐鍗曞鏍搞��";
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
--
Gitblit v1.9.3