From 29fd60f631a37bdc7d53c7c53b2053412a69ffee Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 11 十一月 2024 15:10:35 +0800
Subject: [PATCH] 加组织id
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs | 143 ++++--
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs | 7
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs | 583 ++++------------------------
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs | 6
DevApp/Gs.DevApp/Resources/download_16x16.png | 0
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs | 272 ++-----------
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs | 162 +++----
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs | 7
8 files changed, 300 insertions(+), 880 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
index 60d83aa..2213377 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -29,26 +29,6 @@
/// </summary>
private void InitializeComponent()
{
- this.lb_t10 = new DevExpress.XtraEditors.LabelControl();
- this.txt_t10 = new DevExpress.XtraEditors.TextEdit();
- this.lb_t9 = new DevExpress.XtraEditors.LabelControl();
- this.txt_t9 = new DevExpress.XtraEditors.TextEdit();
- this.lb_t8 = new DevExpress.XtraEditors.LabelControl();
- this.txt_t8 = new DevExpress.XtraEditors.TextEdit();
- this.lb_t7 = new DevExpress.XtraEditors.LabelControl();
- this.txt_t7 = new DevExpress.XtraEditors.TextEdit();
- this.lb_t6 = new DevExpress.XtraEditors.LabelControl();
- this.txt_t6 = new DevExpress.XtraEditors.TextEdit();
- this.lb_t5 = new DevExpress.XtraEditors.LabelControl();
- this.txt_t5 = new DevExpress.XtraEditors.TextEdit();
- this.lb_t4 = new DevExpress.XtraEditors.LabelControl();
- this.txt_t4 = new DevExpress.XtraEditors.TextEdit();
- this.lb_t3 = new DevExpress.XtraEditors.LabelControl();
- this.txt_t3 = new DevExpress.XtraEditors.TextEdit();
- this.lb_t2 = new DevExpress.XtraEditors.LabelControl();
- this.txt_t2 = new DevExpress.XtraEditors.TextEdit();
- this.lb_t1 = new DevExpress.XtraEditors.LabelControl();
- this.txt_t1 = new DevExpress.XtraEditors.TextEdit();
this.lb_qcGroup = new DevExpress.XtraEditors.LabelControl();
this.txt_qcGroup = new DevExpress.XtraEditors.TextEdit();
this.lb_isBatches = new DevExpress.XtraEditors.LabelControl();
@@ -92,7 +72,6 @@
this.gv_saleUnitNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_orderUnitNo = new DevExpress.XtraEditors.LabelControl();
this.txt_orderUnitNo = new DevExpress.XtraEditors.TextEdit();
- this.gv_orderUnitNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_prdPack = new DevExpress.XtraEditors.LabelControl();
this.txt_prdPack = new DevExpress.XtraEditors.TextEdit();
this.gv_prdPack = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -102,14 +81,6 @@
this.lb_lowLimt = new DevExpress.XtraEditors.LabelControl();
this.txt_lowLimt = new DevExpress.XtraEditors.TextEdit();
this.gv_lowLimt = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_lastUpdateTime = new DevExpress.XtraEditors.LabelControl();
- this.txt_lastUpdateTime = new DevExpress.XtraEditors.TextEdit();
- this.lb_lastUpdateBy = new DevExpress.XtraEditors.LabelControl();
- this.txt_lastUpdateBy = new DevExpress.XtraEditors.TextEdit();
- this.lb_createTime = new DevExpress.XtraEditors.LabelControl();
- this.txt_createTime = new DevExpress.XtraEditors.TextEdit();
- this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
- this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.lb_custNO = new DevExpress.XtraEditors.LabelControl();
this.txt_custNO = new DevExpress.XtraEditors.TextEdit();
this.lb_itemVersion = new DevExpress.XtraEditors.LabelControl();
@@ -138,6 +109,9 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -147,16 +121,6 @@
this.lbGuid = new System.Windows.Forms.Label();
this.txt_itemName = new DevExpress.XtraEditors.MemoEdit();
this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t10.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t9.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t8.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t7.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t6.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t5.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t4.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t3.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t2.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qcGroup.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isBatches.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fissueType.Properties)).BeginInit();
@@ -177,10 +141,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_prdPack.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_highLimt.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lowLimt.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateTime.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createTime.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_custNO.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemVersion.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemType.Properties)).BeginInit();
@@ -201,216 +161,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
this.SuspendLayout();
- //
- // lb_t10
- //
- this.lb_t10.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_t10.Appearance.Options.UseFont = true;
- this.lb_t10.Location = new System.Drawing.Point(554, 388);
- this.lb_t10.Name = "lb_t10";
- this.lb_t10.Size = new System.Drawing.Size(60, 21);
- this.lb_t10.TabIndex = 507;
- this.lb_t10.Tag = "t10";
- this.lb_t10.Text = "鍥剧墖5锛�";
- //
- // txt_t10
- //
- this.txt_t10.Location = new System.Drawing.Point(620, 384);
- this.txt_t10.Name = "txt_t10";
- this.txt_t10.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_t10.Properties.Appearance.Options.UseFont = true;
- this.txt_t10.Size = new System.Drawing.Size(150, 28);
- this.txt_t10.TabIndex = 507;
- this.txt_t10.Tag = "t10";
- //
- // lb_t9
- //
- this.lb_t9.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_t9.Appearance.Options.UseFont = true;
- this.lb_t9.Location = new System.Drawing.Point(834, 354);
- this.lb_t9.Name = "lb_t9";
- this.lb_t9.Size = new System.Drawing.Size(60, 21);
- this.lb_t9.TabIndex = 496;
- this.lb_t9.Tag = "t9";
- this.lb_t9.Text = "鍥剧墖4锛�";
- //
- // txt_t9
- //
- this.txt_t9.Location = new System.Drawing.Point(894, 350);
- this.txt_t9.Name = "txt_t9";
- this.txt_t9.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_t9.Properties.Appearance.Options.UseFont = true;
- this.txt_t9.Size = new System.Drawing.Size(150, 28);
- this.txt_t9.TabIndex = 496;
- this.txt_t9.Tag = "t9";
- //
- // lb_t8
- //
- this.lb_t8.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_t8.Appearance.Options.UseFont = true;
- this.lb_t8.Location = new System.Drawing.Point(554, 354);
- this.lb_t8.Name = "lb_t8";
- this.lb_t8.Size = new System.Drawing.Size(60, 21);
- this.lb_t8.TabIndex = 483;
- this.lb_t8.Tag = "t8";
- this.lb_t8.Text = "鍥剧墖3锛�";
- //
- // txt_t8
- //
- this.txt_t8.Location = new System.Drawing.Point(620, 350);
- this.txt_t8.Name = "txt_t8";
- this.txt_t8.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_t8.Properties.Appearance.Options.UseFont = true;
- this.txt_t8.Size = new System.Drawing.Size(150, 28);
- this.txt_t8.TabIndex = 483;
- this.txt_t8.Tag = "t8";
- //
- // lb_t7
- //
- this.lb_t7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_t7.Appearance.Options.UseFont = true;
- this.lb_t7.Location = new System.Drawing.Point(295, 389);
- this.lb_t7.Name = "lb_t7";
- this.lb_t7.Size = new System.Drawing.Size(60, 21);
- this.lb_t7.TabIndex = 471;
- this.lb_t7.Tag = "t7";
- this.lb_t7.Text = "鍥剧墖2锛�";
- //
- // txt_t7
- //
- this.txt_t7.Location = new System.Drawing.Point(361, 385);
- this.txt_t7.Name = "txt_t7";
- this.txt_t7.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_t7.Properties.Appearance.Options.UseFont = true;
- this.txt_t7.Size = new System.Drawing.Size(150, 28);
- this.txt_t7.TabIndex = 471;
- this.txt_t7.Tag = "t7";
- //
- // lb_t6
- //
- this.lb_t6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_t6.Appearance.Options.UseFont = true;
- this.lb_t6.Location = new System.Drawing.Point(37, 389);
- this.lb_t6.Name = "lb_t6";
- this.lb_t6.Size = new System.Drawing.Size(60, 21);
- this.lb_t6.TabIndex = 460;
- this.lb_t6.Tag = "t6";
- this.lb_t6.Text = "鍥剧墖1锛�";
- //
- // txt_t6
- //
- this.txt_t6.Location = new System.Drawing.Point(103, 385);
- this.txt_t6.Name = "txt_t6";
- this.txt_t6.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_t6.Properties.Appearance.Options.UseFont = true;
- this.txt_t6.Size = new System.Drawing.Size(150, 28);
- this.txt_t6.TabIndex = 460;
- this.txt_t6.Tag = "t6";
- //
- // lb_t5
- //
- this.lb_t5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_t5.Appearance.Options.UseFont = true;
- this.lb_t5.Location = new System.Drawing.Point(800, 322);
- this.lb_t5.Name = "lb_t5";
- this.lb_t5.Size = new System.Drawing.Size(94, 21);
- this.lb_t5.TabIndex = 450;
- this.lb_t5.Tag = "t5";
- this.lb_t5.Text = "瀹氫箟瀛楁5锛�";
- //
- // txt_t5
- //
- this.txt_t5.Location = new System.Drawing.Point(894, 318);
- this.txt_t5.Name = "txt_t5";
- this.txt_t5.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_t5.Properties.Appearance.Options.UseFont = true;
- this.txt_t5.Size = new System.Drawing.Size(150, 28);
- this.txt_t5.TabIndex = 450;
- this.txt_t5.Tag = "t5";
- //
- // lb_t4
- //
- this.lb_t4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_t4.Appearance.Options.UseFont = true;
- this.lb_t4.Location = new System.Drawing.Point(520, 322);
- this.lb_t4.Name = "lb_t4";
- this.lb_t4.Size = new System.Drawing.Size(94, 21);
- this.lb_t4.TabIndex = 438;
- this.lb_t4.Tag = "t4";
- this.lb_t4.Text = "瀹氫箟瀛楁4锛�";
- //
- // txt_t4
- //
- this.txt_t4.Location = new System.Drawing.Point(620, 318);
- this.txt_t4.Name = "txt_t4";
- this.txt_t4.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_t4.Properties.Appearance.Options.UseFont = true;
- this.txt_t4.Size = new System.Drawing.Size(150, 28);
- this.txt_t4.TabIndex = 438;
- this.txt_t4.Tag = "t4";
- //
- // lb_t3
- //
- this.lb_t3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_t3.Appearance.Options.UseFont = true;
- this.lb_t3.Location = new System.Drawing.Point(261, 354);
- this.lb_t3.Name = "lb_t3";
- this.lb_t3.Size = new System.Drawing.Size(94, 21);
- this.lb_t3.TabIndex = 427;
- this.lb_t3.Tag = "t3";
- this.lb_t3.Text = "瀹氫箟瀛楁3锛�";
- //
- // txt_t3
- //
- this.txt_t3.Location = new System.Drawing.Point(361, 350);
- this.txt_t3.Name = "txt_t3";
- this.txt_t3.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_t3.Properties.Appearance.Options.UseFont = true;
- this.txt_t3.Size = new System.Drawing.Size(150, 28);
- this.txt_t3.TabIndex = 427;
- this.txt_t3.Tag = "t3";
- //
- // lb_t2
- //
- this.lb_t2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_t2.Appearance.Options.UseFont = true;
- this.lb_t2.Location = new System.Drawing.Point(520, 289);
- this.lb_t2.Name = "lb_t2";
- this.lb_t2.Size = new System.Drawing.Size(94, 21);
- this.lb_t2.TabIndex = 417;
- this.lb_t2.Tag = "t2";
- this.lb_t2.Text = "瀹氫箟瀛楁2锛�";
- //
- // txt_t2
- //
- this.txt_t2.Location = new System.Drawing.Point(620, 285);
- this.txt_t2.Name = "txt_t2";
- this.txt_t2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_t2.Properties.Appearance.Options.UseFont = true;
- this.txt_t2.Size = new System.Drawing.Size(150, 28);
- this.txt_t2.TabIndex = 417;
- this.txt_t2.Tag = "t2";
- //
- // lb_t1
- //
- this.lb_t1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_t1.Appearance.Options.UseFont = true;
- this.lb_t1.Location = new System.Drawing.Point(800, 289);
- this.lb_t1.Name = "lb_t1";
- this.lb_t1.Size = new System.Drawing.Size(94, 21);
- this.lb_t1.TabIndex = 408;
- this.lb_t1.Tag = "t1";
- this.lb_t1.Text = "瀹氫箟瀛楁1锛�";
- //
- // txt_t1
- //
- this.txt_t1.Location = new System.Drawing.Point(894, 285);
- this.txt_t1.Name = "txt_t1";
- this.txt_t1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_t1.Properties.Appearance.Options.UseFont = true;
- this.txt_t1.Size = new System.Drawing.Size(150, 28);
- this.txt_t1.TabIndex = 408;
- this.txt_t1.Tag = "t1";
//
// lb_qcGroup
//
@@ -437,7 +187,7 @@
//
this.lb_isBatches.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_isBatches.Appearance.Options.UseFont = true;
- this.lb_isBatches.Location = new System.Drawing.Point(270, 322);
+ this.lb_isBatches.Location = new System.Drawing.Point(529, 289);
this.lb_isBatches.Name = "lb_isBatches";
this.lb_isBatches.Size = new System.Drawing.Size(85, 21);
this.lb_isBatches.TabIndex = 387;
@@ -446,7 +196,7 @@
//
// txt_isBatches
//
- this.txt_isBatches.Location = new System.Drawing.Point(361, 318);
+ this.txt_isBatches.Location = new System.Drawing.Point(620, 285);
this.txt_isBatches.Name = "txt_isBatches";
this.txt_isBatches.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_isBatches.Properties.Appearance.Options.UseFont = true;
@@ -458,7 +208,7 @@
//
this.lb_fissueType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fissueType.Appearance.Options.UseFont = true;
- this.lb_fissueType.Location = new System.Drawing.Point(809, 256);
+ this.lb_fissueType.Location = new System.Drawing.Point(808, 85);
this.lb_fissueType.Name = "lb_fissueType";
this.lb_fissueType.Size = new System.Drawing.Size(85, 21);
this.lb_fissueType.TabIndex = 378;
@@ -467,7 +217,7 @@
//
// txt_fissueType
//
- this.txt_fissueType.Location = new System.Drawing.Point(894, 252);
+ this.txt_fissueType.Location = new System.Drawing.Point(894, 81);
this.txt_fissueType.Name = "txt_fissueType";
this.txt_fissueType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fissueType.Properties.Appearance.Options.UseFont = true;
@@ -479,7 +229,7 @@
//
this.lb_finishRate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_finishRate.Appearance.Options.UseFont = true;
- this.lb_finishRate.Location = new System.Drawing.Point(777, 224);
+ this.lb_finishRate.Location = new System.Drawing.Point(774, 53);
this.lb_finishRate.Name = "lb_finishRate";
this.lb_finishRate.Size = new System.Drawing.Size(119, 21);
this.lb_finishRate.TabIndex = 370;
@@ -488,7 +238,7 @@
//
// txt_finishRate
//
- this.txt_finishRate.Location = new System.Drawing.Point(894, 220);
+ this.txt_finishRate.Location = new System.Drawing.Point(894, 49);
this.txt_finishRate.Name = "txt_finishRate";
this.txt_finishRate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_finishRate.Properties.Appearance.Options.UseFont = true;
@@ -549,14 +299,14 @@
this.gv_materialGroup.OptionsColumn.AllowEdit = false;
this.gv_materialGroup.Tag = "query_a.materialGroup";
this.gv_materialGroup.Visible = true;
- this.gv_materialGroup.VisibleIndex = 17;
+ this.gv_materialGroup.VisibleIndex = 10;
this.gv_materialGroup.Width = 94;
//
// lb_isStatus
//
this.lb_isStatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_isStatus.Appearance.Options.UseFont = true;
- this.lb_isStatus.Location = new System.Drawing.Point(12, 354);
+ this.lb_isStatus.Location = new System.Drawing.Point(12, 289);
this.lb_isStatus.Name = "lb_isStatus";
this.lb_isStatus.Size = new System.Drawing.Size(85, 21);
this.lb_isStatus.TabIndex = 343;
@@ -565,7 +315,7 @@
//
// txt_isStatus
//
- this.txt_isStatus.Location = new System.Drawing.Point(103, 350);
+ this.txt_isStatus.Location = new System.Drawing.Point(103, 285);
this.txt_isStatus.Name = "txt_isStatus";
this.txt_isStatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_isStatus.Properties.Appearance.Options.UseFont = true;
@@ -584,14 +334,14 @@
this.gv_isStatus.OptionsColumn.AllowEdit = false;
this.gv_isStatus.Tag = "query_a.isStatus";
this.gv_isStatus.Visible = true;
- this.gv_isStatus.VisibleIndex = 16;
+ this.gv_isStatus.VisibleIndex = 19;
this.gv_isStatus.Width = 94;
//
// lb_produceWorkNo
//
this.lb_produceWorkNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_produceWorkNo.Appearance.Options.UseFont = true;
- this.lb_produceWorkNo.Location = new System.Drawing.Point(809, 184);
+ this.lb_produceWorkNo.Location = new System.Drawing.Point(808, 13);
this.lb_produceWorkNo.Name = "lb_produceWorkNo";
this.lb_produceWorkNo.Size = new System.Drawing.Size(85, 21);
this.lb_produceWorkNo.TabIndex = 336;
@@ -600,7 +350,7 @@
//
// txt_produceWorkNo
//
- this.txt_produceWorkNo.Location = new System.Drawing.Point(894, 180);
+ this.txt_produceWorkNo.Location = new System.Drawing.Point(894, 9);
this.txt_produceWorkNo.Name = "txt_produceWorkNo";
this.txt_produceWorkNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_produceWorkNo.Properties.Appearance.Options.UseFont = true;
@@ -661,14 +411,14 @@
this.gv_bomNo.OptionsColumn.AllowEdit = false;
this.gv_bomNo.Tag = "query_a.bomNo";
this.gv_bomNo.Visible = true;
- this.gv_bomNo.VisibleIndex = 15;
+ this.gv_bomNo.VisibleIndex = 9;
this.gv_bomNo.Width = 94;
//
// lb_depotNo
//
this.lb_depotNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_depotNo.Appearance.Options.UseFont = true;
- this.lb_depotNo.Location = new System.Drawing.Point(12, 322);
+ this.lb_depotNo.Location = new System.Drawing.Point(12, 256);
this.lb_depotNo.Name = "lb_depotNo";
this.lb_depotNo.Size = new System.Drawing.Size(85, 21);
this.lb_depotNo.TabIndex = 312;
@@ -677,7 +427,7 @@
//
// txt_depotNo
//
- this.txt_depotNo.Location = new System.Drawing.Point(103, 318);
+ this.txt_depotNo.Location = new System.Drawing.Point(103, 252);
this.txt_depotNo.Name = "txt_depotNo";
this.txt_depotNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_depotNo.Properties.Appearance.Options.UseFont = true;
@@ -690,20 +440,20 @@
this.gv_depotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_depotNo.AppearanceCell.Options.UseFont = true;
this.gv_depotNo.Caption = "榛樿浠撳簱";
- this.gv_depotNo.FieldName = "depotNo";
+ this.gv_depotNo.FieldName = "depotCode";
this.gv_depotNo.MinWidth = 80;
this.gv_depotNo.Name = "gv_depotNo";
this.gv_depotNo.OptionsColumn.AllowEdit = false;
this.gv_depotNo.Tag = "query_a.depotNo";
this.gv_depotNo.Visible = true;
- this.gv_depotNo.VisibleIndex = 14;
+ this.gv_depotNo.VisibleIndex = 18;
this.gv_depotNo.Width = 94;
//
// lb_subconUnitNo
//
this.lb_subconUnitNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_subconUnitNo.Appearance.Options.UseFont = true;
- this.lb_subconUnitNo.Location = new System.Drawing.Point(809, 151);
+ this.lb_subconUnitNo.Location = new System.Drawing.Point(808, 184);
this.lb_subconUnitNo.Name = "lb_subconUnitNo";
this.lb_subconUnitNo.Size = new System.Drawing.Size(85, 21);
this.lb_subconUnitNo.TabIndex = 306;
@@ -712,7 +462,7 @@
//
// txt_subconUnitNo
//
- this.txt_subconUnitNo.Location = new System.Drawing.Point(894, 147);
+ this.txt_subconUnitNo.Location = new System.Drawing.Point(894, 180);
this.txt_subconUnitNo.Name = "txt_subconUnitNo";
this.txt_subconUnitNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_subconUnitNo.Properties.Appearance.Options.UseFont = true;
@@ -725,13 +475,13 @@
this.gv_subconUnitNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_subconUnitNo.AppearanceCell.Options.UseFont = true;
this.gv_subconUnitNo.Caption = "濮斿鍗曚綅";
- this.gv_subconUnitNo.FieldName = "subconUnitNo";
+ this.gv_subconUnitNo.FieldName = "subconUnit";
this.gv_subconUnitNo.MinWidth = 80;
this.gv_subconUnitNo.Name = "gv_subconUnitNo";
this.gv_subconUnitNo.OptionsColumn.AllowEdit = false;
this.gv_subconUnitNo.Tag = "query_a.subconUnitNo";
this.gv_subconUnitNo.Visible = true;
- this.gv_subconUnitNo.VisibleIndex = 13;
+ this.gv_subconUnitNo.VisibleIndex = 16;
this.gv_subconUnitNo.Width = 94;
//
// lb_purchaseUnitNo
@@ -760,13 +510,13 @@
this.gv_purchaseUnitNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_purchaseUnitNo.AppearanceCell.Options.UseFont = true;
this.gv_purchaseUnitNo.Caption = "閲囪喘鍗曚綅";
- this.gv_purchaseUnitNo.FieldName = "purchaseUnitNo";
+ this.gv_purchaseUnitNo.FieldName = "fpurchaseunitid";
this.gv_purchaseUnitNo.MinWidth = 80;
this.gv_purchaseUnitNo.Name = "gv_purchaseUnitNo";
this.gv_purchaseUnitNo.OptionsColumn.AllowEdit = false;
this.gv_purchaseUnitNo.Tag = "query_a.purchaseUnitNo";
this.gv_purchaseUnitNo.Visible = true;
- this.gv_purchaseUnitNo.VisibleIndex = 12;
+ this.gv_purchaseUnitNo.VisibleIndex = 13;
this.gv_purchaseUnitNo.Width = 94;
//
// lb_produceUnitNo
@@ -795,20 +545,20 @@
this.gv_produceUnitNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_produceUnitNo.AppearanceCell.Options.UseFont = true;
this.gv_produceUnitNo.Caption = "鐢熶骇鍗曚綅";
- this.gv_produceUnitNo.FieldName = "produceUnitNo";
+ this.gv_produceUnitNo.FieldName = "produceUnit";
this.gv_produceUnitNo.MinWidth = 80;
this.gv_produceUnitNo.Name = "gv_produceUnitNo";
this.gv_produceUnitNo.OptionsColumn.AllowEdit = false;
this.gv_produceUnitNo.Tag = "query_a.produceUnitNo";
this.gv_produceUnitNo.Visible = true;
- this.gv_produceUnitNo.VisibleIndex = 11;
+ this.gv_produceUnitNo.VisibleIndex = 17;
this.gv_produceUnitNo.Width = 94;
//
// lb_storeUnitNo
//
this.lb_storeUnitNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_storeUnitNo.Appearance.Options.UseFont = true;
- this.lb_storeUnitNo.Location = new System.Drawing.Point(12, 289);
+ this.lb_storeUnitNo.Location = new System.Drawing.Point(808, 151);
this.lb_storeUnitNo.Name = "lb_storeUnitNo";
this.lb_storeUnitNo.Size = new System.Drawing.Size(85, 21);
this.lb_storeUnitNo.TabIndex = 285;
@@ -817,7 +567,7 @@
//
// txt_storeUnitNo
//
- this.txt_storeUnitNo.Location = new System.Drawing.Point(103, 285);
+ this.txt_storeUnitNo.Location = new System.Drawing.Point(894, 147);
this.txt_storeUnitNo.Name = "txt_storeUnitNo";
this.txt_storeUnitNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_storeUnitNo.Properties.Appearance.Options.UseFont = true;
@@ -829,14 +579,14 @@
//
this.gv_storeUnitNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_storeUnitNo.AppearanceCell.Options.UseFont = true;
- this.gv_storeUnitNo.Caption = "搴撴埧鍗曚綅";
- this.gv_storeUnitNo.FieldName = "storeUnitNo";
+ this.gv_storeUnitNo.Caption = "搴撳瓨鍗曚綅";
+ this.gv_storeUnitNo.FieldName = "storeunit";
this.gv_storeUnitNo.MinWidth = 80;
this.gv_storeUnitNo.Name = "gv_storeUnitNo";
this.gv_storeUnitNo.OptionsColumn.AllowEdit = false;
this.gv_storeUnitNo.Tag = "query_a.storeUnitNo";
this.gv_storeUnitNo.Visible = true;
- this.gv_storeUnitNo.VisibleIndex = 10;
+ this.gv_storeUnitNo.VisibleIndex = 15;
this.gv_storeUnitNo.Width = 94;
//
// lb_saleUnitNo
@@ -865,20 +615,20 @@
this.gv_saleUnitNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_saleUnitNo.AppearanceCell.Options.UseFont = true;
this.gv_saleUnitNo.Caption = "閿�鍞崟浣�";
- this.gv_saleUnitNo.FieldName = "saleUnitNo";
+ this.gv_saleUnitNo.FieldName = "saleunit";
this.gv_saleUnitNo.MinWidth = 80;
this.gv_saleUnitNo.Name = "gv_saleUnitNo";
this.gv_saleUnitNo.OptionsColumn.AllowEdit = false;
this.gv_saleUnitNo.Tag = "query_a.saleUnitNo";
this.gv_saleUnitNo.Visible = true;
- this.gv_saleUnitNo.VisibleIndex = 9;
+ this.gv_saleUnitNo.VisibleIndex = 14;
this.gv_saleUnitNo.Width = 94;
//
// lb_orderUnitNo
//
this.lb_orderUnitNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_orderUnitNo.Appearance.Options.UseFont = true;
- this.lb_orderUnitNo.Location = new System.Drawing.Point(12, 256);
+ this.lb_orderUnitNo.Location = new System.Drawing.Point(808, 118);
this.lb_orderUnitNo.Name = "lb_orderUnitNo";
this.lb_orderUnitNo.Size = new System.Drawing.Size(85, 21);
this.lb_orderUnitNo.TabIndex = 273;
@@ -887,27 +637,13 @@
//
// txt_orderUnitNo
//
- this.txt_orderUnitNo.Location = new System.Drawing.Point(103, 252);
+ this.txt_orderUnitNo.Location = new System.Drawing.Point(894, 114);
this.txt_orderUnitNo.Name = "txt_orderUnitNo";
this.txt_orderUnitNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_orderUnitNo.Properties.Appearance.Options.UseFont = true;
this.txt_orderUnitNo.Size = new System.Drawing.Size(150, 28);
this.txt_orderUnitNo.TabIndex = 273;
this.txt_orderUnitNo.Tag = "orderUnitNo";
- //
- // gv_orderUnitNo
- //
- this.gv_orderUnitNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_orderUnitNo.AppearanceCell.Options.UseFont = true;
- this.gv_orderUnitNo.Caption = "璁㈠崟鍗曚綅";
- this.gv_orderUnitNo.FieldName = "orderUnitNo";
- this.gv_orderUnitNo.MinWidth = 80;
- this.gv_orderUnitNo.Name = "gv_orderUnitNo";
- this.gv_orderUnitNo.OptionsColumn.AllowEdit = false;
- this.gv_orderUnitNo.Tag = "query_a.orderUnitNo";
- this.gv_orderUnitNo.Visible = true;
- this.gv_orderUnitNo.VisibleIndex = 8;
- this.gv_orderUnitNo.Width = 94;
//
// lb_prdPack
//
@@ -941,7 +677,7 @@
this.gv_prdPack.OptionsColumn.AllowEdit = false;
this.gv_prdPack.Tag = "query_a.prdPack";
this.gv_prdPack.Visible = true;
- this.gv_prdPack.VisibleIndex = 7;
+ this.gv_prdPack.VisibleIndex = 8;
this.gv_prdPack.Width = 94;
//
// lb_highLimt
@@ -976,7 +712,7 @@
this.gv_highLimt.OptionsColumn.AllowEdit = false;
this.gv_highLimt.Tag = "query_a.highLimt";
this.gv_highLimt.Visible = true;
- this.gv_highLimt.VisibleIndex = 6;
+ this.gv_highLimt.VisibleIndex = 7;
this.gv_highLimt.Width = 94;
//
// lb_lowLimt
@@ -1011,92 +747,8 @@
this.gv_lowLimt.OptionsColumn.AllowEdit = false;
this.gv_lowLimt.Tag = "query_a.lowLimt";
this.gv_lowLimt.Visible = true;
- this.gv_lowLimt.VisibleIndex = 5;
+ this.gv_lowLimt.VisibleIndex = 6;
this.gv_lowLimt.Width = 94;
- //
- // lb_lastUpdateTime
- //
- this.lb_lastUpdateTime.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_lastUpdateTime.Appearance.Options.UseFont = true;
- this.lb_lastUpdateTime.Location = new System.Drawing.Point(809, 118);
- this.lb_lastUpdateTime.Name = "lb_lastUpdateTime";
- this.lb_lastUpdateTime.Size = new System.Drawing.Size(85, 21);
- this.lb_lastUpdateTime.TabIndex = 252;
- this.lb_lastUpdateTime.Tag = "lastUpdateTime";
- this.lb_lastUpdateTime.Text = "鏇存柊鏃堕棿锛�";
- //
- // txt_lastUpdateTime
- //
- this.txt_lastUpdateTime.Location = new System.Drawing.Point(894, 114);
- this.txt_lastUpdateTime.Name = "txt_lastUpdateTime";
- this.txt_lastUpdateTime.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_lastUpdateTime.Properties.Appearance.Options.UseFont = true;
- this.txt_lastUpdateTime.Size = new System.Drawing.Size(150, 28);
- this.txt_lastUpdateTime.TabIndex = 252;
- this.txt_lastUpdateTime.Tag = "lastUpdateTime";
- //
- // lb_lastUpdateBy
- //
- this.lb_lastUpdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_lastUpdateBy.Appearance.Options.UseFont = true;
- this.lb_lastUpdateBy.Location = new System.Drawing.Point(794, 86);
- this.lb_lastUpdateBy.Name = "lb_lastUpdateBy";
- this.lb_lastUpdateBy.Size = new System.Drawing.Size(102, 21);
- this.lb_lastUpdateBy.TabIndex = 247;
- this.lb_lastUpdateBy.Tag = "lastUpdateBy";
- this.lb_lastUpdateBy.Text = "鏈�鍚庢洿鏂颁汉锛�";
- //
- // txt_lastUpdateBy
- //
- this.txt_lastUpdateBy.Location = new System.Drawing.Point(894, 82);
- this.txt_lastUpdateBy.Name = "txt_lastUpdateBy";
- this.txt_lastUpdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_lastUpdateBy.Properties.Appearance.Options.UseFont = true;
- this.txt_lastUpdateBy.Size = new System.Drawing.Size(150, 28);
- this.txt_lastUpdateBy.TabIndex = 247;
- this.txt_lastUpdateBy.Tag = "lastUpdateBy";
- //
- // lb_createTime
- //
- this.lb_createTime.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_createTime.Appearance.Options.UseFont = true;
- this.lb_createTime.Location = new System.Drawing.Point(809, 53);
- this.lb_createTime.Name = "lb_createTime";
- this.lb_createTime.Size = new System.Drawing.Size(85, 21);
- this.lb_createTime.TabIndex = 243;
- this.lb_createTime.Tag = "createTime";
- this.lb_createTime.Text = "鍒涘缓鏃堕棿锛�";
- //
- // txt_createTime
- //
- this.txt_createTime.Location = new System.Drawing.Point(894, 49);
- this.txt_createTime.Name = "txt_createTime";
- this.txt_createTime.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_createTime.Properties.Appearance.Options.UseFont = true;
- this.txt_createTime.Size = new System.Drawing.Size(150, 28);
- this.txt_createTime.TabIndex = 243;
- this.txt_createTime.Tag = "createTime";
- //
- // lb_createBy
- //
- this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_createBy.Appearance.Options.UseFont = true;
- this.lb_createBy.Location = new System.Drawing.Point(826, 13);
- this.lb_createBy.Name = "lb_createBy";
- this.lb_createBy.Size = new System.Drawing.Size(68, 21);
- this.lb_createBy.TabIndex = 240;
- this.lb_createBy.Tag = "createBy";
- this.lb_createBy.Text = "鍒涘缓浜猴細";
- //
- // txt_createBy
- //
- this.txt_createBy.Location = new System.Drawing.Point(894, 13);
- 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(150, 28);
- this.txt_createBy.TabIndex = 240;
- this.txt_createBy.Tag = "createBy";
//
// lb_custNO
//
@@ -1186,14 +838,14 @@
//
this.gv_itemUnitNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_itemUnitNo.AppearanceCell.Options.UseFont = true;
- this.gv_itemUnitNo.Caption = "鐗╂枡鍗曚綅";
- this.gv_itemUnitNo.FieldName = "itemUnitNo";
+ this.gv_itemUnitNo.Caption = "鍩烘湰鍗曚綅";
+ this.gv_itemUnitNo.FieldName = "itemUnit";
this.gv_itemUnitNo.MinWidth = 80;
this.gv_itemUnitNo.Name = "gv_itemUnitNo";
this.gv_itemUnitNo.OptionsColumn.AllowEdit = false;
this.gv_itemUnitNo.Tag = "query_a.itemUnitNo";
this.gv_itemUnitNo.Visible = true;
- this.gv_itemUnitNo.VisibleIndex = 4;
+ this.gv_itemUnitNo.VisibleIndex = 12;
this.gv_itemUnitNo.Width = 94;
//
// lb_itemDescription
@@ -1240,7 +892,7 @@
this.gv_itemModel.OptionsColumn.AllowEdit = false;
this.gv_itemModel.Tag = "query_a.itemModel";
this.gv_itemModel.Visible = true;
- this.gv_itemModel.VisibleIndex = 3;
+ this.gv_itemModel.VisibleIndex = 4;
this.gv_itemModel.Width = 360;
//
// repositoryItemMemoEdit1
@@ -1293,7 +945,7 @@
this.gv_itemName.OptionsColumn.AllowEdit = false;
this.gv_itemName.Tag = "query_a.itemName";
this.gv_itemName.Visible = true;
- this.gv_itemName.VisibleIndex = 2;
+ this.gv_itemName.VisibleIndex = 3;
this.gv_itemName.Width = 260;
//
// repositoryItemMemoEdit2
@@ -1327,13 +979,12 @@
this.gv_itemNo.AppearanceCell.Options.UseFont = true;
this.gv_itemNo.Caption = "鐗╂枡缂栫爜||ERP鐗╂枡缂栧彿";
this.gv_itemNo.FieldName = "itemNo";
- this.gv_itemNo.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
this.gv_itemNo.MinWidth = 160;
this.gv_itemNo.Name = "gv_itemNo";
this.gv_itemNo.OptionsColumn.AllowEdit = false;
this.gv_itemNo.Tag = "query_a.itemNo";
this.gv_itemNo.Visible = true;
- this.gv_itemNo.VisibleIndex = 1;
+ this.gv_itemNo.VisibleIndex = 2;
this.gv_itemNo.Width = 160;
//
// lb_factory
@@ -1370,7 +1021,7 @@
this.gv_id.OptionsColumn.ReadOnly = true;
this.gv_id.Tag = "query_a.factory";
this.gv_id.Visible = true;
- this.gv_id.VisibleIndex = 0;
+ this.gv_id.VisibleIndex = 1;
this.gv_id.Width = 94;
//
// toolBarMenu1
@@ -1409,24 +1060,26 @@
this.gridView1.Appearance.Row.Options.UseTextOptions = true;
this.gridView1.Appearance.Row.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn4,
this.gv_id,
this.gv_itemNo,
this.gv_itemName,
this.gv_itemModel,
- this.gv_itemUnitNo,
+ this.gridColumn1,
this.gv_lowLimt,
this.gv_highLimt,
this.gv_prdPack,
- this.gv_orderUnitNo,
+ this.gv_bomNo,
+ this.gv_materialGroup,
+ this.gridColumn2,
+ this.gv_itemUnitNo,
+ this.gv_purchaseUnitNo,
this.gv_saleUnitNo,
this.gv_storeUnitNo,
- this.gv_produceUnitNo,
- this.gv_purchaseUnitNo,
this.gv_subconUnitNo,
+ this.gv_produceUnitNo,
this.gv_depotNo,
- this.gv_bomNo,
- this.gv_isStatus,
- this.gv_materialGroup});
+ this.gv_isStatus});
this.gridView1.GridControl = this.gcMain;
this.gridView1.HorzScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Always;
this.gridView1.IndicatorWidth = 50;
@@ -1435,6 +1088,36 @@
this.gridView1.OptionsView.RowAutoHeight = true;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "浣跨敤缁勭粐";
+ this.gridColumn4.FieldName = "fSubsidiary";
+ this.gridColumn4.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left;
+ this.gridColumn4.MinWidth = 250;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.OptionsColumn.AllowEdit = false;
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 0;
+ this.gridColumn4.Width = 250;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "瀹夊叏搴撳瓨";
+ this.gridColumn1.MinWidth = 80;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 5;
+ this.gridColumn1.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "澶囨敞";
+ this.gridColumn2.MinWidth = 100;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 11;
+ this.gridColumn2.Width = 100;
//
// xtraTabControl1
//
@@ -1482,26 +1165,6 @@
this.panel1.BackColor = System.Drawing.Color.White;
this.panel1.Controls.Add(this.labelControl11);
this.panel1.Controls.Add(this.lbGuid);
- this.panel1.Controls.Add(this.lb_t10);
- this.panel1.Controls.Add(this.txt_t10);
- this.panel1.Controls.Add(this.lb_t9);
- this.panel1.Controls.Add(this.txt_t9);
- this.panel1.Controls.Add(this.lb_t8);
- this.panel1.Controls.Add(this.txt_t8);
- this.panel1.Controls.Add(this.lb_t7);
- this.panel1.Controls.Add(this.txt_t7);
- this.panel1.Controls.Add(this.lb_t6);
- this.panel1.Controls.Add(this.txt_t6);
- this.panel1.Controls.Add(this.lb_t5);
- this.panel1.Controls.Add(this.txt_t5);
- this.panel1.Controls.Add(this.lb_t4);
- this.panel1.Controls.Add(this.txt_t4);
- this.panel1.Controls.Add(this.lb_t3);
- this.panel1.Controls.Add(this.txt_t3);
- this.panel1.Controls.Add(this.lb_t2);
- this.panel1.Controls.Add(this.txt_t2);
- this.panel1.Controls.Add(this.lb_t1);
- this.panel1.Controls.Add(this.txt_t1);
this.panel1.Controls.Add(this.lb_qcGroup);
this.panel1.Controls.Add(this.txt_qcGroup);
this.panel1.Controls.Add(this.lb_isBatches);
@@ -1542,14 +1205,6 @@
this.panel1.Controls.Add(this.txt_highLimt);
this.panel1.Controls.Add(this.lb_lowLimt);
this.panel1.Controls.Add(this.txt_lowLimt);
- this.panel1.Controls.Add(this.lb_lastUpdateTime);
- this.panel1.Controls.Add(this.txt_lastUpdateTime);
- this.panel1.Controls.Add(this.lb_lastUpdateBy);
- this.panel1.Controls.Add(this.txt_lastUpdateBy);
- this.panel1.Controls.Add(this.lb_createTime);
- this.panel1.Controls.Add(this.txt_createTime);
- this.panel1.Controls.Add(this.lb_createBy);
- this.panel1.Controls.Add(this.txt_createBy);
this.panel1.Controls.Add(this.lb_custNO);
this.panel1.Controls.Add(this.txt_custNO);
this.panel1.Controls.Add(this.lb_itemVersion);
@@ -1573,12 +1228,12 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(76, 20);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1058, 539);
+ this.panel1.Size = new System.Drawing.Size(1058, 367);
this.panel1.TabIndex = 1;
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(25, 509);
+ this.labelControl11.Location = new System.Drawing.Point(36, 330);
this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl11.Name = "labelControl11";
this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -1589,7 +1244,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(76, 509);
+ this.lbGuid.Location = new System.Drawing.Point(87, 330);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -1623,16 +1278,6 @@
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesItems";
- ((System.ComponentModel.ISupportInitialize)(this.txt_t10.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t9.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t8.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t7.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t6.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t5.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t4.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t3.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t2.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_t1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qcGroup.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_isBatches.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fissueType.Properties)).EndInit();
@@ -1653,10 +1298,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_prdPack.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_highLimt.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lowLimt.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateTime.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createTime.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_custNO.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemVersion.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemType.Properties)).EndInit();
@@ -1691,36 +1332,6 @@
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.LabelControl labelControl11;
- //BQCreateConrolObejct
- private DevExpress.XtraEditors.LabelControl lb_t10;
- private DevExpress.XtraEditors.TextEdit txt_t10;
-
- private DevExpress.XtraEditors.LabelControl lb_t9;
- private DevExpress.XtraEditors.TextEdit txt_t9;
-
- private DevExpress.XtraEditors.LabelControl lb_t8;
- private DevExpress.XtraEditors.TextEdit txt_t8;
-
- private DevExpress.XtraEditors.LabelControl lb_t7;
- private DevExpress.XtraEditors.TextEdit txt_t7;
-
- private DevExpress.XtraEditors.LabelControl lb_t6;
- private DevExpress.XtraEditors.TextEdit txt_t6;
-
- private DevExpress.XtraEditors.LabelControl lb_t5;
- private DevExpress.XtraEditors.TextEdit txt_t5;
-
- private DevExpress.XtraEditors.LabelControl lb_t4;
- private DevExpress.XtraEditors.TextEdit txt_t4;
-
- private DevExpress.XtraEditors.LabelControl lb_t3;
- private DevExpress.XtraEditors.TextEdit txt_t3;
-
- private DevExpress.XtraEditors.LabelControl lb_t2;
- private DevExpress.XtraEditors.TextEdit txt_t2;
-
- private DevExpress.XtraEditors.LabelControl lb_t1;
- private DevExpress.XtraEditors.TextEdit txt_t1;
private DevExpress.XtraEditors.LabelControl lb_qcGroup;
private DevExpress.XtraEditors.TextEdit txt_qcGroup;
@@ -1781,7 +1392,6 @@
private DevExpress.XtraEditors.LabelControl lb_orderUnitNo;
private DevExpress.XtraEditors.TextEdit txt_orderUnitNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_orderUnitNo;
private DevExpress.XtraEditors.LabelControl lb_prdPack;
private DevExpress.XtraEditors.TextEdit txt_prdPack;
@@ -1794,18 +1404,6 @@
private DevExpress.XtraEditors.LabelControl lb_lowLimt;
private DevExpress.XtraEditors.TextEdit txt_lowLimt;
private DevExpress.XtraGrid.Columns.GridColumn gv_lowLimt;
-
- private DevExpress.XtraEditors.LabelControl lb_lastUpdateTime;
- private DevExpress.XtraEditors.TextEdit txt_lastUpdateTime;
-
- private DevExpress.XtraEditors.LabelControl lb_lastUpdateBy;
- private DevExpress.XtraEditors.TextEdit txt_lastUpdateBy;
-
- private DevExpress.XtraEditors.LabelControl lb_createTime;
- private DevExpress.XtraEditors.TextEdit txt_createTime;
-
- private DevExpress.XtraEditors.LabelControl lb_createBy;
- private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.LabelControl lb_custNO;
private DevExpress.XtraEditors.TextEdit txt_custNO;
@@ -1843,5 +1441,8 @@
private DevExpress.XtraEditors.MemoEdit txt_itemModel;
private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
index 42de343..b4888ec 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.cs
@@ -93,8 +93,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1, UtilityHelper.GetPageSize());
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
index 1ff8454..a82378a 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
@@ -43,13 +43,11 @@
this.gv_froundtype = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fbaseunit = new DevExpress.XtraEditors.LabelControl();
this.txt_fbaseunit = new DevExpress.XtraEditors.TextEdit();
- this.gv_fbaseunit = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fconvertnumerator = new DevExpress.XtraEditors.LabelControl();
this.txt_fconvertnumerator = new DevExpress.XtraEditors.TextEdit();
this.gv_fconvertnumerator = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fcurrentunitid = new DevExpress.XtraEditors.LabelControl();
this.txt_fcurrentunitid = new DevExpress.XtraEditors.TextEdit();
- this.gv_fcurrentunitid = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_fconvertdenominator = new DevExpress.XtraEditors.LabelControl();
this.txt_fconvertdenominator = new DevExpress.XtraEditors.TextEdit();
this.gv_fconvertdenominator = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -128,7 +126,7 @@
//
this.lb_fforbidstatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fforbidstatus.Appearance.Options.UseFont = true;
- this.lb_fforbidstatus.Location = new System.Drawing.Point(283, 286);
+ this.lb_fforbidstatus.Location = new System.Drawing.Point(283, 204);
this.lb_fforbidstatus.Name = "lb_fforbidstatus";
this.lb_fforbidstatus.Size = new System.Drawing.Size(85, 21);
this.lb_fforbidstatus.TabIndex = 298;
@@ -136,7 +134,7 @@
//
// txt_fforbidstatus
//
- this.txt_fforbidstatus.Location = new System.Drawing.Point(368, 282);
+ this.txt_fforbidstatus.Location = new System.Drawing.Point(368, 200);
this.txt_fforbidstatus.Name = "txt_fforbidstatus";
this.txt_fforbidstatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fforbidstatus.Properties.Appearance.Options.UseFont = true;
@@ -147,21 +145,21 @@
//
this.gv_fforbidstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fforbidstatus.AppearanceCell.Options.UseFont = true;
- this.gv_fforbidstatus.Caption = "绂佺敤鐘舵�� ";
+ this.gv_fforbidstatus.Caption = "绂佺敤鐘舵��";
this.gv_fforbidstatus.FieldName = "fforbidstatus";
this.gv_fforbidstatus.MinWidth = 50;
this.gv_fforbidstatus.Name = "gv_fforbidstatus";
this.gv_fforbidstatus.OptionsColumn.AllowEdit = false;
this.gv_fforbidstatus.Tag = "query_a.fforbidstatus";
this.gv_fforbidstatus.Visible = true;
- this.gv_fforbidstatus.VisibleIndex = 15;
+ this.gv_fforbidstatus.VisibleIndex = 9;
this.gv_fforbidstatus.Width = 94;
//
// lb_fdescription
//
this.lb_fdescription.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fdescription.Appearance.Options.UseFont = true;
- this.lb_fdescription.Location = new System.Drawing.Point(13, 283);
+ this.lb_fdescription.Location = new System.Drawing.Point(283, 244);
this.lb_fdescription.Name = "lb_fdescription";
this.lb_fdescription.Size = new System.Drawing.Size(85, 21);
this.lb_fdescription.TabIndex = 291;
@@ -169,7 +167,7 @@
//
// txt_fdescription
//
- this.txt_fdescription.Location = new System.Drawing.Point(100, 279);
+ this.txt_fdescription.Location = new System.Drawing.Point(368, 240);
this.txt_fdescription.Name = "txt_fdescription";
this.txt_fdescription.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fdescription.Properties.Appearance.Options.UseFont = true;
@@ -180,21 +178,21 @@
//
this.gv_fdescription.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fdescription.AppearanceCell.Options.UseFont = true;
- this.gv_fdescription.Caption = "鎻忚堪 ";
+ this.gv_fdescription.Caption = "鎻忚堪";
this.gv_fdescription.FieldName = "fdescription";
this.gv_fdescription.MinWidth = 50;
this.gv_fdescription.Name = "gv_fdescription";
this.gv_fdescription.OptionsColumn.AllowEdit = false;
this.gv_fdescription.Tag = "query_a.fdescription";
this.gv_fdescription.Visible = true;
- this.gv_fdescription.VisibleIndex = 14;
+ this.gv_fdescription.VisibleIndex = 8;
this.gv_fdescription.Width = 94;
//
// lb_fprecision
//
this.lb_fprecision.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fprecision.Appearance.Options.UseFont = true;
- this.lb_fprecision.Location = new System.Drawing.Point(13, 247);
+ this.lb_fprecision.Location = new System.Drawing.Point(283, 84);
this.lb_fprecision.Name = "lb_fprecision";
this.lb_fprecision.Size = new System.Drawing.Size(85, 21);
this.lb_fprecision.TabIndex = 285;
@@ -202,7 +200,7 @@
//
// txt_fprecision
//
- this.txt_fprecision.Location = new System.Drawing.Point(98, 243);
+ this.txt_fprecision.Location = new System.Drawing.Point(368, 80);
this.txt_fprecision.Name = "txt_fprecision";
this.txt_fprecision.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fprecision.Properties.Appearance.Options.UseFont = true;
@@ -213,21 +211,21 @@
//
this.gv_fprecision.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fprecision.AppearanceCell.Options.UseFont = true;
- this.gv_fprecision.Caption = "绮惧害 ";
+ this.gv_fprecision.Caption = "绮惧害";
this.gv_fprecision.FieldName = "fprecision";
this.gv_fprecision.MinWidth = 50;
this.gv_fprecision.Name = "gv_fprecision";
this.gv_fprecision.OptionsColumn.AllowEdit = false;
this.gv_fprecision.Tag = "query_a.fprecision";
this.gv_fprecision.Visible = true;
- this.gv_fprecision.VisibleIndex = 9;
+ this.gv_fprecision.VisibleIndex = 7;
this.gv_fprecision.Width = 94;
//
// lb_froundtype
//
this.lb_froundtype.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_froundtype.Appearance.Options.UseFont = true;
- this.lb_froundtype.Location = new System.Drawing.Point(533, 85);
+ this.lb_froundtype.Location = new System.Drawing.Point(533, 43);
this.lb_froundtype.Name = "lb_froundtype";
this.lb_froundtype.Size = new System.Drawing.Size(85, 21);
this.lb_froundtype.TabIndex = 280;
@@ -235,7 +233,7 @@
//
// txt_froundtype
//
- this.txt_froundtype.Location = new System.Drawing.Point(618, 81);
+ this.txt_froundtype.Location = new System.Drawing.Point(618, 39);
this.txt_froundtype.Name = "txt_froundtype";
this.txt_froundtype.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_froundtype.Properties.Appearance.Options.UseFont = true;
@@ -246,21 +244,21 @@
//
this.gv_froundtype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_froundtype.AppearanceCell.Options.UseFont = true;
- this.gv_froundtype.Caption = "鑸嶅叆绫诲瀷 ";
+ this.gv_froundtype.Caption = "鑸嶅叆绫诲瀷";
this.gv_froundtype.FieldName = "froundtype";
this.gv_froundtype.MinWidth = 50;
this.gv_froundtype.Name = "gv_froundtype";
this.gv_froundtype.OptionsColumn.AllowEdit = false;
this.gv_froundtype.Tag = "query_a.froundtype";
this.gv_froundtype.Visible = true;
- this.gv_froundtype.VisibleIndex = 8;
+ this.gv_froundtype.VisibleIndex = 6;
this.gv_froundtype.Width = 94;
//
// lb_fbaseunit
//
this.lb_fbaseunit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fbaseunit.Appearance.Options.UseFont = true;
- this.lb_fbaseunit.Location = new System.Drawing.Point(283, 85);
+ this.lb_fbaseunit.Location = new System.Drawing.Point(283, 123);
this.lb_fbaseunit.Name = "lb_fbaseunit";
this.lb_fbaseunit.Size = new System.Drawing.Size(85, 21);
this.lb_fbaseunit.TabIndex = 273;
@@ -268,32 +266,18 @@
//
// txt_fbaseunit
//
- this.txt_fbaseunit.Location = new System.Drawing.Point(368, 81);
+ this.txt_fbaseunit.Location = new System.Drawing.Point(368, 119);
this.txt_fbaseunit.Name = "txt_fbaseunit";
this.txt_fbaseunit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fbaseunit.Properties.Appearance.Options.UseFont = true;
this.txt_fbaseunit.Size = new System.Drawing.Size(150, 28);
this.txt_fbaseunit.TabIndex = 273;
//
- // gv_fbaseunit
- //
- this.gv_fbaseunit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fbaseunit.AppearanceCell.Options.UseFont = true;
- this.gv_fbaseunit.Caption = "鍩哄噯鍗曚綅 ";
- this.gv_fbaseunit.FieldName = "fbaseunit";
- this.gv_fbaseunit.MinWidth = 50;
- this.gv_fbaseunit.Name = "gv_fbaseunit";
- this.gv_fbaseunit.OptionsColumn.AllowEdit = false;
- this.gv_fbaseunit.Tag = "query_a.fbaseunit";
- this.gv_fbaseunit.Visible = true;
- this.gv_fbaseunit.VisibleIndex = 7;
- this.gv_fbaseunit.Width = 94;
- //
// lb_fconvertnumerator
//
this.lb_fconvertnumerator.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fconvertnumerator.Appearance.Options.UseFont = true;
- this.lb_fconvertnumerator.Location = new System.Drawing.Point(13, 126);
+ this.lb_fconvertnumerator.Location = new System.Drawing.Point(533, 84);
this.lb_fconvertnumerator.Name = "lb_fconvertnumerator";
this.lb_fconvertnumerator.Size = new System.Drawing.Size(85, 21);
this.lb_fconvertnumerator.TabIndex = 267;
@@ -301,7 +285,7 @@
//
// txt_fconvertnumerator
//
- this.txt_fconvertnumerator.Location = new System.Drawing.Point(98, 122);
+ this.txt_fconvertnumerator.Location = new System.Drawing.Point(618, 80);
this.txt_fconvertnumerator.Name = "txt_fconvertnumerator";
this.txt_fconvertnumerator.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fconvertnumerator.Properties.Appearance.Options.UseFont = true;
@@ -312,21 +296,21 @@
//
this.gv_fconvertnumerator.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fconvertnumerator.AppearanceCell.Options.UseFont = true;
- this.gv_fconvertnumerator.Caption = "鎹㈢畻鍒嗗瓙 ";
+ this.gv_fconvertnumerator.Caption = "鎹㈢畻鍒嗗瓙";
this.gv_fconvertnumerator.FieldName = "fconvertnumerator";
this.gv_fconvertnumerator.MinWidth = 50;
this.gv_fconvertnumerator.Name = "gv_fconvertnumerator";
this.gv_fconvertnumerator.OptionsColumn.AllowEdit = false;
this.gv_fconvertnumerator.Tag = "query_a.fconvertnumerator";
this.gv_fconvertnumerator.Visible = true;
- this.gv_fconvertnumerator.VisibleIndex = 6;
+ this.gv_fconvertnumerator.VisibleIndex = 5;
this.gv_fconvertnumerator.Width = 94;
//
// lb_fcurrentunitid
//
this.lb_fcurrentunitid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fcurrentunitid.Appearance.Options.UseFont = true;
- this.lb_fcurrentunitid.Location = new System.Drawing.Point(13, 204);
+ this.lb_fcurrentunitid.Location = new System.Drawing.Point(283, 164);
this.lb_fcurrentunitid.Name = "lb_fcurrentunitid";
this.lb_fcurrentunitid.Size = new System.Drawing.Size(85, 21);
this.lb_fcurrentunitid.TabIndex = 262;
@@ -334,32 +318,18 @@
//
// txt_fcurrentunitid
//
- this.txt_fcurrentunitid.Location = new System.Drawing.Point(98, 200);
+ this.txt_fcurrentunitid.Location = new System.Drawing.Point(368, 160);
this.txt_fcurrentunitid.Name = "txt_fcurrentunitid";
this.txt_fcurrentunitid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fcurrentunitid.Properties.Appearance.Options.UseFont = true;
this.txt_fcurrentunitid.Size = new System.Drawing.Size(150, 28);
this.txt_fcurrentunitid.TabIndex = 262;
//
- // gv_fcurrentunitid
- //
- this.gv_fcurrentunitid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_fcurrentunitid.AppearanceCell.Options.UseFont = true;
- this.gv_fcurrentunitid.Caption = "褰撳墠鍗曚綅 ";
- this.gv_fcurrentunitid.FieldName = "fcurrentunitid";
- this.gv_fcurrentunitid.MinWidth = 50;
- this.gv_fcurrentunitid.Name = "gv_fcurrentunitid";
- this.gv_fcurrentunitid.OptionsColumn.AllowEdit = false;
- this.gv_fcurrentunitid.Tag = "query_a.fcurrentunitid";
- this.gv_fcurrentunitid.Visible = true;
- this.gv_fcurrentunitid.VisibleIndex = 5;
- this.gv_fcurrentunitid.Width = 94;
- //
// lb_fconvertdenominator
//
this.lb_fconvertdenominator.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fconvertdenominator.Appearance.Options.UseFont = true;
- this.lb_fconvertdenominator.Location = new System.Drawing.Point(533, 165);
+ this.lb_fconvertdenominator.Location = new System.Drawing.Point(533, 123);
this.lb_fconvertdenominator.Name = "lb_fconvertdenominator";
this.lb_fconvertdenominator.Size = new System.Drawing.Size(85, 21);
this.lb_fconvertdenominator.TabIndex = 258;
@@ -367,7 +337,7 @@
//
// txt_fconvertdenominator
//
- this.txt_fconvertdenominator.Location = new System.Drawing.Point(618, 161);
+ this.txt_fconvertdenominator.Location = new System.Drawing.Point(618, 119);
this.txt_fconvertdenominator.Name = "txt_fconvertdenominator";
this.txt_fconvertdenominator.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fconvertdenominator.Properties.Appearance.Options.UseFont = true;
@@ -378,7 +348,7 @@
//
this.gv_fconvertdenominator.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fconvertdenominator.AppearanceCell.Options.UseFont = true;
- this.gv_fconvertdenominator.Caption = "鎹㈢畻鍒嗘瘝 ";
+ this.gv_fconvertdenominator.Caption = "鎹㈢畻鍒嗘瘝";
this.gv_fconvertdenominator.FieldName = "fconvertdenominator";
this.gv_fconvertdenominator.MinWidth = 50;
this.gv_fconvertdenominator.Name = "gv_fconvertdenominator";
@@ -392,7 +362,7 @@
//
this.lb_funitgroupid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_funitgroupid.Appearance.Options.UseFont = true;
- this.lb_funitgroupid.Location = new System.Drawing.Point(533, 43);
+ this.lb_funitgroupid.Location = new System.Drawing.Point(38, 204);
this.lb_funitgroupid.Name = "lb_funitgroupid";
this.lb_funitgroupid.Size = new System.Drawing.Size(85, 21);
this.lb_funitgroupid.TabIndex = 252;
@@ -400,7 +370,7 @@
//
// txt_funitgroupid
//
- this.txt_funitgroupid.Location = new System.Drawing.Point(618, 39);
+ this.txt_funitgroupid.Location = new System.Drawing.Point(123, 200);
this.txt_funitgroupid.Name = "txt_funitgroupid";
this.txt_funitgroupid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_funitgroupid.Properties.Appearance.Options.UseFont = true;
@@ -411,7 +381,7 @@
//
this.gv_funitgroupid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_funitgroupid.AppearanceCell.Options.UseFont = true;
- this.gv_funitgroupid.Caption = "鎵�灞炵粍鍒� ";
+ this.gv_funitgroupid.Caption = "鎵�灞炵粍鍒�";
this.gv_funitgroupid.FieldName = "funitgroupid";
this.gv_funitgroupid.MinWidth = 50;
this.gv_funitgroupid.Name = "gv_funitgroupid";
@@ -444,7 +414,7 @@
//
this.gv_fname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fname.AppearanceCell.Options.UseFont = true;
- this.gv_fname.Caption = "鍚嶇О ";
+ this.gv_fname.Caption = "鍗曚綅鍚嶇О";
this.gv_fname.FieldName = "fname";
this.gv_fname.MinWidth = 50;
this.gv_fname.Name = "gv_fname";
@@ -458,7 +428,7 @@
//
this.lb_fnumber.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fnumber.Appearance.Options.UseFont = true;
- this.lb_fnumber.Location = new System.Drawing.Point(13, 84);
+ this.lb_fnumber.Location = new System.Drawing.Point(38, 84);
this.lb_fnumber.Name = "lb_fnumber";
this.lb_fnumber.Size = new System.Drawing.Size(85, 21);
this.lb_fnumber.TabIndex = 243;
@@ -466,7 +436,7 @@
//
// txt_fnumber
//
- this.txt_fnumber.Location = new System.Drawing.Point(98, 80);
+ this.txt_fnumber.Location = new System.Drawing.Point(123, 80);
this.txt_fnumber.Name = "txt_fnumber";
this.txt_fnumber.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fnumber.Properties.Appearance.Options.UseFont = true;
@@ -477,7 +447,7 @@
//
this.gv_fnumber.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fnumber.AppearanceCell.Options.UseFont = true;
- this.gv_fnumber.Caption = "缂栫爜 ";
+ this.gv_fnumber.Caption = "鍗曚綅缂栫爜";
this.gv_fnumber.FieldName = "fnumber";
this.gv_fnumber.MinWidth = 50;
this.gv_fnumber.Name = "gv_fnumber";
@@ -491,7 +461,7 @@
//
this.lb_lastupdate_by.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lastupdate_by.Appearance.Options.UseFont = true;
- this.lb_lastupdate_by.Location = new System.Drawing.Point(300, 204);
+ this.lb_lastupdate_by.Location = new System.Drawing.Point(550, 244);
this.lb_lastupdate_by.Name = "lb_lastupdate_by";
this.lb_lastupdate_by.Size = new System.Drawing.Size(68, 21);
this.lb_lastupdate_by.TabIndex = 231;
@@ -499,7 +469,7 @@
//
// txt_lastupdateBy
//
- this.txt_lastupdateBy.Location = new System.Drawing.Point(368, 200);
+ this.txt_lastupdateBy.Location = new System.Drawing.Point(618, 240);
this.txt_lastupdateBy.Name = "txt_lastupdateBy";
this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
@@ -510,7 +480,7 @@
//
this.lb_lastupdate_date.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lastupdate_date.Appearance.Options.UseFont = true;
- this.lb_lastupdate_date.Location = new System.Drawing.Point(278, 247);
+ this.lb_lastupdate_date.Location = new System.Drawing.Point(528, 278);
this.lb_lastupdate_date.Name = "lb_lastupdate_date";
this.lb_lastupdate_date.Size = new System.Drawing.Size(90, 21);
this.lb_lastupdate_date.TabIndex = 228;
@@ -518,7 +488,7 @@
//
// txt_lastupdateDate
//
- this.txt_lastupdateDate.Location = new System.Drawing.Point(368, 243);
+ this.txt_lastupdateDate.Location = new System.Drawing.Point(618, 274);
this.txt_lastupdateDate.Name = "txt_lastupdateDate";
this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
@@ -529,7 +499,7 @@
//
this.lb_create_by.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_create_by.Appearance.Options.UseFont = true;
- this.lb_create_by.Location = new System.Drawing.Point(550, 204);
+ this.lb_create_by.Location = new System.Drawing.Point(550, 164);
this.lb_create_by.Name = "lb_create_by";
this.lb_create_by.Size = new System.Drawing.Size(68, 21);
this.lb_create_by.TabIndex = 226;
@@ -537,7 +507,7 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(618, 200);
+ this.txt_createBy.Location = new System.Drawing.Point(618, 160);
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;
@@ -548,7 +518,7 @@
//
this.lb_create_date.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_create_date.Appearance.Options.UseFont = true;
- this.lb_create_date.Location = new System.Drawing.Point(533, 247);
+ this.lb_create_date.Location = new System.Drawing.Point(533, 204);
this.lb_create_date.Name = "lb_create_date";
this.lb_create_date.Size = new System.Drawing.Size(85, 21);
this.lb_create_date.TabIndex = 222;
@@ -556,7 +526,7 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(618, 243);
+ this.txt_createDate.Location = new System.Drawing.Point(618, 200);
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;
@@ -567,7 +537,7 @@
//
this.lb_newqty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_newqty.Appearance.Options.UseFont = true;
- this.lb_newqty.Location = new System.Drawing.Point(249, 164);
+ this.lb_newqty.Location = new System.Drawing.Point(4, 278);
this.lb_newqty.Name = "lb_newqty";
this.lb_newqty.Size = new System.Drawing.Size(119, 21);
this.lb_newqty.TabIndex = 219;
@@ -575,7 +545,7 @@
//
// txt_newqty
//
- this.txt_newqty.Location = new System.Drawing.Point(368, 160);
+ this.txt_newqty.Location = new System.Drawing.Point(123, 274);
this.txt_newqty.Name = "txt_newqty";
this.txt_newqty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_newqty.Properties.Appearance.Options.UseFont = true;
@@ -586,9 +556,9 @@
//
this.gv_newqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_newqty.AppearanceCell.Options.UseFont = true;
- this.gv_newqty.Caption = "鐩殑鍗曚綅鏁伴噺 ";
+ this.gv_newqty.Caption = "鐩殑鍗曚綅鏁伴噺";
this.gv_newqty.FieldName = "newqty";
- this.gv_newqty.MinWidth = 50;
+ this.gv_newqty.MinWidth = 80;
this.gv_newqty.Name = "gv_newqty";
this.gv_newqty.OptionsColumn.AllowEdit = false;
this.gv_newqty.Tag = "query_a.newqty";
@@ -600,7 +570,7 @@
//
this.lb_oldqty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_oldqty.Appearance.Options.UseFont = true;
- this.lb_oldqty.Location = new System.Drawing.Point(266, 125);
+ this.lb_oldqty.Location = new System.Drawing.Point(21, 164);
this.lb_oldqty.Name = "lb_oldqty";
this.lb_oldqty.Size = new System.Drawing.Size(102, 21);
this.lb_oldqty.TabIndex = 217;
@@ -608,7 +578,7 @@
//
// txt_oldqty
//
- this.txt_oldqty.Location = new System.Drawing.Point(368, 121);
+ this.txt_oldqty.Location = new System.Drawing.Point(123, 160);
this.txt_oldqty.Name = "txt_oldqty";
this.txt_oldqty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_oldqty.Properties.Appearance.Options.UseFont = true;
@@ -619,9 +589,9 @@
//
this.gv_oldqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_oldqty.AppearanceCell.Options.UseFont = true;
- this.gv_oldqty.Caption = "鍘熷崟浣嶆暟閲� ";
+ this.gv_oldqty.Caption = "鍘熷崟浣嶆暟閲�";
this.gv_oldqty.FieldName = "oldqty";
- this.gv_oldqty.MinWidth = 50;
+ this.gv_oldqty.MinWidth = 80;
this.gv_oldqty.Name = "gv_oldqty";
this.gv_oldqty.OptionsColumn.AllowEdit = false;
this.gv_oldqty.Tag = "query_a.oldqty";
@@ -633,7 +603,7 @@
//
this.lb_newunit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_newunit.Appearance.Options.UseFont = true;
- this.lb_newunit.Location = new System.Drawing.Point(533, 125);
+ this.lb_newunit.Location = new System.Drawing.Point(38, 244);
this.lb_newunit.Name = "lb_newunit";
this.lb_newunit.Size = new System.Drawing.Size(85, 21);
this.lb_newunit.TabIndex = 216;
@@ -641,7 +611,7 @@
//
// txt_newunit
//
- this.txt_newunit.Location = new System.Drawing.Point(618, 121);
+ this.txt_newunit.Location = new System.Drawing.Point(123, 240);
this.txt_newunit.Name = "txt_newunit";
this.txt_newunit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_newunit.Properties.Appearance.Options.UseFont = true;
@@ -652,7 +622,7 @@
//
this.gv_newunit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_newunit.AppearanceCell.Options.UseFont = true;
- this.gv_newunit.Caption = "鐩殑鍗曚綅 ";
+ this.gv_newunit.Caption = "鐩殑鍗曚綅";
this.gv_newunit.FieldName = "newunit";
this.gv_newunit.MinWidth = 50;
this.gv_newunit.Name = "gv_newunit";
@@ -666,7 +636,7 @@
//
this.lb_oldunit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_oldunit.Appearance.Options.UseFont = true;
- this.lb_oldunit.Location = new System.Drawing.Point(30, 166);
+ this.lb_oldunit.Location = new System.Drawing.Point(55, 123);
this.lb_oldunit.Name = "lb_oldunit";
this.lb_oldunit.Size = new System.Drawing.Size(68, 21);
this.lb_oldunit.TabIndex = 213;
@@ -674,7 +644,7 @@
//
// txt_oldunit
//
- this.txt_oldunit.Location = new System.Drawing.Point(98, 162);
+ this.txt_oldunit.Location = new System.Drawing.Point(123, 119);
this.txt_oldunit.Name = "txt_oldunit";
this.txt_oldunit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_oldunit.Properties.Appearance.Options.UseFont = true;
@@ -685,7 +655,7 @@
//
this.gv_oldunit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_oldunit.AppearanceCell.Options.UseFont = true;
- this.gv_oldunit.Caption = "鍘熷崟浣� ";
+ this.gv_oldunit.Caption = "鍘熷崟浣�";
this.gv_oldunit.FieldName = "oldunit";
this.gv_oldunit.MinWidth = 50;
this.gv_oldunit.Name = "gv_oldunit";
@@ -699,7 +669,7 @@
//
this.lb_id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_id.Appearance.Options.UseFont = true;
- this.lb_id.Location = new System.Drawing.Point(29, 43);
+ this.lb_id.Location = new System.Drawing.Point(54, 43);
this.lb_id.Name = "lb_id";
this.lb_id.Size = new System.Drawing.Size(69, 21);
this.lb_id.TabIndex = 211;
@@ -707,7 +677,7 @@
//
// txt_id
//
- this.txt_id.Location = new System.Drawing.Point(98, 39);
+ this.txt_id.Location = new System.Drawing.Point(123, 39);
this.txt_id.Name = "txt_id";
this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_id.Properties.Appearance.Options.UseFont = true;
@@ -718,7 +688,7 @@
//
this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_id.AppearanceCell.Options.UseFont = true;
- this.gv_id.Caption = "ID";
+ this.gv_id.Caption = "鍗曚綅ID";
this.gv_id.FieldName = "id";
this.gv_id.MinWidth = 50;
this.gv_id.Name = "gv_id";
@@ -764,17 +734,15 @@
this.gv_fname,
this.gv_funitgroupid,
this.gv_fconvertdenominator,
- this.gv_fcurrentunitid,
this.gv_fconvertnumerator,
- this.gv_fbaseunit,
this.gv_froundtype,
this.gv_fprecision,
+ this.gv_fdescription,
+ this.gv_fforbidstatus,
this.gv_oldunit,
this.gv_oldqty,
this.gv_newunit,
- this.gv_newqty,
- this.gv_fdescription,
- this.gv_fforbidstatus});
+ this.gv_newqty});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -876,7 +844,7 @@
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(53, 329);
+ this.labelControl11.Location = new System.Drawing.Point(53, 373);
this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl11.Name = "labelControl11";
this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -887,7 +855,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(104, 329);
+ this.lbGuid.Location = new System.Drawing.Point(104, 373);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -962,7 +930,6 @@
private DevExpress.XtraEditors.LabelControl lb_fbaseunit;
private DevExpress.XtraEditors.TextEdit txt_fbaseunit;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fbaseunit;
private DevExpress.XtraEditors.LabelControl lb_fconvertnumerator;
private DevExpress.XtraEditors.TextEdit txt_fconvertnumerator;
@@ -970,7 +937,6 @@
private DevExpress.XtraEditors.LabelControl lb_fcurrentunitid;
private DevExpress.XtraEditors.TextEdit txt_fcurrentunitid;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fcurrentunitid;
private DevExpress.XtraEditors.LabelControl lb_fconvertdenominator;
private DevExpress.XtraEditors.TextEdit txt_fconvertdenominator;
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
index 1e1a366..5866d3f 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.cs
@@ -16,7 +16,6 @@
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesUnitManager/";
-
public Frm_MesUnit()
{
InitializeComponent();
@@ -93,8 +92,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1, UtilityHelper.GetPageSize());
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
index 538c1e8..4e6afcd 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
@@ -41,7 +41,6 @@
this.gv_lineNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_memo = new DevExpress.XtraEditors.LabelControl();
this.txt_memo = new DevExpress.XtraEditors.TextEdit();
- this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl();
this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl();
@@ -50,18 +49,6 @@
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.lb_createBy = new DevExpress.XtraEditors.LabelControl();
this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
- this.lb_remark5 = new DevExpress.XtraEditors.LabelControl();
- this.txt_remark5 = new DevExpress.XtraEditors.TextEdit();
- this.lb_remark4 = new DevExpress.XtraEditors.LabelControl();
- this.txt_remark4 = new DevExpress.XtraEditors.TextEdit();
- this.lb_remark3 = new DevExpress.XtraEditors.LabelControl();
- this.txt_remark3 = new DevExpress.XtraEditors.TextEdit();
- this.lb_useOrg = new DevExpress.XtraEditors.LabelControl();
- this.txt_useOrg = new DevExpress.XtraEditors.TextEdit();
- this.gv_useOrg = new DevExpress.XtraGrid.Columns.GridColumn();
- this.lb_createOrg = new DevExpress.XtraEditors.LabelControl();
- this.txt_createOrg = new DevExpress.XtraEditors.TextEdit();
- this.gv_createOrg = new DevExpress.XtraGrid.Columns.GridColumn();
this.lb_remark = new DevExpress.XtraEditors.LabelControl();
this.txt_remark = new DevExpress.XtraEditors.TextEdit();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -95,6 +82,7 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -110,11 +98,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark5.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark4.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark3.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_useOrg.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createOrg.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_startDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_phoneNumber.Properties)).BeginInit();
@@ -157,14 +140,14 @@
//
this.gv_fforbidStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_fforbidStatus.AppearanceCell.Options.UseFont = true;
- this.gv_fforbidStatus.Caption = "鏄惁绂佺敤 ";
+ this.gv_fforbidStatus.Caption = "鏄惁绂佺敤";
this.gv_fforbidStatus.FieldName = "fforbidStatus";
this.gv_fforbidStatus.MinWidth = 50;
this.gv_fforbidStatus.Name = "gv_fforbidStatus";
this.gv_fforbidStatus.OptionsColumn.AllowEdit = false;
this.gv_fforbidStatus.Tag = "query_a.fforbid_status";
this.gv_fforbidStatus.Visible = true;
- this.gv_fforbidStatus.VisibleIndex = 15;
+ this.gv_fforbidStatus.VisibleIndex = 13;
this.gv_fforbidStatus.Width = 94;
//
// lb_workMk
@@ -190,21 +173,21 @@
//
this.gv_workMk.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_workMk.AppearanceCell.Options.UseFont = true;
- this.gv_workMk.Caption = "鐢熶骇鍛樺伐鏍囪瘑 ";
+ this.gv_workMk.Caption = "鐢熶骇鍛樺伐鏍囪瘑";
this.gv_workMk.FieldName = "workMk";
this.gv_workMk.MinWidth = 50;
this.gv_workMk.Name = "gv_workMk";
this.gv_workMk.OptionsColumn.AllowEdit = false;
this.gv_workMk.Tag = "query_a.work_mk";
this.gv_workMk.Visible = true;
- this.gv_workMk.VisibleIndex = 14;
+ this.gv_workMk.VisibleIndex = 12;
this.gv_workMk.Width = 94;
//
// lb_lineNo
//
this.lb_lineNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lineNo.Appearance.Options.UseFont = true;
- this.lb_lineNo.Location = new System.Drawing.Point(315, 184);
+ this.lb_lineNo.Location = new System.Drawing.Point(315, 183);
this.lb_lineNo.Name = "lb_lineNo";
this.lb_lineNo.Size = new System.Drawing.Size(56, 21);
this.lb_lineNo.TabIndex = 291;
@@ -212,7 +195,7 @@
//
// txt_lineNo
//
- this.txt_lineNo.Location = new System.Drawing.Point(377, 180);
+ this.txt_lineNo.Location = new System.Drawing.Point(377, 179);
this.txt_lineNo.Name = "txt_lineNo";
this.txt_lineNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lineNo.Properties.Appearance.Options.UseFont = true;
@@ -223,21 +206,21 @@
//
this.gv_lineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_lineNo.AppearanceCell.Options.UseFont = true;
- this.gv_lineNo.Caption = "鐢熶骇绾� ";
+ this.gv_lineNo.Caption = "鐢熶骇绾�";
this.gv_lineNo.FieldName = "lineNo";
this.gv_lineNo.MinWidth = 50;
this.gv_lineNo.Name = "gv_lineNo";
this.gv_lineNo.OptionsColumn.AllowEdit = false;
this.gv_lineNo.Tag = "query_a.line_no";
this.gv_lineNo.Visible = true;
- this.gv_lineNo.VisibleIndex = 13;
+ this.gv_lineNo.VisibleIndex = 11;
this.gv_lineNo.Width = 94;
//
// lb_memo
//
this.lb_memo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_memo.Appearance.Options.UseFont = true;
- this.lb_memo.Location = new System.Drawing.Point(332, 223);
+ this.lb_memo.Location = new System.Drawing.Point(66, 183);
this.lb_memo.Name = "lb_memo";
this.lb_memo.Size = new System.Drawing.Size(39, 21);
this.lb_memo.TabIndex = 285;
@@ -245,26 +228,12 @@
//
// txt_memo
//
- this.txt_memo.Location = new System.Drawing.Point(377, 219);
+ this.txt_memo.Location = new System.Drawing.Point(113, 179);
this.txt_memo.Name = "txt_memo";
this.txt_memo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_memo.Properties.Appearance.Options.UseFont = true;
this.txt_memo.Size = new System.Drawing.Size(150, 28);
this.txt_memo.TabIndex = 285;
- //
- // gv_memo
- //
- this.gv_memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_memo.AppearanceCell.Options.UseFont = true;
- this.gv_memo.Caption = "澶囨敞 ";
- this.gv_memo.FieldName = "memo";
- this.gv_memo.MinWidth = 50;
- this.gv_memo.Name = "gv_memo";
- this.gv_memo.OptionsColumn.AllowEdit = false;
- this.gv_memo.Tag = "query_a.memo";
- this.gv_memo.Visible = true;
- this.gv_memo.VisibleIndex = 12;
- this.gv_memo.Width = 94;
//
// lb_lastupdateDate
//
@@ -342,129 +311,6 @@
this.txt_createBy.Size = new System.Drawing.Size(150, 28);
this.txt_createBy.TabIndex = 262;
//
- // lb_remark5
- //
- this.lb_remark5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_remark5.Appearance.Options.UseFont = true;
- this.lb_remark5.Location = new System.Drawing.Point(543, 262);
- this.lb_remark5.Name = "lb_remark5";
- this.lb_remark5.Size = new System.Drawing.Size(99, 21);
- this.lb_remark5.TabIndex = 258;
- this.lb_remark5.Text = "鑷畾涔夊瓧娈�5 ";
- //
- // txt_remark5
- //
- this.txt_remark5.Location = new System.Drawing.Point(653, 258);
- this.txt_remark5.Name = "txt_remark5";
- this.txt_remark5.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_remark5.Properties.Appearance.Options.UseFont = true;
- this.txt_remark5.Size = new System.Drawing.Size(150, 28);
- this.txt_remark5.TabIndex = 258;
- //
- // lb_remark4
- //
- this.lb_remark4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_remark4.Appearance.Options.UseFont = true;
- this.lb_remark4.Location = new System.Drawing.Point(272, 262);
- this.lb_remark4.Name = "lb_remark4";
- this.lb_remark4.Size = new System.Drawing.Size(99, 21);
- this.lb_remark4.TabIndex = 252;
- this.lb_remark4.Text = "鑷畾涔夊瓧娈�4 ";
- //
- // txt_remark4
- //
- this.txt_remark4.Location = new System.Drawing.Point(377, 258);
- this.txt_remark4.Name = "txt_remark4";
- this.txt_remark4.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_remark4.Properties.Appearance.Options.UseFont = true;
- this.txt_remark4.Size = new System.Drawing.Size(150, 28);
- this.txt_remark4.TabIndex = 252;
- //
- // lb_remark3
- //
- this.lb_remark3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_remark3.Appearance.Options.UseFont = true;
- this.lb_remark3.Location = new System.Drawing.Point(6, 262);
- this.lb_remark3.Name = "lb_remark3";
- this.lb_remark3.Size = new System.Drawing.Size(99, 21);
- this.lb_remark3.TabIndex = 247;
- this.lb_remark3.Text = "鑷畾涔夊瓧娈�3 ";
- //
- // txt_remark3
- //
- this.txt_remark3.Location = new System.Drawing.Point(113, 258);
- this.txt_remark3.Name = "txt_remark3";
- this.txt_remark3.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_remark3.Properties.Appearance.Options.UseFont = true;
- this.txt_remark3.Size = new System.Drawing.Size(150, 28);
- this.txt_remark3.TabIndex = 247;
- //
- // lb_useOrg
- //
- this.lb_useOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_useOrg.Appearance.Options.UseFont = true;
- this.lb_useOrg.Location = new System.Drawing.Point(32, 184);
- this.lb_useOrg.Name = "lb_useOrg";
- this.lb_useOrg.Size = new System.Drawing.Size(73, 21);
- this.lb_useOrg.TabIndex = 243;
- this.lb_useOrg.Text = "浣跨敤缁勭粐 ";
- //
- // txt_useOrg
- //
- this.txt_useOrg.Location = new System.Drawing.Point(113, 180);
- this.txt_useOrg.Name = "txt_useOrg";
- this.txt_useOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_useOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_useOrg.Size = new System.Drawing.Size(150, 28);
- this.txt_useOrg.TabIndex = 243;
- //
- // gv_useOrg
- //
- this.gv_useOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_useOrg.AppearanceCell.Options.UseFont = true;
- this.gv_useOrg.Caption = "浣跨敤缁勭粐 ";
- this.gv_useOrg.FieldName = "useOrg";
- this.gv_useOrg.MinWidth = 50;
- this.gv_useOrg.Name = "gv_useOrg";
- this.gv_useOrg.OptionsColumn.AllowEdit = false;
- this.gv_useOrg.Tag = "query_a.use_org";
- this.gv_useOrg.Visible = true;
- this.gv_useOrg.VisibleIndex = 11;
- this.gv_useOrg.Width = 94;
- //
- // lb_createOrg
- //
- this.lb_createOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.lb_createOrg.Appearance.Options.UseFont = true;
- this.lb_createOrg.Location = new System.Drawing.Point(32, 223);
- this.lb_createOrg.Name = "lb_createOrg";
- this.lb_createOrg.Size = new System.Drawing.Size(73, 21);
- this.lb_createOrg.TabIndex = 240;
- this.lb_createOrg.Text = "鍒涘缓缁勭粐 ";
- //
- // txt_createOrg
- //
- this.txt_createOrg.Location = new System.Drawing.Point(113, 219);
- this.txt_createOrg.Name = "txt_createOrg";
- this.txt_createOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_createOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_createOrg.Size = new System.Drawing.Size(150, 28);
- this.txt_createOrg.TabIndex = 240;
- //
- // gv_createOrg
- //
- this.gv_createOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_createOrg.AppearanceCell.Options.UseFont = true;
- this.gv_createOrg.Caption = "鍒涘缓缁勭粐 ";
- this.gv_createOrg.FieldName = "createOrg";
- this.gv_createOrg.MinWidth = 50;
- this.gv_createOrg.Name = "gv_createOrg";
- this.gv_createOrg.OptionsColumn.AllowEdit = false;
- this.gv_createOrg.Tag = "query_a.create_org";
- this.gv_createOrg.Visible = true;
- this.gv_createOrg.VisibleIndex = 10;
- this.gv_createOrg.Width = 94;
- //
// lb_remark
//
this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -488,14 +334,14 @@
//
this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_remark.AppearanceCell.Options.UseFont = true;
- this.gv_remark.Caption = "澶囨敞 ";
+ this.gv_remark.Caption = "澶囨敞";
this.gv_remark.FieldName = "remark";
this.gv_remark.MinWidth = 50;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 9;
+ this.gv_remark.VisibleIndex = 10;
this.gv_remark.Width = 94;
//
// lb_startDate
@@ -521,14 +367,14 @@
//
this.gv_startDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_startDate.AppearanceCell.Options.UseFont = true;
- this.gv_startDate.Caption = "浠诲矖寮�濮嬫棩鏈� ";
+ this.gv_startDate.Caption = "浠诲矖寮�濮嬫棩鏈�";
this.gv_startDate.FieldName = "startDate";
this.gv_startDate.MinWidth = 50;
this.gv_startDate.Name = "gv_startDate";
this.gv_startDate.OptionsColumn.AllowEdit = false;
this.gv_startDate.Tag = "query_a.start_date";
this.gv_startDate.Visible = true;
- this.gv_startDate.VisibleIndex = 8;
+ this.gv_startDate.VisibleIndex = 9;
this.gv_startDate.Width = 94;
//
// lb_phoneNumber
@@ -554,14 +400,14 @@
//
this.gv_phoneNumber.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_phoneNumber.AppearanceCell.Options.UseFont = true;
- this.gv_phoneNumber.Caption = "鎵嬫満鍙� ";
+ this.gv_phoneNumber.Caption = "鎵嬫満鍙�";
this.gv_phoneNumber.FieldName = "phoneNumber";
this.gv_phoneNumber.MinWidth = 50;
this.gv_phoneNumber.Name = "gv_phoneNumber";
this.gv_phoneNumber.OptionsColumn.AllowEdit = false;
this.gv_phoneNumber.Tag = "query_a.phone_number";
this.gv_phoneNumber.Visible = true;
- this.gv_phoneNumber.VisibleIndex = 7;
+ this.gv_phoneNumber.VisibleIndex = 8;
this.gv_phoneNumber.Width = 94;
//
// lb_positionName
@@ -587,14 +433,14 @@
//
this.gv_positionName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_positionName.AppearanceCell.Options.UseFont = true;
- this.gv_positionName.Caption = "宀椾綅鍚嶇О ";
+ this.gv_positionName.Caption = "宀椾綅鍚嶇О";
this.gv_positionName.FieldName = "positionName";
this.gv_positionName.MinWidth = 50;
this.gv_positionName.Name = "gv_positionName";
this.gv_positionName.OptionsColumn.AllowEdit = false;
this.gv_positionName.Tag = "query_a.position_name";
this.gv_positionName.Visible = true;
- this.gv_positionName.VisibleIndex = 6;
+ this.gv_positionName.VisibleIndex = 7;
this.gv_positionName.Width = 94;
//
// lb_positionCode
@@ -620,14 +466,14 @@
//
this.gv_positionCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_positionCode.AppearanceCell.Options.UseFont = true;
- this.gv_positionCode.Caption = "宀椾綅缂栫爜 ";
+ this.gv_positionCode.Caption = "宀椾綅缂栫爜";
this.gv_positionCode.FieldName = "positionCode";
this.gv_positionCode.MinWidth = 50;
this.gv_positionCode.Name = "gv_positionCode";
this.gv_positionCode.OptionsColumn.AllowEdit = false;
this.gv_positionCode.Tag = "query_a.position_code";
this.gv_positionCode.Visible = true;
- this.gv_positionCode.VisibleIndex = 5;
+ this.gv_positionCode.VisibleIndex = 6;
this.gv_positionCode.Width = 94;
//
// lb_departmentName
@@ -653,14 +499,14 @@
//
this.gv_departmentName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_departmentName.AppearanceCell.Options.UseFont = true;
- this.gv_departmentName.Caption = "閮ㄩ棬鍚嶇О ";
+ this.gv_departmentName.Caption = "閮ㄩ棬鍚嶇О";
this.gv_departmentName.FieldName = "departmentName";
this.gv_departmentName.MinWidth = 50;
this.gv_departmentName.Name = "gv_departmentName";
this.gv_departmentName.OptionsColumn.AllowEdit = false;
this.gv_departmentName.Tag = "query_a.department_name";
this.gv_departmentName.Visible = true;
- this.gv_departmentName.VisibleIndex = 4;
+ this.gv_departmentName.VisibleIndex = 5;
this.gv_departmentName.Width = 94;
//
// lb_departmentNo
@@ -686,14 +532,14 @@
//
this.gv_departmentNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_departmentNo.AppearanceCell.Options.UseFont = true;
- this.gv_departmentNo.Caption = "閮ㄩ棬缂栫爜 ";
+ this.gv_departmentNo.Caption = "閮ㄩ棬缂栫爜";
this.gv_departmentNo.FieldName = "departmentNo";
this.gv_departmentNo.MinWidth = 50;
this.gv_departmentNo.Name = "gv_departmentNo";
this.gv_departmentNo.OptionsColumn.AllowEdit = false;
this.gv_departmentNo.Tag = "query_a.department_no";
this.gv_departmentNo.Visible = true;
- this.gv_departmentNo.VisibleIndex = 3;
+ this.gv_departmentNo.VisibleIndex = 4;
this.gv_departmentNo.Width = 94;
//
// lb_staffName
@@ -719,14 +565,14 @@
//
this.gv_staffName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_staffName.AppearanceCell.Options.UseFont = true;
- this.gv_staffName.Caption = "鍛樺伐濮撳悕 ";
+ this.gv_staffName.Caption = "鍛樺伐濮撳悕";
this.gv_staffName.FieldName = "staffName";
this.gv_staffName.MinWidth = 50;
this.gv_staffName.Name = "gv_staffName";
this.gv_staffName.OptionsColumn.AllowEdit = false;
this.gv_staffName.Tag = "query_a.staff_name";
this.gv_staffName.Visible = true;
- this.gv_staffName.VisibleIndex = 2;
+ this.gv_staffName.VisibleIndex = 3;
this.gv_staffName.Width = 94;
//
// lb_staffNo
@@ -752,14 +598,14 @@
//
this.gv_staffNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_staffNo.AppearanceCell.Options.UseFont = true;
- this.gv_staffNo.Caption = "鍛樺伐缂栫爜 ";
+ this.gv_staffNo.Caption = "鍛樺伐缂栫爜";
this.gv_staffNo.FieldName = "staffNo";
this.gv_staffNo.MinWidth = 50;
this.gv_staffNo.Name = "gv_staffNo";
this.gv_staffNo.OptionsColumn.AllowEdit = false;
this.gv_staffNo.Tag = "query_a.staff_no";
this.gv_staffNo.Visible = true;
- this.gv_staffNo.VisibleIndex = 1;
+ this.gv_staffNo.VisibleIndex = 2;
this.gv_staffNo.Width = 94;
//
// lb_id
@@ -785,14 +631,14 @@
//
this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
this.gv_id.AppearanceCell.Options.UseFont = true;
- this.gv_id.Caption = "ID ";
+ this.gv_id.Caption = "鍛樺伐ID";
this.gv_id.FieldName = "id";
this.gv_id.MinWidth = 50;
this.gv_id.Name = "gv_id";
this.gv_id.OptionsColumn.AllowEdit = false;
this.gv_id.Tag = "query_a.id";
this.gv_id.Visible = true;
- this.gv_id.VisibleIndex = 0;
+ this.gv_id.VisibleIndex = 1;
this.gv_id.Width = 94;
//
// toolBarMenu1
@@ -826,6 +672,7 @@
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn1,
this.gv_id,
this.gv_staffNo,
this.gv_staffName,
@@ -836,9 +683,6 @@
this.gv_phoneNumber,
this.gv_startDate,
this.gv_remark,
- this.gv_createOrg,
- this.gv_useOrg,
- this.gv_memo,
this.gv_lineNo,
this.gv_workMk,
this.gv_fforbidStatus});
@@ -848,6 +692,17 @@
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "浣跨敤缁勭粐";
+ this.gridColumn1.FieldName = "fSubsidiary";
+ this.gridColumn1.MinWidth = 250;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.OptionsColumn.AllowEdit = false;
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 0;
+ this.gridColumn1.Width = 250;
//
// xtraTabControl1
//
@@ -911,16 +766,6 @@
this.panel1.Controls.Add(this.txt_createDate);
this.panel1.Controls.Add(this.lb_createBy);
this.panel1.Controls.Add(this.txt_createBy);
- this.panel1.Controls.Add(this.lb_remark5);
- this.panel1.Controls.Add(this.txt_remark5);
- this.panel1.Controls.Add(this.lb_remark4);
- this.panel1.Controls.Add(this.txt_remark4);
- this.panel1.Controls.Add(this.lb_remark3);
- this.panel1.Controls.Add(this.txt_remark3);
- this.panel1.Controls.Add(this.lb_useOrg);
- this.panel1.Controls.Add(this.txt_useOrg);
- this.panel1.Controls.Add(this.lb_createOrg);
- this.panel1.Controls.Add(this.txt_createOrg);
this.panel1.Controls.Add(this.lb_remark);
this.panel1.Controls.Add(this.txt_remark);
this.panel1.Controls.Add(this.lb_startDate);
@@ -944,12 +789,12 @@
this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
this.panel1.Location = new System.Drawing.Point(76, 20);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(856, 371);
+ this.panel1.Size = new System.Drawing.Size(856, 302);
this.panel1.TabIndex = 1;
//
// labelControl11
//
- this.labelControl11.Location = new System.Drawing.Point(61, 312);
+ this.labelControl11.Location = new System.Drawing.Point(66, 253);
this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.labelControl11.Name = "labelControl11";
this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -960,7 +805,7 @@
// lbGuid
//
this.lbGuid.AutoSize = true;
- this.lbGuid.Location = new System.Drawing.Point(112, 312);
+ this.lbGuid.Location = new System.Drawing.Point(117, 253);
this.lbGuid.Name = "lbGuid";
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
@@ -982,11 +827,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark5.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark4.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_remark3.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_useOrg.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_createOrg.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_startDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_phoneNumber.Properties)).EndInit();
@@ -1034,7 +874,6 @@
private DevExpress.XtraEditors.LabelControl lb_memo;
private DevExpress.XtraEditors.TextEdit txt_memo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_memo;
private DevExpress.XtraEditors.LabelControl lb_lastupdateDate;
private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
@@ -1047,23 +886,6 @@
private DevExpress.XtraEditors.LabelControl lb_createBy;
private DevExpress.XtraEditors.TextEdit txt_createBy;
-
- private DevExpress.XtraEditors.LabelControl lb_remark5;
- private DevExpress.XtraEditors.TextEdit txt_remark5;
-
- private DevExpress.XtraEditors.LabelControl lb_remark4;
- private DevExpress.XtraEditors.TextEdit txt_remark4;
-
- private DevExpress.XtraEditors.LabelControl lb_remark3;
- private DevExpress.XtraEditors.TextEdit txt_remark3;
-
- private DevExpress.XtraEditors.LabelControl lb_useOrg;
- private DevExpress.XtraEditors.TextEdit txt_useOrg;
- private DevExpress.XtraGrid.Columns.GridColumn gv_useOrg;
-
- private DevExpress.XtraEditors.LabelControl lb_createOrg;
- private DevExpress.XtraEditors.TextEdit txt_createOrg;
- private DevExpress.XtraGrid.Columns.GridColumn gv_createOrg;
private DevExpress.XtraEditors.LabelControl lb_remark;
private DevExpress.XtraEditors.TextEdit txt_remark;
@@ -1104,6 +926,6 @@
private DevExpress.XtraEditors.LabelControl lb_id;
private DevExpress.XtraEditors.TextEdit txt_id;
private DevExpress.XtraGrid.Columns.GridColumn gv_id;
-
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
index b3a792f..dad1b2d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
@@ -76,14 +76,16 @@
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.panel1 = new System.Windows.Forms.Panel();
+ this.txt_suppName = new DevExpress.XtraEditors.MemoEdit();
this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.lbGuid = new System.Windows.Forms.Label();
- this.txt_suppName = new DevExpress.XtraEditors.MemoEdit();
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fstaffid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_lxr.Properties)).BeginInit();
@@ -138,7 +140,7 @@
this.gv_fforbidstatus.OptionsColumn.AllowEdit = false;
this.gv_fforbidstatus.Tag = "query_a.fforbidstatus";
this.gv_fforbidstatus.Visible = true;
- this.gv_fforbidstatus.VisibleIndex = 9;
+ this.gv_fforbidstatus.VisibleIndex = 8;
this.gv_fforbidstatus.Width = 50;
//
// lb_fstaffid
@@ -166,13 +168,13 @@
this.gv_fstaffid.AppearanceCell.Options.UseFont = true;
this.gv_fstaffid.Caption = "璐熻矗浜�";
this.gv_fstaffid.FieldName = "fstaffid";
- this.gv_fstaffid.MinWidth = 50;
+ this.gv_fstaffid.MinWidth = 100;
this.gv_fstaffid.Name = "gv_fstaffid";
this.gv_fstaffid.OptionsColumn.AllowEdit = false;
this.gv_fstaffid.Tag = "query_a.fstaffid";
this.gv_fstaffid.Visible = true;
- this.gv_fstaffid.VisibleIndex = 8;
- this.gv_fstaffid.Width = 50;
+ this.gv_fstaffid.VisibleIndex = 7;
+ this.gv_fstaffid.Width = 100;
//
// lb_lxr
//
@@ -204,14 +206,14 @@
this.gv_lxr.OptionsColumn.AllowEdit = false;
this.gv_lxr.Tag = "query_a.lxr";
this.gv_lxr.Visible = true;
- this.gv_lxr.VisibleIndex = 6;
- this.gv_lxr.Width = 52;
+ this.gv_lxr.VisibleIndex = 5;
+ this.gv_lxr.Width = 50;
//
// lb_lotFlag
//
this.lb_lotFlag.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_lotFlag.Appearance.Options.UseFont = true;
- this.lb_lotFlag.Location = new System.Drawing.Point(534, 195);
+ this.lb_lotFlag.Location = new System.Drawing.Point(534, 160);
this.lb_lotFlag.Name = "lb_lotFlag";
this.lb_lotFlag.Size = new System.Drawing.Size(172, 21);
this.lb_lotFlag.TabIndex = 280;
@@ -219,7 +221,7 @@
//
// txt_lotFlag
//
- this.txt_lotFlag.Location = new System.Drawing.Point(717, 191);
+ this.txt_lotFlag.Location = new System.Drawing.Point(717, 156);
this.txt_lotFlag.Name = "txt_lotFlag";
this.txt_lotFlag.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_lotFlag.Properties.Appearance.Options.UseFont = true;
@@ -230,7 +232,7 @@
//
this.lb_itemC.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_itemC.Appearance.Options.UseFont = true;
- this.lb_itemC.Location = new System.Drawing.Point(534, 157);
+ this.lb_itemC.Location = new System.Drawing.Point(534, 122);
this.lb_itemC.Name = "lb_itemC";
this.lb_itemC.Size = new System.Drawing.Size(172, 21);
this.lb_itemC.TabIndex = 267;
@@ -238,7 +240,7 @@
//
// txt_itemC
//
- this.txt_itemC.Location = new System.Drawing.Point(717, 153);
+ this.txt_itemC.Location = new System.Drawing.Point(717, 122);
this.txt_itemC.Name = "txt_itemC";
this.txt_itemC.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemC.Properties.Appearance.Options.UseFont = true;
@@ -249,7 +251,7 @@
//
this.lb_fscode.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_fscode.Appearance.Options.UseFont = true;
- this.lb_fscode.Location = new System.Drawing.Point(568, 121);
+ this.lb_fscode.Location = new System.Drawing.Point(568, 86);
this.lb_fscode.Name = "lb_fscode";
this.lb_fscode.Size = new System.Drawing.Size(138, 21);
this.lb_fscode.TabIndex = 252;
@@ -257,7 +259,7 @@
//
// txt_fscode
//
- this.txt_fscode.Location = new System.Drawing.Point(717, 117);
+ this.txt_fscode.Location = new System.Drawing.Point(717, 82);
this.txt_fscode.Name = "txt_fscode";
this.txt_fscode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_fscode.Properties.Appearance.Options.UseFont = true;
@@ -268,7 +270,7 @@
//
this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_remark.Appearance.Options.UseFont = true;
- this.lb_remark.Location = new System.Drawing.Point(579, 86);
+ this.lb_remark.Location = new System.Drawing.Point(71, 198);
this.lb_remark.Name = "lb_remark";
this.lb_remark.Size = new System.Drawing.Size(39, 21);
this.lb_remark.TabIndex = 247;
@@ -276,11 +278,11 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(629, 82);
+ this.txt_remark.Location = new System.Drawing.Point(124, 194);
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(150, 28);
+ this.txt_remark.Size = new System.Drawing.Size(385, 28);
this.txt_remark.TabIndex = 247;
//
// gv_remark
@@ -289,13 +291,13 @@
this.gv_remark.AppearanceCell.Options.UseFont = true;
this.gv_remark.Caption = "澶囨敞";
this.gv_remark.FieldName = "remark";
- this.gv_remark.MinWidth = 50;
+ this.gv_remark.MinWidth = 100;
this.gv_remark.Name = "gv_remark";
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 7;
- this.gv_remark.Width = 50;
+ this.gv_remark.VisibleIndex = 9;
+ this.gv_remark.Width = 100;
//
// gv_createDate
//
@@ -308,8 +310,8 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 11;
- this.gv_createDate.Width = 200;
+ this.gv_createDate.VisibleIndex = 13;
+ this.gv_createDate.Width = 130;
//
// gv_createBy
//
@@ -317,19 +319,19 @@
this.gv_createBy.AppearanceCell.Options.UseFont = true;
this.gv_createBy.Caption = "鍒涘缓浜�";
this.gv_createBy.FieldName = "createBy";
- this.gv_createBy.MinWidth = 50;
+ this.gv_createBy.MinWidth = 100;
this.gv_createBy.Name = "gv_createBy";
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 10;
- this.gv_createBy.Width = 50;
+ this.gv_createBy.VisibleIndex = 12;
+ this.gv_createBy.Width = 100;
//
// lb_telfx
//
this.lb_telfx.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_telfx.Appearance.Options.UseFont = true;
- this.lb_telfx.Location = new System.Drawing.Point(306, 118);
+ this.lb_telfx.Location = new System.Drawing.Point(306, 122);
this.lb_telfx.Name = "lb_telfx";
this.lb_telfx.Size = new System.Drawing.Size(39, 21);
this.lb_telfx.TabIndex = 228;
@@ -337,7 +339,7 @@
//
// txt_telfx
//
- this.txt_telfx.Location = new System.Drawing.Point(359, 114);
+ this.txt_telfx.Location = new System.Drawing.Point(359, 122);
this.txt_telfx.Name = "txt_telfx";
this.txt_telfx.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_telfx.Properties.Appearance.Options.UseFont = true;
@@ -369,19 +371,19 @@
this.gv_telf1.AppearanceCell.Options.UseFont = true;
this.gv_telf1.Caption = "鐢佃瘽";
this.gv_telf1.FieldName = "telf1";
- this.gv_telf1.MinWidth = 50;
+ this.gv_telf1.MinWidth = 100;
this.gv_telf1.Name = "gv_telf1";
this.gv_telf1.OptionsColumn.AllowEdit = false;
this.gv_telf1.Tag = "query_a.telf1";
this.gv_telf1.Visible = true;
- this.gv_telf1.VisibleIndex = 5;
- this.gv_telf1.Width = 66;
+ this.gv_telf1.VisibleIndex = 6;
+ this.gv_telf1.Width = 100;
//
// lb_stras
//
this.lb_stras.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.lb_stras.Appearance.Options.UseFont = true;
- this.lb_stras.Location = new System.Drawing.Point(306, 154);
+ this.lb_stras.Location = new System.Drawing.Point(306, 160);
this.lb_stras.Name = "lb_stras";
this.lb_stras.Size = new System.Drawing.Size(39, 21);
this.lb_stras.TabIndex = 222;
@@ -389,7 +391,7 @@
//
// txt_stras
//
- this.txt_stras.Location = new System.Drawing.Point(359, 150);
+ this.txt_stras.Location = new System.Drawing.Point(359, 156);
this.txt_stras.Name = "txt_stras";
this.txt_stras.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_stras.Properties.Appearance.Options.UseFont = true;
@@ -402,13 +404,13 @@
this.gv_stras.AppearanceCell.Options.UseFont = true;
this.gv_stras.Caption = "鍦板潃";
this.gv_stras.FieldName = "stras";
- this.gv_stras.MinWidth = 50;
+ this.gv_stras.MinWidth = 100;
this.gv_stras.Name = "gv_stras";
this.gv_stras.OptionsColumn.AllowEdit = false;
this.gv_stras.Tag = "query_a.stras";
this.gv_stras.Visible = true;
- this.gv_stras.VisibleIndex = 4;
- this.gv_stras.Width = 66;
+ this.gv_stras.VisibleIndex = 11;
+ this.gv_stras.Width = 100;
//
// lb_land1
//
@@ -435,13 +437,13 @@
this.gv_land1.AppearanceCell.Options.UseFont = true;
this.gv_land1.Caption = "鍦板尯";
this.gv_land1.FieldName = "land1";
- this.gv_land1.MinWidth = 50;
+ this.gv_land1.MinWidth = 100;
this.gv_land1.Name = "gv_land1";
this.gv_land1.OptionsColumn.AllowEdit = false;
this.gv_land1.Tag = "query_a.land1";
this.gv_land1.Visible = true;
- this.gv_land1.VisibleIndex = 3;
- this.gv_land1.Width = 66;
+ this.gv_land1.VisibleIndex = 10;
+ this.gv_land1.Width = 100;
//
// lb_suppSname
//
@@ -483,7 +485,7 @@
this.gv_suppName.OptionsColumn.AllowEdit = false;
this.gv_suppName.Tag = "query_a.supp_name";
this.gv_suppName.Visible = true;
- this.gv_suppName.VisibleIndex = 2;
+ this.gv_suppName.VisibleIndex = 3;
this.gv_suppName.Width = 220;
//
// lb_suppNo
@@ -511,13 +513,13 @@
this.gv_suppNo.AppearanceCell.Options.UseFont = true;
this.gv_suppNo.Caption = "渚涘簲鍟嗙紪鐮�";
this.gv_suppNo.FieldName = "suppNo";
- this.gv_suppNo.MinWidth = 50;
+ this.gv_suppNo.MinWidth = 80;
this.gv_suppNo.Name = "gv_suppNo";
this.gv_suppNo.OptionsColumn.AllowEdit = false;
this.gv_suppNo.Tag = "query_a.supp_no";
this.gv_suppNo.Visible = true;
- this.gv_suppNo.VisibleIndex = 1;
- this.gv_suppNo.Width = 69;
+ this.gv_suppNo.VisibleIndex = 2;
+ this.gv_suppNo.Width = 80;
//
// lb_id
//
@@ -544,13 +546,13 @@
this.gv_id.AppearanceCell.Options.UseFont = true;
this.gv_id.Caption = "渚涘簲鍟咺D";
this.gv_id.FieldName = "id";
- this.gv_id.MinWidth = 50;
+ this.gv_id.MinWidth = 60;
this.gv_id.Name = "gv_id";
this.gv_id.OptionsColumn.AllowEdit = false;
this.gv_id.Tag = "query_a.id";
this.gv_id.Visible = true;
- this.gv_id.VisibleIndex = 0;
- this.gv_id.Width = 69;
+ this.gv_id.VisibleIndex = 1;
+ this.gv_id.Width = 60;
//
// toolBarMenu1
//
@@ -583,16 +585,18 @@
this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn2,
this.gv_id,
this.gv_suppNo,
this.gv_suppName,
- this.gv_land1,
- this.gv_stras,
- this.gv_telf1,
- this.gv_remark,
+ this.gridColumn1,
this.gv_lxr,
+ this.gv_telf1,
this.gv_fstaffid,
this.gv_fforbidstatus,
+ this.gv_remark,
+ this.gv_land1,
+ this.gv_stras,
this.gv_createBy,
this.gv_createDate});
this.gridView1.GridControl = this.gcMain;
@@ -601,6 +605,27 @@
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "浣跨敤缁勭粐ID鍚嶇О";
+ this.gridColumn2.FieldName = "fSubsidiary";
+ this.gridColumn2.MinWidth = 250;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.OptionsColumn.AllowEdit = false;
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 0;
+ this.gridColumn2.Width = 250;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "渚涘簲鍟嗙畝绉�";
+ this.gridColumn1.FieldName = "suppSname";
+ this.gridColumn1.MinWidth = 100;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 4;
+ this.gridColumn1.Width = 100;
//
// xtraTabControl1
//
@@ -684,6 +709,16 @@
this.panel1.Size = new System.Drawing.Size(835, 293);
this.panel1.TabIndex = 1;
//
+ // txt_suppName
+ //
+ this.txt_suppName.Location = new System.Drawing.Point(124, 122);
+ this.txt_suppName.Name = "txt_suppName";
+ this.txt_suppName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_suppName.Properties.Appearance.Options.UseFont = true;
+ this.txt_suppName.Size = new System.Drawing.Size(152, 69);
+ this.txt_suppName.TabIndex = 299;
+ this.txt_suppName.Tag = "itemModel";
+ //
// labelControl11
//
this.labelControl11.Location = new System.Drawing.Point(47, 223);
@@ -702,16 +737,6 @@
this.lbGuid.Size = new System.Drawing.Size(0, 21);
this.lbGuid.TabIndex = 1;
this.lbGuid.Visible = false;
- //
- // txt_suppName
- //
- this.txt_suppName.Location = new System.Drawing.Point(124, 121);
- this.txt_suppName.Name = "txt_suppName";
- this.txt_suppName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_suppName.Properties.Appearance.Options.UseFont = true;
- this.txt_suppName.Size = new System.Drawing.Size(152, 69);
- this.txt_suppName.TabIndex = 299;
- this.txt_suppName.Tag = "itemModel";
//
// Frm_Supplier
//
@@ -815,5 +840,7 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_id;
public DevExpress.XtraGrid.Columns.GridColumn gv_suppName;
private DevExpress.XtraEditors.MemoEdit txt_suppName;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
index 2994897..6116484 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.cs
@@ -16,7 +16,6 @@
{
private List<FilterEntity> _filterList = new List<FilterEntity>();
private readonly string _webServiceName = "MesSupplierManager/";
-
public Frm_Supplier()
{
InitializeComponent();
@@ -89,8 +88,10 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1, UtilityHelper.GetPageSize());
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim(), false, 999);
+ else
+ getPageList(1, UtilityHelper.GetPageSize());
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/Resources/download_16x16.png b/DevApp/Gs.DevApp/Resources/download_16x16.png
new file mode 100644
index 0000000..7169f16
--- /dev/null
+++ b/DevApp/Gs.DevApp/Resources/download_16x16.png
Binary files differ
--
Gitblit v1.9.3