From 5c3fe6cff41f2b117986a92d91b410bf19589f30 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 27 三月 2025 12:59:14 +0800
Subject: [PATCH] 调拨
---
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs | 10
DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs | 8
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 21
DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs | 8
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs | 281 ++++++++++---------
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs | 473 +++++++++++++++++----------------
6 files changed, 414 insertions(+), 387 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
index b1d71fa..edccfc7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
@@ -27,14 +27,14 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
@@ -57,6 +57,10 @@
this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -72,6 +76,11 @@
this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
this.txt_status = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_cjName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_ckName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_pbillNo = new DevExpress.XtraEditors.TextEdit();
+ this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -82,6 +91,13 @@
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -110,22 +126,6 @@
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.txt_cjName = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_ckName = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_pbillNo = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage3.SuspendLayout();
@@ -155,6 +155,11 @@
((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_cjName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
@@ -165,6 +170,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -174,24 +186,13 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_cjName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
//
this.toolBarMenu1.chkParameter = null;
this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = null;
this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
@@ -508,6 +509,44 @@
this.gv_remark.VisibleIndex = 15;
this.gv_remark.Width = 94;
//
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "鎶曟枡鍗曞彿";
+ this.gridColumn7.FieldName = "daa014";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 16;
+ this.gridColumn7.Width = 94;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鐢宠鍗曞彿";
+ this.gridColumn8.FieldName = "taskNo";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 17;
+ this.gridColumn8.Width = 94;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "浠撳簱鍚嶇О";
+ this.gridColumn9.FieldName = "ckName";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 18;
+ this.gridColumn9.Width = 94;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "涓婚敭GUID";
+ this.gridColumn10.FieldName = "guid";
+ this.gridColumn10.MinWidth = 25;
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Width = 94;
+ //
// pageBar1
//
this.pageBar1.CurrentPage = 1;
@@ -587,7 +626,7 @@
//
// txt_outType
//
- this.txt_outType.Location = new System.Drawing.Point(360, 61);
+ this.txt_outType.Location = new System.Drawing.Point(360, 76);
this.txt_outType.Name = "txt_outType";
this.txt_outType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_outType.Properties.Appearance.Options.UseFont = true;
@@ -597,7 +636,7 @@
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(89, 93);
+ this.txt_remark.Location = new System.Drawing.Point(89, 108);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
@@ -607,7 +646,7 @@
//
// txt_itemOutNo
//
- this.txt_itemOutNo.Location = new System.Drawing.Point(89, -3);
+ this.txt_itemOutNo.Location = new System.Drawing.Point(89, 12);
this.txt_itemOutNo.Name = "txt_itemOutNo";
this.txt_itemOutNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
@@ -617,7 +656,7 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(631, -3);
+ this.txt_createBy.Location = new System.Drawing.Point(631, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
@@ -627,7 +666,7 @@
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(902, 29);
+ this.txt_checkDate.Location = new System.Drawing.Point(902, 44);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
@@ -637,7 +676,7 @@
//
// txt_taskNo
//
- this.txt_taskNo.Location = new System.Drawing.Point(89, 29);
+ this.txt_taskNo.Location = new System.Drawing.Point(89, 44);
this.txt_taskNo.Name = "txt_taskNo";
this.txt_taskNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_taskNo.Properties.Appearance.Options.UseFont = true;
@@ -647,7 +686,7 @@
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(902, -3);
+ this.txt_checkUser.Location = new System.Drawing.Point(902, 12);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
@@ -657,7 +696,7 @@
//
// txt_workNo
//
- this.txt_workNo.Location = new System.Drawing.Point(902, 93);
+ this.txt_workNo.Location = new System.Drawing.Point(902, 108);
this.txt_workNo.Name = "txt_workNo";
this.txt_workNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_workNo.Properties.Appearance.Options.UseFont = true;
@@ -667,7 +706,7 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(631, 29);
+ this.txt_createDate.Location = new System.Drawing.Point(631, 44);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
@@ -677,12 +716,52 @@
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(825, 61);
+ this.txt_status.Location = new System.Drawing.Point(825, 76);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
this.txt_status.Size = new System.Drawing.Size(268, 24);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 575;
+ //
+ // txt_cjName
+ //
+ this.txt_cjName.Location = new System.Drawing.Point(360, 12);
+ this.txt_cjName.Name = "txt_cjName";
+ this.txt_cjName.Size = new System.Drawing.Size(190, 24);
+ this.txt_cjName.StyleController = this.layoutMx1;
+ this.txt_cjName.TabIndex = 576;
+ //
+ // txt_ckName
+ //
+ this.txt_ckName.Location = new System.Drawing.Point(360, 44);
+ this.txt_ckName.Name = "txt_ckName";
+ this.txt_ckName.Size = new System.Drawing.Size(190, 24);
+ this.txt_ckName.StyleController = this.layoutMx1;
+ this.txt_ckName.TabIndex = 577;
+ //
+ // txt_pbillNo
+ //
+ this.txt_pbillNo.Location = new System.Drawing.Point(631, 76);
+ this.txt_pbillNo.Name = "txt_pbillNo";
+ this.txt_pbillNo.Size = new System.Drawing.Size(190, 24);
+ this.txt_pbillNo.StyleController = this.layoutMx1;
+ this.txt_pbillNo.TabIndex = 578;
+ //
+ // txt_daa014
+ //
+ this.txt_daa014.Location = new System.Drawing.Point(631, 108);
+ this.txt_daa014.Name = "txt_daa014";
+ this.txt_daa014.Size = new System.Drawing.Size(190, 24);
+ this.txt_daa014.StyleController = this.layoutMx1;
+ this.txt_daa014.TabIndex = 579;
+ //
+ // txt_itemName
+ //
+ this.txt_itemName.Location = new System.Drawing.Point(89, 76);
+ this.txt_itemName.Name = "txt_itemName";
+ this.txt_itemName.Size = new System.Drawing.Size(190, 24);
+ this.txt_itemName.StyleController = this.layoutMx1;
+ this.txt_itemName.TabIndex = 580;
//
// layoutControlItem13
//
@@ -718,32 +797,32 @@
this.layoutControlItem16});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5,
- rowDefinition6,
- rowDefinition7,
- rowDefinition8});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
this.Root.Size = new System.Drawing.Size(1105, 148);
this.Root.TextVisible = false;
//
@@ -832,6 +911,80 @@
this.layoutControlItem11.Text = "澶囨敞淇℃伅";
this.layoutControlItem11.TextSize = new System.Drawing.Size(65, 18);
//
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_cjName;
+ this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem2.Text = "杞﹂棿鍚嶇О";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_ckName;
+ this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem6.Text = "浠撳簱鍚嶇О";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_pbillNo;
+ this.layoutControlItem14.Location = new System.Drawing.Point(542, 64);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem14.Text = "宸ュ崟鍗曞彿";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_daa014;
+ this.layoutControlItem15.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem15.Text = "鎶曟枡鍗曞彿";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_workNo;
+ this.layoutControlItem5.Location = new System.Drawing.Point(813, 96);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem5.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem5.Text = "浠诲姟鍗曞彿";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_taskNo;
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem9.Text = "鐢宠鍗曞彿";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_itemName;
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem16.Text = "浜у搧鍚嶇О";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(65, 18);
+ //
// tabMx
//
this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -864,6 +1017,8 @@
//
// gvMx1
//
+ this.gvMx1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx1.Appearance.Row.Options.UseFont = true;
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx1guid,
this.gvMx1workNo,
@@ -1037,6 +1192,8 @@
//
// gvMx2
//
+ this.gvMx2.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gvMx2.Appearance.Row.Options.UseFont = true;
this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gvMx2itemBarcode,
this.gvMx2itemNo,
@@ -1175,158 +1332,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn7
- //
- this.gridColumn7.Caption = "鎶曟枡鍗曞彿";
- this.gridColumn7.FieldName = "daa014";
- this.gridColumn7.MinWidth = 25;
- this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 16;
- this.gridColumn7.Width = 94;
- //
- // gridColumn8
- //
- this.gridColumn8.Caption = "鐢宠鍗曞彿";
- this.gridColumn8.FieldName = "taskNo";
- this.gridColumn8.MinWidth = 25;
- this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 17;
- this.gridColumn8.Width = 94;
- //
- // gridColumn9
- //
- this.gridColumn9.Caption = "浠撳簱鍚嶇О";
- this.gridColumn9.FieldName = "ckName";
- this.gridColumn9.MinWidth = 25;
- this.gridColumn9.Name = "gridColumn9";
- this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 18;
- this.gridColumn9.Width = 94;
- //
- // txt_cjName
- //
- this.txt_cjName.Location = new System.Drawing.Point(360, -3);
- this.txt_cjName.Name = "txt_cjName";
- this.txt_cjName.Size = new System.Drawing.Size(190, 24);
- this.txt_cjName.StyleController = this.layoutMx1;
- this.txt_cjName.TabIndex = 576;
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_cjName;
- this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem2.Text = "杞﹂棿鍚嶇О";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
- //
- // txt_ckName
- //
- this.txt_ckName.Location = new System.Drawing.Point(360, 29);
- this.txt_ckName.Name = "txt_ckName";
- this.txt_ckName.Size = new System.Drawing.Size(190, 24);
- this.txt_ckName.StyleController = this.layoutMx1;
- this.txt_ckName.TabIndex = 577;
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_ckName;
- this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem6.Text = "浠撳簱鍚嶇О";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(65, 18);
- //
- // txt_pbillNo
- //
- this.txt_pbillNo.Location = new System.Drawing.Point(631, 61);
- this.txt_pbillNo.Name = "txt_pbillNo";
- this.txt_pbillNo.Size = new System.Drawing.Size(190, 24);
- this.txt_pbillNo.StyleController = this.layoutMx1;
- this.txt_pbillNo.TabIndex = 578;
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_pbillNo;
- this.layoutControlItem14.Location = new System.Drawing.Point(542, 64);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem14.Text = "宸ュ崟鍗曞彿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(65, 18);
- //
- // txt_daa014
- //
- this.txt_daa014.Location = new System.Drawing.Point(631, 93);
- this.txt_daa014.Name = "txt_daa014";
- this.txt_daa014.Size = new System.Drawing.Size(190, 24);
- this.txt_daa014.StyleController = this.layoutMx1;
- this.txt_daa014.TabIndex = 579;
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_daa014;
- this.layoutControlItem15.Location = new System.Drawing.Point(542, 96);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem15.Text = "鎶曟枡鍗曞彿";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.txt_workNo;
- this.layoutControlItem5.Location = new System.Drawing.Point(813, 96);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem5.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem5.Text = "浠诲姟鍗曞彿";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_taskNo;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 32);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem9.Text = "鐢宠鍗曞彿";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(65, 18);
- //
- // txt_itemName
- //
- this.txt_itemName.Location = new System.Drawing.Point(89, 61);
- this.txt_itemName.Name = "txt_itemName";
- this.txt_itemName.Size = new System.Drawing.Size(190, 24);
- this.txt_itemName.StyleController = this.layoutMx1;
- this.txt_itemName.TabIndex = 580;
- //
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_itemName;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 64);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem16.Text = "浜у搧鍚嶇О";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(65, 18);
- //
- // gridColumn10
- //
- this.gridColumn10.Caption = "涓婚敭GUID";
- this.gridColumn10.FieldName = "guid";
- this.gridColumn10.MinWidth = 25;
- this.gridColumn10.Name = "gridColumn10";
- this.gridColumn10.Width = 94;
- //
// UcBlclDj
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1365,6 +1370,11 @@
((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_cjName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
@@ -1375,6 +1385,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1384,18 +1401,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_cjName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
index bb35ae8..096c0cd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
@@ -87,10 +87,16 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
+ Form parentForm;
+ if (this.Parent is Form)
+ parentForm = this.Parent as Form;
+ else
+ parentForm = this.Parent.Parent as Form;
+
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -240,6 +246,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
@@ -257,6 +264,7 @@
gcMx2.DataSource = dt1;
gcMx2.ForceInitialize();
gvMx2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
}
else
{
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
index 2c6a1dd..1823db3 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlcl.cs
@@ -128,10 +128,16 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
+ Form parentForm;
+ if (this.Parent is Form)
+ parentForm = this.Parent as Form;
+ else
+ parentForm = this.Parent.Parent as Form;
+
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs b/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs
index 3cef24d..e8d9f49 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/WwBlclDj.cs
@@ -88,10 +88,16 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
+ Form parentForm;
+ if (this.Parent is Form)
+ parentForm = this.Parent as Form;
+ else
+ parentForm = this.Parent.Parent as Form;
+
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, parentForm.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
index 148486c..42f55ca 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -87,7 +87,7 @@
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
- this.gcMain = new DevExpress.XtraGrid.GridControl();
+ this.gcMain1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_isWc = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_shState = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -118,6 +118,7 @@
this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn50 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -130,16 +131,17 @@
this.txt_fOwnerTypeIdHead = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_fBusinessType = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_fTransferDirect = new DevExpress.XtraEditors.ComboBoxEdit();
- this.txt_fCreatorId = new DevExpress.XtraEditors.TextEdit();
+ this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
this.txt_fBillNo = new DevExpress.XtraEditors.TextEdit();
this.txt_ftranstype = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_fapporgid = new Gs.DevApp.UserControl.UcLookOrg();
this.txt_fBillTypeID = new DevExpress.XtraEditors.ComboBoxEdit();
- this.txt_fapproveby = new DevExpress.XtraEditors.TextEdit();
+ this.txt_chkBy = new DevExpress.XtraEditors.TextEdit();
this.txt_fapprovedate = new DevExpress.XtraEditors.TextEdit();
this.txt_wjStatus = new DevExpress.XtraEditors.CheckEdit();
this.txt_chkStatus = new DevExpress.XtraEditors.CheckEdit();
this.txt_fSrcType = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -153,8 +155,11 @@
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -206,10 +211,6 @@
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -218,7 +219,7 @@
this.split1.Panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
this.split1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
this.xtraTabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
@@ -236,15 +237,16 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fOwnerTypeIdHead.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBusinessType.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fTransferDirect.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fCreatorId.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftranstype.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fapproveby.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_chkBy.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fapprovedate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fSrcType.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -258,8 +260,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -278,10 +283,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -328,7 +329,7 @@
//
// split1.Panel1
//
- this.split1.Panel1.Controls.Add(this.gcMain);
+ this.split1.Panel1.Controls.Add(this.gcMain1);
this.split1.Panel1.Controls.Add(this.pageBar1);
this.split1.Panel1.Text = "Panel1";
//
@@ -339,16 +340,16 @@
this.split1.SplitterPosition = 558;
this.split1.TabIndex = 0;
//
- // gcMain
+ // gcMain1
//
- this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gcMain.Location = new System.Drawing.Point(0, 0);
- this.gcMain.MainView = this.gridView1;
- this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1126, 519);
- this.gcMain.TabIndex = 2;
- this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain1.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Name = "gcMain1";
+ this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+ this.gcMain1.TabIndex = 2;
+ this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
//
// gridView1
@@ -387,8 +388,9 @@
this.gridColumn47,
this.gridColumn48,
this.gridColumn49,
- this.gridColumn50});
- this.gridView1.GridControl = this.gcMain;
+ this.gridColumn50,
+ this.gv_id});
+ this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -523,8 +525,6 @@
this.gridColumn33.FieldName = "fCreatorId";
this.gridColumn33.MinWidth = 25;
this.gridColumn33.Name = "gridColumn33";
- this.gridColumn33.Visible = true;
- this.gridColumn33.VisibleIndex = 11;
this.gridColumn33.Width = 94;
//
// gridColumn34
@@ -534,7 +534,7 @@
this.gridColumn34.MinWidth = 25;
this.gridColumn34.Name = "gridColumn34";
this.gridColumn34.Visible = true;
- this.gridColumn34.VisibleIndex = 12;
+ this.gridColumn34.VisibleIndex = 11;
this.gridColumn34.Width = 94;
//
// gridColumn35
@@ -543,8 +543,6 @@
this.gridColumn35.FieldName = "fModifierId";
this.gridColumn35.MinWidth = 25;
this.gridColumn35.Name = "gridColumn35";
- this.gridColumn35.Visible = true;
- this.gridColumn35.VisibleIndex = 13;
this.gridColumn35.Width = 94;
//
// gridColumn36
@@ -554,7 +552,7 @@
this.gridColumn36.MinWidth = 25;
this.gridColumn36.Name = "gridColumn36";
this.gridColumn36.Visible = true;
- this.gridColumn36.VisibleIndex = 14;
+ this.gridColumn36.VisibleIndex = 12;
this.gridColumn36.Width = 94;
//
// gridColumn37
@@ -564,7 +562,7 @@
this.gridColumn37.MinWidth = 25;
this.gridColumn37.Name = "gridColumn37";
this.gridColumn37.Visible = true;
- this.gridColumn37.VisibleIndex = 15;
+ this.gridColumn37.VisibleIndex = 13;
this.gridColumn37.Width = 94;
//
// gridColumn38
@@ -574,7 +572,7 @@
this.gridColumn38.MinWidth = 25;
this.gridColumn38.Name = "gridColumn38";
this.gridColumn38.Visible = true;
- this.gridColumn38.VisibleIndex = 16;
+ this.gridColumn38.VisibleIndex = 14;
this.gridColumn38.Width = 94;
//
// gridColumn39
@@ -584,7 +582,7 @@
this.gridColumn39.MinWidth = 25;
this.gridColumn39.Name = "gridColumn39";
this.gridColumn39.Visible = true;
- this.gridColumn39.VisibleIndex = 17;
+ this.gridColumn39.VisibleIndex = 15;
this.gridColumn39.Width = 94;
//
// gridColumn40
@@ -594,7 +592,7 @@
this.gridColumn40.MinWidth = 25;
this.gridColumn40.Name = "gridColumn40";
this.gridColumn40.Visible = true;
- this.gridColumn40.VisibleIndex = 18;
+ this.gridColumn40.VisibleIndex = 16;
this.gridColumn40.Width = 94;
//
// gridColumn41
@@ -604,7 +602,7 @@
this.gridColumn41.MinWidth = 25;
this.gridColumn41.Name = "gridColumn41";
this.gridColumn41.Visible = true;
- this.gridColumn41.VisibleIndex = 19;
+ this.gridColumn41.VisibleIndex = 17;
this.gridColumn41.Width = 94;
//
// gridColumn42
@@ -613,8 +611,6 @@
this.gridColumn42.FieldNameSortGroup = "fUnwBaseBombb";
this.gridColumn42.MinWidth = 25;
this.gridColumn42.Name = "gridColumn42";
- this.gridColumn42.Visible = true;
- this.gridColumn42.VisibleIndex = 20;
this.gridColumn42.Width = 94;
//
// gridColumn43
@@ -623,8 +619,6 @@
this.gridColumn43.FieldNameSortGroup = "fUnwBaseFxwlbm";
this.gridColumn43.MinWidth = 25;
this.gridColumn43.Name = "gridColumn43";
- this.gridColumn43.Visible = true;
- this.gridColumn43.VisibleIndex = 21;
this.gridColumn43.Width = 94;
//
// gridColumn44
@@ -642,7 +636,7 @@
this.gridColumn45.MinWidth = 25;
this.gridColumn45.Name = "gridColumn45";
this.gridColumn45.Visible = true;
- this.gridColumn45.VisibleIndex = 22;
+ this.gridColumn45.VisibleIndex = 18;
this.gridColumn45.Width = 94;
//
// gridColumn46
@@ -652,7 +646,7 @@
this.gridColumn46.MinWidth = 25;
this.gridColumn46.Name = "gridColumn46";
this.gridColumn46.Visible = true;
- this.gridColumn46.VisibleIndex = 23;
+ this.gridColumn46.VisibleIndex = 19;
this.gridColumn46.Width = 94;
//
// gridColumn47
@@ -662,7 +656,7 @@
this.gridColumn47.MinWidth = 25;
this.gridColumn47.Name = "gridColumn47";
this.gridColumn47.Visible = true;
- this.gridColumn47.VisibleIndex = 24;
+ this.gridColumn47.VisibleIndex = 20;
this.gridColumn47.Width = 94;
//
// gridColumn48
@@ -672,7 +666,7 @@
this.gridColumn48.MinWidth = 25;
this.gridColumn48.Name = "gridColumn48";
this.gridColumn48.Visible = true;
- this.gridColumn48.VisibleIndex = 25;
+ this.gridColumn48.VisibleIndex = 21;
this.gridColumn48.Width = 94;
//
// gridColumn49
@@ -682,7 +676,7 @@
this.gridColumn49.MinWidth = 25;
this.gridColumn49.Name = "gridColumn49";
this.gridColumn49.Visible = true;
- this.gridColumn49.VisibleIndex = 26;
+ this.gridColumn49.VisibleIndex = 22;
this.gridColumn49.Width = 94;
//
// gridColumn50
@@ -692,8 +686,16 @@
this.gridColumn50.MinWidth = 25;
this.gridColumn50.Name = "gridColumn50";
this.gridColumn50.Visible = true;
- this.gridColumn50.VisibleIndex = 27;
+ this.gridColumn50.VisibleIndex = 23;
this.gridColumn50.Width = 94;
+ //
+ // gv_id
+ //
+ this.gv_id.Caption = "涓婚敭Guid";
+ this.gv_id.FieldName = "id";
+ this.gv_id.MinWidth = 25;
+ this.gv_id.Name = "gv_id";
+ this.gv_id.Width = 94;
//
// pageBar1
//
@@ -744,12 +746,12 @@
this.layoutMx1.Controls.Add(this.txt_fOwnerTypeIdHead);
this.layoutMx1.Controls.Add(this.txt_fBusinessType);
this.layoutMx1.Controls.Add(this.txt_fTransferDirect);
- this.layoutMx1.Controls.Add(this.txt_fCreatorId);
+ this.layoutMx1.Controls.Add(this.txt_createBy);
this.layoutMx1.Controls.Add(this.txt_fBillNo);
this.layoutMx1.Controls.Add(this.txt_ftranstype);
this.layoutMx1.Controls.Add(this.txt_fapporgid);
this.layoutMx1.Controls.Add(this.txt_fBillTypeID);
- this.layoutMx1.Controls.Add(this.txt_fapproveby);
+ this.layoutMx1.Controls.Add(this.txt_chkBy);
this.layoutMx1.Controls.Add(this.txt_fapprovedate);
this.layoutMx1.Controls.Add(this.txt_wjStatus);
this.layoutMx1.Controls.Add(this.txt_chkStatus);
@@ -872,16 +874,16 @@
this.txt_fTransferDirect.StyleController = this.layoutMx1;
this.txt_fTransferDirect.TabIndex = 362;
//
- // txt_fCreatorId
+ // txt_createBy
//
- this.txt_fCreatorId.Location = new System.Drawing.Point(656, 12);
- this.txt_fCreatorId.Name = "txt_fCreatorId";
- this.txt_fCreatorId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fCreatorId.Properties.Appearance.Options.UseFont = true;
- this.txt_fCreatorId.Size = new System.Drawing.Size(165, 28);
- this.txt_fCreatorId.StyleController = this.layoutMx1;
- this.txt_fCreatorId.TabIndex = 384;
- this.txt_fCreatorId.Tag = "readonly";
+ this.txt_createBy.Location = new System.Drawing.Point(656, 12);
+ this.txt_createBy.Name = "txt_createBy";
+ this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+ this.txt_createBy.Size = new System.Drawing.Size(165, 28);
+ this.txt_createBy.StyleController = this.layoutMx1;
+ this.txt_createBy.TabIndex = 384;
+ this.txt_createBy.Tag = "readonly";
//
// txt_fBillNo
//
@@ -931,16 +933,16 @@
this.txt_fBillTypeID.StyleController = this.layoutMx1;
this.txt_fBillTypeID.TabIndex = 361;
//
- // txt_fapproveby
+ // txt_chkBy
//
- this.txt_fapproveby.Location = new System.Drawing.Point(927, 12);
- this.txt_fapproveby.Name = "txt_fapproveby";
- this.txt_fapproveby.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
- this.txt_fapproveby.Properties.Appearance.Options.UseFont = true;
- this.txt_fapproveby.Size = new System.Drawing.Size(166, 28);
- this.txt_fapproveby.StyleController = this.layoutMx1;
- this.txt_fapproveby.TabIndex = 258;
- this.txt_fapproveby.Tag = "readonly";
+ this.txt_chkBy.Location = new System.Drawing.Point(927, 12);
+ this.txt_chkBy.Name = "txt_chkBy";
+ this.txt_chkBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.txt_chkBy.Properties.Appearance.Options.UseFont = true;
+ this.txt_chkBy.Size = new System.Drawing.Size(166, 28);
+ this.txt_chkBy.StyleController = this.layoutMx1;
+ this.txt_chkBy.TabIndex = 258;
+ this.txt_chkBy.Tag = "readonly";
//
// txt_fapprovedate
//
@@ -981,6 +983,18 @@
this.txt_fSrcType.StyleController = this.layoutMx1;
this.txt_fSrcType.TabIndex = 390;
this.txt_fSrcType.Tag = "readonly";
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.lbGuid;
+ this.layoutControlItem16.Location = new System.Drawing.Point(828, 111);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem16.Size = new System.Drawing.Size(278, 37);
+ this.layoutControlItem16.Text = "lbGuid";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem16.TextVisible = false;
//
// Root
//
@@ -1059,7 +1073,7 @@
//
// layoutControlItem3
//
- this.layoutControlItem3.Control = this.txt_fCreatorId;
+ this.layoutControlItem3.Control = this.txt_createBy;
this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -1122,7 +1136,7 @@
//
// layoutControlItem9
//
- this.layoutControlItem9.Control = this.txt_fapproveby;
+ this.layoutControlItem9.Control = this.txt_chkBy;
this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -1163,18 +1177,6 @@
this.layoutControlItem14.Text = "璋冨叆璐т富绫诲瀷";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.lbGuid;
- this.layoutControlItem16.Location = new System.Drawing.Point(828, 111);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(278, 37);
- this.layoutControlItem16.Text = "lbGuid";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem16.TextVisible = false;
- //
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_djtype;
@@ -1185,6 +1187,51 @@
this.layoutControlItem19.Size = new System.Drawing.Size(271, 32);
this.layoutControlItem19.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_fRemarks;
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 128);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem15.Text = "鐢宠澶囨敞";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_fSrcType;
+ this.layoutControlItem17.Location = new System.Drawing.Point(542, 96);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem17.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem17.Text = "婧愬崟绫诲瀷";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_chkStatus;
+ this.layoutControlItem12.Location = new System.Drawing.Point(813, 64);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
+ this.layoutControlItem12.Text = "瀹℃牳鐘舵��";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem12.TextVisible = false;
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_wjStatus;
+ this.layoutControlItem11.Location = new System.Drawing.Point(542, 64);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
+ this.layoutControlItem11.Text = "瀹岀粨鏍囪瘑";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem11.TextVisible = false;
//
// tabMx
//
@@ -1780,51 +1827,6 @@
this.layoutControlItem18.Size = new System.Drawing.Size(276, 37);
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_fRemarks;
- this.layoutControlItem15.Location = new System.Drawing.Point(0, 128);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem15.Text = "鐢宠澶囨敞";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_fSrcType;
- this.layoutControlItem17.Location = new System.Drawing.Point(542, 96);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem17.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem17.Text = "婧愬崟绫诲瀷";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_chkStatus;
- this.layoutControlItem12.Location = new System.Drawing.Point(813, 64);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
- this.layoutControlItem12.Text = "瀹℃牳鐘舵��";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem12.TextVisible = false;
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_wjStatus;
- this.layoutControlItem11.Location = new System.Drawing.Point(542, 64);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
- this.layoutControlItem11.Text = "瀹岀粨鏍囪瘑";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem11.TextVisible = false;
- //
// Frm_MesDbck
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1843,7 +1845,7 @@
((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
this.split1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
this.xtraTabPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
@@ -1861,15 +1863,16 @@
((System.ComponentModel.ISupportInitialize)(this.txt_fOwnerTypeIdHead.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBusinessType.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fTransferDirect.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fCreatorId.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ftranstype.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fBillTypeID.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fapproveby.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_chkBy.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fapprovedate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fSrcType.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1883,8 +1886,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1903,10 +1909,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
this.ResumeLayout(false);
}
@@ -1916,7 +1918,7 @@
private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
- private DevExpress.XtraGrid.GridControl gcMain;
+ private DevExpress.XtraGrid.GridControl gcMain1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn gv_isWc;
private DevExpress.XtraGrid.Columns.GridColumn gv_shState;
@@ -1948,7 +1950,7 @@
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraEditors.TextEdit txt_fCreateDate;
- private DevExpress.XtraEditors.TextEdit txt_fCreatorId;
+ private DevExpress.XtraEditors.TextEdit txt_createBy;
private DevExpress.XtraEditors.ComboBoxEdit txt_fOwnerTypeInIdHead;
private DevExpress.XtraEditors.ComboBoxEdit txt_fOwnerTypeIdHead;
private DevExpress.XtraEditors.ComboBoxEdit txt_ftranstype;
@@ -1959,7 +1961,7 @@
private DevExpress.XtraEditors.ComboBoxEdit txt_fBillTypeID;
private DevExpress.XtraEditors.TextEdit txt_fBillNo;
private DevExpress.XtraEditors.TextEdit txt_fapprovedate;
- private DevExpress.XtraEditors.TextEdit txt_fapproveby;
+ private DevExpress.XtraEditors.TextEdit txt_chkBy;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
@@ -2038,5 +2040,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_id;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index 6c7f842..ae2a586 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -34,6 +34,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+
});
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
@@ -127,7 +128,7 @@
{
string rowGuid = "", rowName = "";
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_fBillNo, gridView1, "fBillNo");
+ lbGuid, txt_fBillNo, gridView1, "FBillNo");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -154,7 +155,6 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
getPageList(this.pageBar1.CurrentPage);
}
-
MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
@@ -194,7 +194,7 @@
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "billno");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "FBillNo");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -203,14 +203,13 @@
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
- getModel(lbGuid.Text.Trim());
+ getModel(rowGuid);
}
else
{
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl( splitMx1.Panel1.Controls, true, gvList);
-
}
}
/// <summary>
@@ -226,7 +225,6 @@
gridViews.Add(gvMx1);
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
-
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -402,16 +400,16 @@
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
+ gcMain1.BindingContext = new BindingContext();
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
if (dt.Rows.Count > 0)
{
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
@@ -466,6 +464,7 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
@@ -521,7 +520,7 @@
};
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "fBillNo");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "FBillNo");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
--
Gitblit v1.9.3