From 3f08b93ffba05c8a12d6a013303e372442854f5f Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 22 九月 2025 11:24:40 +0800
Subject: [PATCH] 增加推送报表
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs | 2
DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.Designer.cs | 260 ++++++
DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.resx | 120 +++
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs | 3
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 321 ++++---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs | 23
DevApp/Gs.DevApp/UserControl/SelectMesCgthSqLink.cs | 60 +
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.cs | 150 +++
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 343 ++++----
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 44 +
DevApp/Gs.DevApp/UserControl/ShowLogcs.cs | 25
DevApp/Gs.DevApp/UserControl/SelectMesCgthSqLink.Designer.cs | 47
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 5
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 4
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 3
DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs | 78 -
DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs | 47 +
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs | 249 +++---
DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.Designer.cs | 31
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs | 8
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs | 491 ++++++------
22 files changed, 1,533 insertions(+), 790 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
index c3d6eab..62d0e90 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
@@ -30,25 +30,25 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -147,6 +147,7 @@
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -299,7 +300,8 @@
this.gv_suppId,
this.gv_remark,
this.gridColumn7,
- this.gridColumn11});
+ this.gridColumn11,
+ this.gridColumn14});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -314,7 +316,7 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "org.fnamber";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 0;
+ this.gridColumn1.VisibleIndex = 13;
this.gridColumn1.Width = 250;
//
// gv_status
@@ -560,17 +562,17 @@
// txt_fOwnerIdHead
//
this.txt_fOwnerIdHead.IsReadly = false;
- this.txt_fOwnerIdHead.Location = new System.Drawing.Point(355, 132);
+ this.txt_fOwnerIdHead.Location = new System.Drawing.Point(360, 132);
this.txt_fOwnerIdHead.Name = "txt_fOwnerIdHead";
- this.txt_fOwnerIdHead.Size = new System.Drawing.Size(195, 24);
+ this.txt_fOwnerIdHead.Size = new System.Drawing.Size(200, 24);
this.txt_fOwnerIdHead.TabIndex = 537;
//
// txt_fPurchaseDeptId
//
this.txt_fPurchaseDeptId.IsReadly = false;
- this.txt_fPurchaseDeptId.Location = new System.Drawing.Point(626, 132);
+ this.txt_fPurchaseDeptId.Location = new System.Drawing.Point(636, 132);
this.txt_fPurchaseDeptId.Name = "txt_fPurchaseDeptId";
- this.txt_fPurchaseDeptId.Size = new System.Drawing.Size(195, 24);
+ this.txt_fPurchaseDeptId.Size = new System.Drawing.Size(200, 24);
this.txt_fPurchaseDeptId.TabIndex = 535;
//
// txt_fRequireOrgId
@@ -578,7 +580,7 @@
this.txt_fRequireOrgId.IsReadly = false;
this.txt_fRequireOrgId.Location = new System.Drawing.Point(84, 132);
this.txt_fRequireOrgId.Name = "txt_fRequireOrgId";
- this.txt_fRequireOrgId.Size = new System.Drawing.Size(195, 24);
+ this.txt_fRequireOrgId.Size = new System.Drawing.Size(200, 24);
this.txt_fRequireOrgId.TabIndex = 534;
//
// btnSelect
@@ -605,13 +607,13 @@
this.txt_thOrgId.IsReadly = false;
this.txt_thOrgId.Location = new System.Drawing.Point(84, 40);
this.txt_thOrgId.Name = "txt_thOrgId";
- this.txt_thOrgId.Size = new System.Drawing.Size(195, 24);
+ this.txt_thOrgId.Size = new System.Drawing.Size(200, 24);
this.txt_thOrgId.TabIndex = 526;
//
// txt_returnType
//
this.txt_returnType.EditValue = "-璇烽�夋嫨-";
- this.txt_returnType.Location = new System.Drawing.Point(355, 40);
+ this.txt_returnType.Location = new System.Drawing.Point(360, 40);
this.txt_returnType.Name = "txt_returnType";
this.txt_returnType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -623,7 +625,7 @@
"渚涘簲鍟嗙墿鍝佸彿閿欒",
"閲囪喘鏂欏彿鍙樻洿"});
this.txt_returnType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_returnType.Size = new System.Drawing.Size(195, 24);
+ this.txt_returnType.Size = new System.Drawing.Size(200, 24);
this.txt_returnType.StyleController = this.layoutMx1;
this.txt_returnType.TabIndex = 521;
//
@@ -632,7 +634,7 @@
this.txt_billNo.Location = new System.Drawing.Point(84, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(195, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(200, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
@@ -640,7 +642,7 @@
// txt_returnMethod
//
this.txt_returnMethod.EditValue = "-璇烽�夋嫨-";
- this.txt_returnMethod.Location = new System.Drawing.Point(355, 12);
+ this.txt_returnMethod.Location = new System.Drawing.Point(360, 12);
this.txt_returnMethod.Name = "txt_returnMethod";
this.txt_returnMethod.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -649,35 +651,35 @@
"閫�鏂欒ˉ鏂�",
"閫�鏂欏苟鎵ｆ"});
this.txt_returnMethod.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_returnMethod.Size = new System.Drawing.Size(195, 24);
+ this.txt_returnMethod.Size = new System.Drawing.Size(200, 24);
this.txt_returnMethod.StyleController = this.layoutMx1;
this.txt_returnMethod.TabIndex = 520;
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(897, 40);
+ this.txt_checkDate.Location = new System.Drawing.Point(912, 40);
this.txt_checkDate.Name = "txt_checkDate";
this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
- this.txt_checkDate.Size = new System.Drawing.Size(196, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(202, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 226;
this.txt_checkDate.Tag = "readonly";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(355, 68);
+ this.txt_remark.Location = new System.Drawing.Point(360, 68);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(195, 24);
+ this.txt_remark.Size = new System.Drawing.Size(200, 24);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 252;
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(897, 12);
+ this.txt_checkUser.Location = new System.Drawing.Point(912, 12);
this.txt_checkUser.Name = "txt_checkUser";
this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
- this.txt_checkUser.Size = new System.Drawing.Size(196, 24);
+ this.txt_checkUser.Size = new System.Drawing.Size(202, 24);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 222;
this.txt_checkUser.Tag = "readonly";
@@ -688,53 +690,53 @@
this.txt_suppId.Location = new System.Drawing.Point(84, 68);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(195, 24);
+ this.txt_suppId.Size = new System.Drawing.Size(200, 24);
this.txt_suppId.TabIndex = 259;
//
// txt_isOut
//
- this.txt_isOut.Location = new System.Drawing.Point(554, 68);
+ this.txt_isOut.Location = new System.Drawing.Point(564, 68);
this.txt_isOut.Name = "txt_isOut";
this.txt_isOut.Properties.Caption = "濮斿鏍囪瘑";
- this.txt_isOut.Size = new System.Drawing.Size(267, 24);
+ this.txt_isOut.Size = new System.Drawing.Size(272, 24);
this.txt_isOut.StyleController = this.layoutMx1;
this.txt_isOut.TabIndex = 527;
this.txt_isOut.Tag = "readOnly";
//
// txt_status
//
- this.txt_status.Location = new System.Drawing.Point(825, 68);
+ this.txt_status.Location = new System.Drawing.Point(840, 68);
this.txt_status.Name = "txt_status";
this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_status.Size = new System.Drawing.Size(268, 24);
+ this.txt_status.Size = new System.Drawing.Size(274, 24);
this.txt_status.StyleController = this.layoutMx1;
this.txt_status.TabIndex = 528;
this.txt_status.Tag = "readonly";
//
// txt_isFinish
//
- this.txt_isFinish.Location = new System.Drawing.Point(825, 96);
+ this.txt_isFinish.Location = new System.Drawing.Point(840, 96);
this.txt_isFinish.Name = "txt_isFinish";
this.txt_isFinish.Properties.Caption = "瀹岀粨鏍囪瘑";
- this.txt_isFinish.Size = new System.Drawing.Size(268, 24);
+ this.txt_isFinish.Size = new System.Drawing.Size(274, 24);
this.txt_isFinish.StyleController = this.layoutMx1;
this.txt_isFinish.TabIndex = 529;
this.txt_isFinish.Tag = "readonly";
//
// lastUpdateUser
//
- this.lastUpdateUser.Location = new System.Drawing.Point(626, 12);
+ this.lastUpdateUser.Location = new System.Drawing.Point(636, 12);
this.lastUpdateUser.Name = "lastUpdateUser";
- this.lastUpdateUser.Size = new System.Drawing.Size(195, 24);
+ this.lastUpdateUser.Size = new System.Drawing.Size(200, 24);
this.lastUpdateUser.StyleController = this.layoutMx1;
this.lastUpdateUser.TabIndex = 530;
this.lastUpdateUser.Tag = "readonly";
//
// lastUpdateTime
//
- this.lastUpdateTime.Location = new System.Drawing.Point(626, 40);
+ this.lastUpdateTime.Location = new System.Drawing.Point(636, 40);
this.lastUpdateTime.Name = "lastUpdateTime";
- this.lastUpdateTime.Size = new System.Drawing.Size(195, 24);
+ this.lastUpdateTime.Size = new System.Drawing.Size(200, 24);
this.lastUpdateTime.StyleController = this.layoutMx1;
this.lastUpdateTime.TabIndex = 531;
this.lastUpdateTime.Tag = "readonly";
@@ -749,13 +751,13 @@
//
// txt_fHasLinkRad
//
- this.txt_fHasLinkRad.Location = new System.Drawing.Point(355, 96);
+ this.txt_fHasLinkRad.Location = new System.Drawing.Point(360, 96);
this.txt_fHasLinkRad.Name = "txt_fHasLinkRad";
this.txt_fHasLinkRad.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"),
new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�")});
this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.txt_fHasLinkRad.Size = new System.Drawing.Size(195, 32);
+ this.txt_fHasLinkRad.Size = new System.Drawing.Size(200, 32);
this.txt_fHasLinkRad.StyleController = this.layoutMx1;
this.txt_fHasLinkRad.TabIndex = 533;
//
@@ -807,36 +809,36 @@
this.layoutControlItem8});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 36D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.AutoSize;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9,
+ columnDefinition10,
+ columnDefinition11,
+ columnDefinition12});
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition13.Height = 100D;
+ rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition14.Height = 36D;
+ rowDefinition14.SizeType = System.Windows.Forms.SizeType.AutoSize;
+ rowDefinition15.Height = 100D;
+ rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1105, 168);
+ rowDefinition11,
+ rowDefinition12,
+ rowDefinition13,
+ rowDefinition14,
+ rowDefinition15});
+ this.Root.Size = new System.Drawing.Size(1126, 168);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -844,7 +846,7 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
@@ -854,7 +856,7 @@
this.layoutControlItem2.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem2.Text = "閫夋嫨缁勭粐";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
@@ -862,21 +864,21 @@
//
this.layoutControlItem9.Control = this.txt_checkUser;
this.layoutControlItem9.CustomizationFormText = "瀹℃牳浜哄憳";
- this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_checkDate;
- this.layoutControlItem10.Location = new System.Drawing.Point(813, 28);
+ this.layoutControlItem10.Location = new System.Drawing.Point(828, 28);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
@@ -884,32 +886,32 @@
//
this.layoutControlItem14.Control = this.lastUpdateUser;
this.layoutControlItem14.CustomizationFormText = "鏈�鍚庢洿鏂�";
- this.layoutControlItem14.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem14.Location = new System.Drawing.Point(552, 0);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem14.Text = "鏇存柊浜哄憳";
this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.lastUpdateTime;
- this.layoutControlItem15.Location = new System.Drawing.Point(542, 28);
+ this.layoutControlItem15.Location = new System.Drawing.Point(552, 28);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem15.Text = "鏇存柊鏃堕棿";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_status;
- this.layoutControlItem11.Location = new System.Drawing.Point(813, 56);
+ this.layoutControlItem11.Location = new System.Drawing.Point(828, 56);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(272, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(278, 28);
this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -920,7 +922,7 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem4.Text = "閫変緵搴斿晢";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
@@ -932,7 +934,7 @@
this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(271, 36);
+ this.layoutControlItem16.Size = new System.Drawing.Size(276, 36);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "閫�璐ф槑缁�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -941,11 +943,11 @@
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_isFinish;
- this.layoutControlItem12.Location = new System.Drawing.Point(813, 84);
+ this.layoutControlItem12.Location = new System.Drawing.Point(828, 84);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(272, 36);
+ this.layoutControlItem12.Size = new System.Drawing.Size(278, 36);
this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
@@ -955,11 +957,11 @@
this.layoutControlItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layoutControlItem3.AppearanceItemCaption.Options.UseBackColor = true;
this.layoutControlItem3.Control = this.txt_fHasLinkRad;
- this.layoutControlItem3.Location = new System.Drawing.Point(271, 84);
+ this.layoutControlItem3.Location = new System.Drawing.Point(276, 84);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 36);
+ this.layoutControlItem3.Size = new System.Drawing.Size(276, 36);
this.layoutControlItem3.Text = "婧愬崟绫诲瀷";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
@@ -971,7 +973,7 @@
this.layItem1.Location = new System.Drawing.Point(0, 120);
this.layItem1.Name = "layItem1";
this.layItem1.OptionsTableLayoutItem.RowIndex = 4;
- this.layItem1.Size = new System.Drawing.Size(271, 28);
+ this.layItem1.Size = new System.Drawing.Size(276, 28);
this.layItem1.Text = "闇�姹傜粍缁�";
this.layItem1.TextSize = new System.Drawing.Size(60, 18);
//
@@ -980,11 +982,11 @@
this.layItem4.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layItem4.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem4.Control = this.txt_fOwnerIdHead;
- this.layItem4.Location = new System.Drawing.Point(271, 120);
+ this.layItem4.Location = new System.Drawing.Point(276, 120);
this.layItem4.Name = "layItem4";
this.layItem4.OptionsTableLayoutItem.ColumnIndex = 1;
this.layItem4.OptionsTableLayoutItem.RowIndex = 4;
- this.layItem4.Size = new System.Drawing.Size(271, 28);
+ this.layItem4.Size = new System.Drawing.Size(276, 28);
this.layItem4.Text = "璐т富";
this.layItem4.TextSize = new System.Drawing.Size(60, 18);
//
@@ -993,54 +995,54 @@
this.layItem2.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
this.layItem2.AppearanceItemCaption.Options.UseBackColor = true;
this.layItem2.Control = this.txt_fPurchaseDeptId;
- this.layItem2.Location = new System.Drawing.Point(542, 120);
+ this.layItem2.Location = new System.Drawing.Point(552, 120);
this.layItem2.Name = "layItem2";
this.layItem2.OptionsTableLayoutItem.ColumnIndex = 2;
this.layItem2.OptionsTableLayoutItem.RowIndex = 4;
- this.layItem2.Size = new System.Drawing.Size(271, 28);
+ this.layItem2.Size = new System.Drawing.Size(276, 28);
this.layItem2.Text = "閲囪喘閮ㄩ棬";
this.layItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_returnMethod;
- this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem5.Text = "閫�鏂欐柟寮�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_returnType;
- this.layoutControlItem6.Location = new System.Drawing.Point(271, 28);
+ this.layoutControlItem6.Location = new System.Drawing.Point(276, 28);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem6.Text = "閫�鏂欏師鍥�";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_remark;
- this.layoutControlItem7.Location = new System.Drawing.Point(271, 56);
+ this.layoutControlItem7.Location = new System.Drawing.Point(276, 56);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem7.Text = "鐢宠澶囨敞";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_isOut;
- this.layoutControlItem8.Location = new System.Drawing.Point(542, 56);
+ this.layoutControlItem8.Location = new System.Drawing.Point(552, 56);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(271, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(276, 28);
this.layoutControlItem8.Text = "濮斿鏍囪瘑";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
@@ -1305,16 +1307,16 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 13;
+ this.gvMxDel.VisibleIndex = 15;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1369,9 +1371,9 @@
// rptCk
//
this.rptCk.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptCk.Name = "rptCk";
this.rptCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptCk_ButtonClick);
//
@@ -1382,7 +1384,7 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 14;
+ this.gridColumn12.VisibleIndex = 13;
this.gridColumn12.Width = 94;
//
// gridColumn13
@@ -1392,7 +1394,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 15;
+ this.gridColumn13.VisibleIndex = 14;
this.gridColumn13.Width = 94;
//
// picCheckBox
@@ -1405,6 +1407,16 @@
this.picCheckBox.TabIndex = 8;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.Caption = "瀹岀粨缁撹瘑";
+ this.gridColumn14.FieldName = "txtColor";
+ this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Visible = true;
+ this.gridColumn14.VisibleIndex = 0;
+ this.gridColumn14.Width = 94;
//
// Frm_MesCgthSq
//
@@ -1579,5 +1591,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
index 30cce3a..278e648 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
@@ -52,6 +52,8 @@
var orgId = txt_thOrgId.GetId();
if (string.IsNullOrEmpty(orgId))
return;
+ txt_fRequireOrgId.SetIdOrCode(orgId);
+ txt_fOwnerIdHead.SetIdOrCode(orgId);
txt_suppId.getSuppler(orgId, _ucGys);
txt_fPurchaseDeptId.getSuppler(orgId, _ucBm);
};
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index 90af3a5..d70e1e7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -31,27 +31,27 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesItemQt));
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -166,6 +166,7 @@
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -335,7 +336,8 @@
this.gridColumn15,
this.gridColumn20,
this.gridColumn21,
- this.gridColumn22});
+ this.gridColumn22,
+ this.gridColumn23});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -355,7 +357,7 @@
this.gv_qt015.Tag = "query_a.qt015";
this.gv_qt015.UnboundDataType = typeof(bool);
this.gv_qt015.Visible = true;
- this.gv_qt015.VisibleIndex = 0;
+ this.gv_qt015.VisibleIndex = 1;
this.gv_qt015.Width = 50;
//
// gv_qt014
@@ -381,7 +383,7 @@
this.gv_qtck.OptionsColumn.AllowEdit = false;
this.gv_qtck.Tag = "query_a.qtck";
this.gv_qtck.Visible = true;
- this.gv_qtck.VisibleIndex = 4;
+ this.gv_qtck.VisibleIndex = 5;
this.gv_qtck.Width = 100;
//
// gridColumn3
@@ -402,7 +404,7 @@
this.gv_qt020.OptionsColumn.AllowEdit = false;
this.gv_qt020.Tag = "query_a.qt020";
this.gv_qt020.Visible = true;
- this.gv_qt020.VisibleIndex = 6;
+ this.gv_qt020.VisibleIndex = 7;
this.gv_qt020.Width = 94;
//
// gridColumn4
@@ -412,7 +414,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 12;
+ this.gridColumn4.VisibleIndex = 13;
this.gridColumn4.Width = 94;
//
// gv_qt005
@@ -425,7 +427,7 @@
this.gv_qt005.OptionsColumn.AllowEdit = false;
this.gv_qt005.Tag = "query_a.qt005";
this.gv_qt005.Visible = true;
- this.gv_qt005.VisibleIndex = 7;
+ this.gv_qt005.VisibleIndex = 8;
this.gv_qt005.Width = 94;
//
// gv_qt001
@@ -438,7 +440,7 @@
this.gv_qt001.OptionsColumn.AllowEdit = false;
this.gv_qt001.Tag = "query_a.qt001";
this.gv_qt001.Visible = true;
- this.gv_qt001.VisibleIndex = 8;
+ this.gv_qt001.VisibleIndex = 9;
this.gv_qt001.Width = 180;
//
// gv_qt010
@@ -451,7 +453,7 @@
this.gv_qt010.OptionsColumn.AllowEdit = false;
this.gv_qt010.Tag = "query_a.qt010";
this.gv_qt010.Visible = true;
- this.gv_qt010.VisibleIndex = 9;
+ this.gv_qt010.VisibleIndex = 10;
this.gv_qt010.Width = 94;
//
// gv_qt016
@@ -464,7 +466,7 @@
this.gv_qt016.OptionsColumn.AllowEdit = false;
this.gv_qt016.Tag = "query_a.qt016";
this.gv_qt016.Visible = true;
- this.gv_qt016.VisibleIndex = 10;
+ this.gv_qt016.VisibleIndex = 11;
this.gv_qt016.Width = 94;
//
// gv_qt002
@@ -477,7 +479,7 @@
this.gv_qt002.OptionsColumn.AllowEdit = false;
this.gv_qt002.Tag = "query_a.qt002";
this.gv_qt002.Visible = true;
- this.gv_qt002.VisibleIndex = 11;
+ this.gv_qt002.VisibleIndex = 12;
this.gv_qt002.Width = 94;
//
// gridColumn5
@@ -487,7 +489,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 14;
+ this.gridColumn5.VisibleIndex = 15;
this.gridColumn5.Width = 94;
//
// gridColumn6
@@ -497,7 +499,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 15;
+ this.gridColumn6.VisibleIndex = 16;
this.gridColumn6.Width = 94;
//
// gridColumn13
@@ -509,7 +511,7 @@
this.gridColumn13.OptionsColumn.ReadOnly = true;
this.gridColumn13.Tag = "query_a.qt029";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 3;
+ this.gridColumn13.VisibleIndex = 4;
this.gridColumn13.Width = 94;
//
// gridColumn14
@@ -521,7 +523,7 @@
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Tag = "query_a.qt026";
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 1;
+ this.gridColumn14.VisibleIndex = 2;
this.gridColumn14.Width = 94;
//
// gridColumn15
@@ -533,7 +535,7 @@
this.gridColumn15.OptionsColumn.ReadOnly = true;
this.gridColumn15.Tag = "query_a.qt032";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 2;
+ this.gridColumn15.VisibleIndex = 3;
this.gridColumn15.Width = 94;
//
// gridColumn20
@@ -543,7 +545,7 @@
this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 5;
+ this.gridColumn20.VisibleIndex = 6;
this.gridColumn20.Width = 94;
//
// gridColumn21
@@ -562,7 +564,7 @@
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 13;
+ this.gridColumn22.VisibleIndex = 14;
this.gridColumn22.Width = 94;
//
// pageBar1
@@ -647,10 +649,10 @@
// txt_wwgys
//
this.txt_wwgys.IsReadly = false;
- this.txt_wwgys.Location = new System.Drawing.Point(385, 198);
+ this.txt_wwgys.Location = new System.Drawing.Point(390, 198);
this.txt_wwgys.Margin = new System.Windows.Forms.Padding(0);
this.txt_wwgys.Name = "txt_wwgys";
- this.txt_wwgys.Size = new System.Drawing.Size(165, 24);
+ this.txt_wwgys.Size = new System.Drawing.Size(170, 24);
this.txt_wwgys.TabIndex = 446;
//
// btnCopyXls
@@ -680,7 +682,7 @@
this.ucLookHuoZhu1.Margin = new System.Windows.Forms.Padding(0);
this.ucLookHuoZhu1.Name = "ucLookHuoZhu1";
this.ucLookHuoZhu1.OrgId = null;
- this.ucLookHuoZhu1.Size = new System.Drawing.Size(267, 58);
+ this.ucLookHuoZhu1.Size = new System.Drawing.Size(272, 58);
this.ucLookHuoZhu1.TabIndex = 318;
//
// txt_qt010
@@ -688,24 +690,24 @@
this.txt_qt010.Location = new System.Drawing.Point(114, 136);
this.txt_qt010.Name = "txt_qt010";
this.txt_qt010.Properties.Appearance.Options.UseFont = true;
- this.txt_qt010.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt010.Size = new System.Drawing.Size(170, 24);
this.txt_qt010.StyleController = this.layoutMx1;
this.txt_qt010.TabIndex = 235;
//
// txt_qt009
//
this.txt_qt009.IsReadly = false;
- this.txt_qt009.Location = new System.Drawing.Point(385, 136);
+ this.txt_qt009.Location = new System.Drawing.Point(390, 136);
this.txt_qt009.Name = "txt_qt009";
- this.txt_qt009.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt009.Size = new System.Drawing.Size(170, 24);
this.txt_qt009.TabIndex = 316;
//
// txt_qt013
//
this.txt_qt013.IsReadly = false;
- this.txt_qt013.Location = new System.Drawing.Point(385, 105);
+ this.txt_qt013.Location = new System.Drawing.Point(390, 105);
this.txt_qt013.Name = "txt_qt013";
- this.txt_qt013.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt013.Size = new System.Drawing.Size(170, 24);
this.txt_qt013.TabIndex = 304;
//
// txt_qtck
@@ -713,7 +715,7 @@
this.txt_qtck.Location = new System.Drawing.Point(114, 12);
this.txt_qtck.Name = "txt_qtck";
this.txt_qtck.Properties.Appearance.Options.UseFont = true;
- this.txt_qtck.Size = new System.Drawing.Size(165, 24);
+ this.txt_qtck.Size = new System.Drawing.Size(170, 24);
this.txt_qtck.StyleController = this.layoutMx1;
this.txt_qtck.TabIndex = 211;
this.txt_qtck.Tag = "readonly";
@@ -721,7 +723,7 @@
// txt_qt019
//
this.txt_qt019.EditValue = "鏍囧噯鍏朵粬鍑哄簱鍗�(QTCKD01_SYS)";
- this.txt_qt019.Location = new System.Drawing.Point(385, 12);
+ this.txt_qt019.Location = new System.Drawing.Point(390, 12);
this.txt_qt019.Name = "txt_qt019";
this.txt_qt019.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -732,22 +734,22 @@
"璐圭敤鐗╂枡鍑哄簱(QTCKD04_SYS)",
"搴撳瓨璋冩暣(QTCKD05_SYS)"});
this.txt_qt019.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qt019.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt019.Size = new System.Drawing.Size(170, 24);
this.txt_qt019.StyleController = this.layoutMx1;
this.txt_qt019.TabIndex = 301;
//
// txt_qt024
//
this.txt_qt024.IsReadly = false;
- this.txt_qt024.Location = new System.Drawing.Point(385, 43);
+ this.txt_qt024.Location = new System.Drawing.Point(390, 43);
this.txt_qt024.Name = "txt_qt024";
- this.txt_qt024.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt024.Size = new System.Drawing.Size(170, 24);
this.txt_qt024.TabIndex = 309;
//
// txt_qt020
//
this.txt_qt020.EditValue = "鏅��(GENERAL)";
- this.txt_qt020.Location = new System.Drawing.Point(385, 74);
+ this.txt_qt020.Location = new System.Drawing.Point(390, 74);
this.txt_qt020.Name = "txt_qt020";
this.txt_qt020.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -755,7 +757,7 @@
"鏅��(GENERAL)",
"閫�璐�(RETURN)"});
this.txt_qt020.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qt020.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt020.Size = new System.Drawing.Size(170, 24);
this.txt_qt020.StyleController = this.layoutMx1;
this.txt_qt020.TabIndex = 300;
//
@@ -764,119 +766,119 @@
this.txt_qt023.IsReadly = false;
this.txt_qt023.Location = new System.Drawing.Point(114, 43);
this.txt_qt023.Name = "txt_qt023";
- this.txt_qt023.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt023.Size = new System.Drawing.Size(170, 24);
this.txt_qt023.TabIndex = 307;
//
// txt_qt016
//
- this.txt_qt016.Location = new System.Drawing.Point(927, 12);
+ this.txt_qt016.Location = new System.Drawing.Point(942, 12);
this.txt_qt016.Name = "txt_qt016";
this.txt_qt016.Properties.Appearance.Options.UseFont = true;
- this.txt_qt016.Size = new System.Drawing.Size(166, 24);
+ this.txt_qt016.Size = new System.Drawing.Size(172, 24);
this.txt_qt016.StyleController = this.layoutMx1;
this.txt_qt016.TabIndex = 262;
this.txt_qt016.Tag = "readonly";
//
// txt_qt002
//
- this.txt_qt002.Location = new System.Drawing.Point(927, 43);
+ this.txt_qt002.Location = new System.Drawing.Point(942, 43);
this.txt_qt002.Name = "txt_qt002";
this.txt_qt002.Properties.Appearance.Options.UseFont = true;
- this.txt_qt002.Size = new System.Drawing.Size(166, 24);
+ this.txt_qt002.Size = new System.Drawing.Size(172, 24);
this.txt_qt002.StyleController = this.layoutMx1;
this.txt_qt002.TabIndex = 216;
this.txt_qt002.Tag = "readonly";
//
// txt_qt015
//
- this.txt_qt015.Location = new System.Drawing.Point(825, 74);
+ this.txt_qt015.Location = new System.Drawing.Point(840, 74);
this.txt_qt015.Name = "txt_qt015";
this.txt_qt015.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_qt015.Size = new System.Drawing.Size(268, 24);
+ this.txt_qt015.Size = new System.Drawing.Size(274, 24);
this.txt_qt015.StyleController = this.layoutMx1;
this.txt_qt015.TabIndex = 310;
this.txt_qt015.Tag = "readonly";
//
// txt_qt031
//
- this.txt_qt031.Location = new System.Drawing.Point(927, 105);
+ this.txt_qt031.Location = new System.Drawing.Point(942, 105);
this.txt_qt031.Name = "txt_qt031";
- this.txt_qt031.Size = new System.Drawing.Size(166, 24);
+ this.txt_qt031.Size = new System.Drawing.Size(172, 24);
this.txt_qt031.StyleController = this.layoutMx1;
this.txt_qt031.TabIndex = 321;
this.txt_qt031.Tag = "readonly";
//
// txt_qt030
//
- this.txt_qt030.Location = new System.Drawing.Point(927, 136);
+ this.txt_qt030.Location = new System.Drawing.Point(942, 136);
this.txt_qt030.Name = "txt_qt030";
- this.txt_qt030.Size = new System.Drawing.Size(166, 24);
+ this.txt_qt030.Size = new System.Drawing.Size(172, 24);
this.txt_qt030.StyleController = this.layoutMx1;
this.txt_qt030.TabIndex = 322;
this.txt_qt030.Tag = "readonly";
//
// txt_qt029
//
- this.txt_qt029.Location = new System.Drawing.Point(825, 167);
+ this.txt_qt029.Location = new System.Drawing.Point(840, 167);
this.txt_qt029.Name = "txt_qt029";
this.txt_qt029.Properties.Caption = "璐㈠姟瀹℃牳鐘舵��";
- this.txt_qt029.Size = new System.Drawing.Size(268, 24);
+ this.txt_qt029.Size = new System.Drawing.Size(274, 24);
this.txt_qt029.StyleController = this.layoutMx1;
this.txt_qt029.TabIndex = 323;
this.txt_qt029.Tag = "readonly";
//
// txt_qt028
//
- this.txt_qt028.Location = new System.Drawing.Point(656, 105);
+ this.txt_qt028.Location = new System.Drawing.Point(666, 105);
this.txt_qt028.Name = "txt_qt028";
- this.txt_qt028.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt028.Size = new System.Drawing.Size(170, 24);
this.txt_qt028.StyleController = this.layoutMx1;
this.txt_qt028.TabIndex = 324;
this.txt_qt028.Tag = "readonly";
//
// txt_qt027
//
- this.txt_qt027.Location = new System.Drawing.Point(656, 136);
+ this.txt_qt027.Location = new System.Drawing.Point(666, 136);
this.txt_qt027.Name = "txt_qt027";
- this.txt_qt027.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt027.Size = new System.Drawing.Size(170, 24);
this.txt_qt027.StyleController = this.layoutMx1;
this.txt_qt027.TabIndex = 325;
this.txt_qt027.Tag = "readonly";
//
// txt_qt034
//
- this.txt_qt034.Location = new System.Drawing.Point(656, 12);
+ this.txt_qt034.Location = new System.Drawing.Point(666, 12);
this.txt_qt034.Name = "txt_qt034";
- this.txt_qt034.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt034.Size = new System.Drawing.Size(170, 24);
this.txt_qt034.StyleController = this.layoutMx1;
this.txt_qt034.TabIndex = 326;
this.txt_qt034.Tag = "readonly";
//
// txt_qt026
//
- this.txt_qt026.Location = new System.Drawing.Point(554, 167);
+ this.txt_qt026.Location = new System.Drawing.Point(564, 167);
this.txt_qt026.Name = "txt_qt026";
this.txt_qt026.Properties.Caption = "鍞悗瀹℃牳鏍囪瘑";
- this.txt_qt026.Size = new System.Drawing.Size(267, 24);
+ this.txt_qt026.Size = new System.Drawing.Size(272, 24);
this.txt_qt026.StyleController = this.layoutMx1;
this.txt_qt026.TabIndex = 327;
this.txt_qt026.Tag = "readonly";
//
// txt_qt033
//
- this.txt_qt033.Location = new System.Drawing.Point(656, 43);
+ this.txt_qt033.Location = new System.Drawing.Point(666, 43);
this.txt_qt033.Name = "txt_qt033";
- this.txt_qt033.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt033.Size = new System.Drawing.Size(170, 24);
this.txt_qt033.StyleController = this.layoutMx1;
this.txt_qt033.TabIndex = 328;
this.txt_qt033.Tag = "readonly";
//
// txt_qt032
//
- this.txt_qt032.Location = new System.Drawing.Point(554, 74);
+ this.txt_qt032.Location = new System.Drawing.Point(564, 74);
this.txt_qt032.Name = "txt_qt032";
this.txt_qt032.Properties.Caption = "閲囪喘瀹℃牳鏍囪瘑";
- this.txt_qt032.Size = new System.Drawing.Size(267, 24);
+ this.txt_qt032.Size = new System.Drawing.Size(272, 24);
this.txt_qt032.StyleController = this.layoutMx1;
this.txt_qt032.TabIndex = 329;
this.txt_qt032.Tag = "readonly";
@@ -887,14 +889,14 @@
this.txt_qt035.Name = "txt_qt035";
this.txt_qt035.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton()});
- this.txt_qt035.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt035.Size = new System.Drawing.Size(170, 24);
this.txt_qt035.StyleController = this.layoutMx1;
this.txt_qt035.TabIndex = 330;
//
// txt_qtlx
//
this.txt_qtlx.EditValue = "璇烽�夋嫨";
- this.txt_qtlx.Location = new System.Drawing.Point(385, 167);
+ this.txt_qtlx.Location = new System.Drawing.Point(390, 167);
this.txt_qtlx.Name = "txt_qtlx";
this.txt_qtlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -909,7 +911,7 @@
"7:鏃犳簮鍗曞澶栭��鏂�",
"8:鐩樹簭"});
this.txt_qtlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qtlx.Size = new System.Drawing.Size(165, 24);
+ this.txt_qtlx.Size = new System.Drawing.Size(170, 24);
this.txt_qtlx.StyleController = this.layoutMx1;
this.txt_qtlx.TabIndex = 331;
//
@@ -957,51 +959,51 @@
this.layItemWwgys});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ 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;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition13.Height = 100D;
+ rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition14.Height = 100D;
+ rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6,
- rowDefinition7});
- this.Root.Size = new System.Drawing.Size(1105, 237);
+ rowDefinition8,
+ rowDefinition9,
+ rowDefinition10,
+ rowDefinition11,
+ rowDefinition12,
+ rowDefinition13,
+ rowDefinition14});
+ this.Root.Size = new System.Drawing.Size(1126, 237);
this.Root.TextVisible = false;
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_qt019;
- this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1011,39 +1013,39 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem4.Text = "搴撳瓨缁勭粐";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_qt016;
- this.layoutControlItem6.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem6.Location = new System.Drawing.Point(828, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(278, 31);
this.layoutControlItem6.Text = "瀹℃牳浜哄憳";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_qt002;
- this.layoutControlItem7.Location = new System.Drawing.Point(813, 31);
+ this.layoutControlItem7.Location = new System.Drawing.Point(828, 31);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(278, 31);
this.layoutControlItem7.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_qt015;
- this.layoutControlItem8.Location = new System.Drawing.Point(813, 62);
+ this.layoutControlItem8.Location = new System.Drawing.Point(828, 62);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(278, 31);
this.layoutControlItem8.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
@@ -1055,7 +1057,7 @@
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(271, 62);
+ this.layoutControlItem9.Size = new System.Drawing.Size(276, 62);
this.layoutControlItem9.Text = "璐т富绫诲瀷";
this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem9.TextVisible = false;
@@ -1063,33 +1065,33 @@
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_qt031;
- this.layoutControlItem15.Location = new System.Drawing.Point(813, 93);
+ this.layoutControlItem15.Location = new System.Drawing.Point(828, 93);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(278, 31);
this.layoutControlItem15.Text = "璐㈠姟瀹℃牳浜哄憳";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_qt030;
- this.layoutControlItem16.Location = new System.Drawing.Point(813, 124);
+ this.layoutControlItem16.Location = new System.Drawing.Point(828, 124);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem16.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem16.Size = new System.Drawing.Size(278, 31);
this.layoutControlItem16.Text = "璐㈠姟瀹℃牳鏃堕棿";
this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_qt029;
- this.layoutControlItem17.Location = new System.Drawing.Point(813, 155);
+ this.layoutControlItem17.Location = new System.Drawing.Point(828, 155);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem17.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem17.Size = new System.Drawing.Size(278, 31);
this.layoutControlItem17.Text = "璐㈠姟瀹℃牳鏍囪瘑";
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
@@ -1097,33 +1099,33 @@
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_qt028;
- this.layoutControlItem18.Location = new System.Drawing.Point(542, 93);
+ this.layoutControlItem18.Location = new System.Drawing.Point(552, 93);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem18.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem18.Text = "鍞悗瀹℃牳浜哄憳";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_qt027;
- this.layoutControlItem19.Location = new System.Drawing.Point(542, 124);
+ this.layoutControlItem19.Location = new System.Drawing.Point(552, 124);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem19.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem19.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem19.Text = "鍞悗瀹℃牳鏃堕棿";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_qt026;
- this.layoutControlItem21.Location = new System.Drawing.Point(542, 155);
+ this.layoutControlItem21.Location = new System.Drawing.Point(552, 155);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem21.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem21.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem21.Text = "鍞悗瀹℃牳鏍囪瘑";
this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem21.TextVisible = false;
@@ -1131,54 +1133,54 @@
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_qt034;
- this.layoutControlItem20.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem20.Location = new System.Drawing.Point(552, 0);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem20.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem20.Text = "閲囪喘瀹℃牳浜哄憳";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_qt020;
- this.layoutControlItem3.Location = new System.Drawing.Point(271, 62);
+ this.layoutControlItem3.Location = new System.Drawing.Point(276, 62);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem3.Text = "搴撳瓨鏂瑰悜";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_qt009;
- this.layoutControlItem11.Location = new System.Drawing.Point(271, 124);
+ this.layoutControlItem11.Location = new System.Drawing.Point(276, 124);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem11.Text = "棰嗘枡閮ㄩ棬";
this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_qt033;
- this.layoutControlItem22.Location = new System.Drawing.Point(542, 31);
+ this.layoutControlItem22.Location = new System.Drawing.Point(552, 31);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem22.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem22.Text = "閲囪喘瀹℃牳鏃堕棿";
this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txt_qt032;
- this.layoutControlItem23.Location = new System.Drawing.Point(542, 62);
+ this.layoutControlItem23.Location = new System.Drawing.Point(552, 62);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem23.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem23.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem23.Text = "閲囪喘瀹℃牳鏍囪瘑";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
@@ -1186,22 +1188,22 @@
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_qt013;
- this.layoutControlItem10.Location = new System.Drawing.Point(271, 93);
+ this.layoutControlItem10.Location = new System.Drawing.Point(276, 93);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem10.Text = "瀹㈡埛";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_qt024;
- this.layoutControlItem5.Location = new System.Drawing.Point(271, 31);
+ this.layoutControlItem5.Location = new System.Drawing.Point(276, 31);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem5.Text = "棰嗙敤缁勭粐";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1211,7 +1213,7 @@
this.layoutControlItem13.Location = new System.Drawing.Point(0, 124);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem13.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem13.Text = "鐢宠澶囨敞";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1221,18 +1223,18 @@
this.layoutControlItem24.Location = new System.Drawing.Point(0, 155);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem24.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem24.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem24.Text = "鏉ユ簮鍗曞彿";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_qtlx;
- this.layoutControlItem12.Location = new System.Drawing.Point(271, 155);
+ this.layoutControlItem12.Location = new System.Drawing.Point(276, 155);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem12.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem12.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem12.Text = "鍑哄簱绫诲瀷";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1241,7 +1243,7 @@
this.layoutControlItem1.Control = this.txt_qtck;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem1.Text = "鍗曟嵁缂栧彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1253,7 +1255,7 @@
this.layoutControlItem25.MinSize = new System.Drawing.Size(90, 31);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem25.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem25.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem25.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem25.Text = "蹇嵎褰曞叆";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
@@ -1264,11 +1266,11 @@
this.layItemWwgys.AppearanceItemCaption.ForeColor = System.Drawing.Color.Blue;
this.layItemWwgys.AppearanceItemCaption.Options.UseForeColor = true;
this.layItemWwgys.Control = this.txt_wwgys;
- this.layItemWwgys.Location = new System.Drawing.Point(271, 186);
+ this.layItemWwgys.Location = new System.Drawing.Point(276, 186);
this.layItemWwgys.Name = "layItemWwgys";
this.layItemWwgys.OptionsTableLayoutItem.ColumnIndex = 1;
this.layItemWwgys.OptionsTableLayoutItem.RowIndex = 6;
- this.layItemWwgys.Size = new System.Drawing.Size(271, 31);
+ this.layItemWwgys.Size = new System.Drawing.Size(276, 31);
this.layItemWwgys.Text = "濮斿渚涘簲鍟�";
this.layItemWwgys.TextSize = new System.Drawing.Size(90, 18);
this.layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
@@ -1568,10 +1570,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1602,10 +1604,10 @@
// rptCk
//
this.rptCk.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptCk.Name = "rptCk";
this.rptCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptCk_ButtonClick);
//
@@ -1641,6 +1643,16 @@
this.picCheckBox.TabIndex = 6;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
+ //
+ // gridColumn23
+ //
+ this.gridColumn23.Caption = "瀹岀粨鏍囪瘑";
+ this.gridColumn23.FieldName = "txtColor";
+ this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.Name = "gridColumn23";
+ this.gridColumn23.Visible = true;
+ this.gridColumn23.VisibleIndex = 0;
+ this.gridColumn23.Width = 94;
//
// Frm_MesItemQt
//
@@ -1844,5 +1856,6 @@
private DevExpress.XtraLayout.LayoutControlItem layItemWwgys;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
index 0210f25..3172a4c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Input.cs
@@ -175,7 +175,8 @@
private void getModel()
{
- gcMx1.DataSource = null;
+ //2025-09-20鎵句笉鍒伴敊璇紝鎵�浠ュ厛鎶婅繖涓�琛屾敞閲婅瘯璇�
+ //gcMx1.DataSource = null;
gvMx1.Columns.Clear();
var _obj = new
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index ac5cbc9..3f1fca2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -200,6 +200,7 @@
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -347,7 +348,7 @@
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1260, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1426, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -358,7 +359,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1260, 624);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1426, 624);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -368,7 +369,7 @@
//
this.xtraTabPage1.Controls.Add(this.split1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1258, 592);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1424, 592);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -389,7 +390,7 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1258, 592);
+ this.split1.Size = new System.Drawing.Size(1424, 592);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
@@ -399,7 +400,7 @@
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(1258, 541);
+ this.gcMain1.Size = new System.Drawing.Size(1424, 541);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -685,7 +686,7 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1258, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1424, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
@@ -693,7 +694,7 @@
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1258, 592);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1424, 592);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -713,7 +714,7 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1258, 592);
+ this.splitMx1.Size = new System.Drawing.Size(1424, 592);
this.splitMx1.SplitterPosition = 205;
this.splitMx1.TabIndex = 0;
//
@@ -755,7 +756,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(55, 282, 812, 616);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1258, 205);
+ this.layoutMx1.Size = new System.Drawing.Size(1424, 205);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -783,7 +784,7 @@
this.txt_tbl023.IsReadly = false;
this.txt_tbl023.Location = new System.Drawing.Point(114, 43);
this.txt_tbl023.Name = "txt_tbl023";
- this.txt_tbl023.Size = new System.Drawing.Size(203, 24);
+ this.txt_tbl023.Size = new System.Drawing.Size(239, 24);
this.txt_tbl023.TabIndex = 462;
//
// txt_tbl005
@@ -799,7 +800,7 @@
"鏉ユ枡涓嶈壇閫�鏂�",
"浣滀笟涓嶈壇閫�鏂�"});
this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_tbl005.Size = new System.Drawing.Size(203, 24);
+ this.txt_tbl005.Size = new System.Drawing.Size(239, 24);
this.txt_tbl005.StyleController = this.layoutMx1;
this.txt_tbl005.TabIndex = 459;
//
@@ -808,7 +809,7 @@
this.txt_tbl006.Location = new System.Drawing.Point(114, 136);
this.txt_tbl006.Name = "txt_tbl006";
this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl006.Size = new System.Drawing.Size(203, 24);
+ this.txt_tbl006.Size = new System.Drawing.Size(239, 24);
this.txt_tbl006.StyleController = this.layoutMx1;
this.txt_tbl006.TabIndex = 226;
//
@@ -818,25 +819,25 @@
this.txt_tbl002.IsReadly = false;
this.txt_tbl002.Location = new System.Drawing.Point(114, 74);
this.txt_tbl002.Name = "txt_tbl002";
- this.txt_tbl002.Size = new System.Drawing.Size(203, 24);
+ this.txt_tbl002.Size = new System.Drawing.Size(239, 24);
this.txt_tbl002.TabIndex = 458;
//
// txt_workName
//
- this.txt_workName.Location = new System.Drawing.Point(423, 43);
+ this.txt_workName.Location = new System.Drawing.Point(459, 43);
this.txt_workName.Name = "txt_workName";
this.txt_workName.Properties.Appearance.Options.UseFont = true;
- this.txt_workName.Size = new System.Drawing.Size(203, 24);
+ this.txt_workName.Size = new System.Drawing.Size(240, 24);
this.txt_workName.StyleController = this.layoutMx1;
this.txt_workName.TabIndex = 298;
this.txt_workName.Tag = "readonly";
//
// txt_tbl012
//
- this.txt_tbl012.Location = new System.Drawing.Point(732, 136);
+ this.txt_tbl012.Location = new System.Drawing.Point(805, 136);
this.txt_tbl012.Name = "txt_tbl012";
this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl012.Size = new System.Drawing.Size(203, 24);
+ this.txt_tbl012.Size = new System.Drawing.Size(240, 24);
this.txt_tbl012.StyleController = this.layoutMx1;
this.txt_tbl012.TabIndex = 247;
this.txt_tbl012.Tag = "readonly";
@@ -846,66 +847,66 @@
this.txt_billNo.Location = new System.Drawing.Point(114, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(203, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(239, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
//
// txt_rwd
//
- this.txt_rwd.Location = new System.Drawing.Point(423, 12);
+ this.txt_rwd.Location = new System.Drawing.Point(459, 12);
this.txt_rwd.Name = "txt_rwd";
this.txt_rwd.Properties.Appearance.Options.UseFont = true;
- this.txt_rwd.Size = new System.Drawing.Size(203, 24);
+ this.txt_rwd.Size = new System.Drawing.Size(240, 24);
this.txt_rwd.StyleController = this.layoutMx1;
this.txt_rwd.TabIndex = 217;
this.txt_rwd.Tag = "readonly";
//
// txt_tbl011
//
- this.txt_tbl011.Location = new System.Drawing.Point(732, 105);
+ this.txt_tbl011.Location = new System.Drawing.Point(805, 105);
this.txt_tbl011.Name = "txt_tbl011";
this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl011.Size = new System.Drawing.Size(203, 24);
+ this.txt_tbl011.Size = new System.Drawing.Size(240, 24);
this.txt_tbl011.StyleController = this.layoutMx1;
this.txt_tbl011.TabIndex = 243;
this.txt_tbl011.Tag = "readonly";
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(423, 105);
+ this.txt_itemName.Location = new System.Drawing.Point(459, 105);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(203, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(240, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 219;
this.txt_itemName.Tag = "readonly";
//
// txt_tbl013
//
- this.txt_tbl013.Location = new System.Drawing.Point(630, 167);
+ this.txt_tbl013.Location = new System.Drawing.Point(703, 167);
this.txt_tbl013.Name = "txt_tbl013";
this.txt_tbl013.Properties.Caption = "瀹℃牳鐘舵��";
this.txt_tbl013.RightToLeft = System.Windows.Forms.RightToLeft.No;
- this.txt_tbl013.Size = new System.Drawing.Size(305, 24);
+ this.txt_tbl013.Size = new System.Drawing.Size(342, 24);
this.txt_tbl013.StyleController = this.layoutMx1;
this.txt_tbl013.TabIndex = 463;
this.txt_tbl013.Tag = "readonly";
//
// txt_tbl009
//
- this.txt_tbl009.Location = new System.Drawing.Point(732, 12);
+ this.txt_tbl009.Location = new System.Drawing.Point(805, 12);
this.txt_tbl009.Name = "txt_tbl009";
- this.txt_tbl009.Size = new System.Drawing.Size(203, 24);
+ this.txt_tbl009.Size = new System.Drawing.Size(240, 24);
this.txt_tbl009.StyleController = this.layoutMx1;
this.txt_tbl009.TabIndex = 464;
this.txt_tbl009.Tag = "readonly";
//
// txt_tbl010
//
- this.txt_tbl010.Location = new System.Drawing.Point(732, 43);
+ this.txt_tbl010.Location = new System.Drawing.Point(805, 43);
this.txt_tbl010.Name = "txt_tbl010";
- this.txt_tbl010.Size = new System.Drawing.Size(203, 24);
+ this.txt_tbl010.Size = new System.Drawing.Size(240, 24);
this.txt_tbl010.StyleController = this.layoutMx1;
this.txt_tbl010.TabIndex = 465;
this.txt_tbl010.Tag = "readonly";
@@ -922,9 +923,9 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(732, 74);
+ this.txt_itemNo.Location = new System.Drawing.Point(805, 74);
this.txt_itemNo.Name = "txt_itemNo";
- this.txt_itemNo.Size = new System.Drawing.Size(203, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(240, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 467;
this.txt_itemNo.Tag = "readonly";
@@ -940,85 +941,85 @@
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(423, 136);
+ this.txt_daa014.Location = new System.Drawing.Point(459, 136);
this.txt_daa014.Name = "txt_daa014";
- this.txt_daa014.Size = new System.Drawing.Size(203, 24);
+ this.txt_daa014.Size = new System.Drawing.Size(240, 24);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 469;
this.txt_daa014.Tag = "readonly";
//
// txt_tbl026
//
- this.txt_tbl026.Location = new System.Drawing.Point(1041, 105);
+ this.txt_tbl026.Location = new System.Drawing.Point(1151, 105);
this.txt_tbl026.Name = "txt_tbl026";
- this.txt_tbl026.Size = new System.Drawing.Size(205, 24);
+ this.txt_tbl026.Size = new System.Drawing.Size(240, 24);
this.txt_tbl026.StyleController = this.layoutMx1;
this.txt_tbl026.TabIndex = 470;
this.txt_tbl026.Tag = "readonly";
//
// txt_tbl025
//
- this.txt_tbl025.Location = new System.Drawing.Point(1041, 136);
+ this.txt_tbl025.Location = new System.Drawing.Point(1151, 136);
this.txt_tbl025.Name = "txt_tbl025";
- this.txt_tbl025.Size = new System.Drawing.Size(205, 24);
+ this.txt_tbl025.Size = new System.Drawing.Size(240, 24);
this.txt_tbl025.StyleController = this.layoutMx1;
this.txt_tbl025.TabIndex = 471;
this.txt_tbl025.Tag = "readonly";
//
// txt_chkOut
//
- this.txt_chkOut.Location = new System.Drawing.Point(321, 167);
+ this.txt_chkOut.Location = new System.Drawing.Point(357, 167);
this.txt_chkOut.Name = "txt_chkOut";
this.txt_chkOut.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_chkOut.Properties.Appearance.Options.UseForeColor = true;
this.txt_chkOut.Properties.Caption = "鏄惁鑷姩鐢熸垚琛ユ枡鍗�";
- this.txt_chkOut.Size = new System.Drawing.Size(305, 24);
+ this.txt_chkOut.Size = new System.Drawing.Size(342, 24);
this.txt_chkOut.StyleController = this.layoutMx1;
this.txt_chkOut.TabIndex = 472;
//
// checkEdit1
//
- this.checkEdit1.Location = new System.Drawing.Point(939, 167);
+ this.checkEdit1.Location = new System.Drawing.Point(1049, 167);
this.checkEdit1.Name = "checkEdit1";
this.checkEdit1.Properties.Caption = "鎵瑰噯鐘舵��";
- this.checkEdit1.Size = new System.Drawing.Size(307, 24);
+ this.checkEdit1.Size = new System.Drawing.Size(342, 24);
this.checkEdit1.StyleController = this.layoutMx1;
this.checkEdit1.TabIndex = 473;
this.checkEdit1.Tag = "readonly";
//
// txt_tbl028
//
- this.txt_tbl028.Location = new System.Drawing.Point(1041, 43);
+ this.txt_tbl028.Location = new System.Drawing.Point(1151, 43);
this.txt_tbl028.Name = "txt_tbl028";
- this.txt_tbl028.Size = new System.Drawing.Size(205, 24);
+ this.txt_tbl028.Size = new System.Drawing.Size(240, 24);
this.txt_tbl028.StyleController = this.layoutMx1;
this.txt_tbl028.TabIndex = 475;
this.txt_tbl028.Tag = "readonly";
//
// txt_tbl029
//
- this.txt_tbl029.Location = new System.Drawing.Point(1041, 12);
+ this.txt_tbl029.Location = new System.Drawing.Point(1151, 12);
this.txt_tbl029.Name = "txt_tbl029";
- this.txt_tbl029.Size = new System.Drawing.Size(205, 24);
+ this.txt_tbl029.Size = new System.Drawing.Size(240, 24);
this.txt_tbl029.StyleController = this.layoutMx1;
this.txt_tbl029.TabIndex = 476;
this.txt_tbl029.Tag = "readonly";
//
// txt_tbl027
//
- this.txt_tbl027.Location = new System.Drawing.Point(939, 74);
+ this.txt_tbl027.Location = new System.Drawing.Point(1049, 74);
this.txt_tbl027.Name = "txt_tbl027";
this.txt_tbl027.Properties.Caption = "鍝佽川瀹℃牳鐘舵��";
- this.txt_tbl027.Size = new System.Drawing.Size(307, 24);
+ this.txt_tbl027.Size = new System.Drawing.Size(342, 24);
this.txt_tbl027.StyleController = this.layoutMx1;
this.txt_tbl027.TabIndex = 477;
this.txt_tbl027.Tag = "readonly";
//
// txt_line
//
- this.txt_line.Location = new System.Drawing.Point(423, 74);
+ this.txt_line.Location = new System.Drawing.Point(459, 74);
this.txt_line.Name = "txt_line";
- this.txt_line.Size = new System.Drawing.Size(203, 24);
+ this.txt_line.Size = new System.Drawing.Size(240, 24);
this.txt_line.StyleController = this.layoutMx1;
this.txt_line.TabIndex = 478;
this.txt_line.Tag = "readonly";
@@ -1121,27 +1122,27 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1258, 206);
+ this.Root.Size = new System.Drawing.Size(1403, 206);
this.Root.TextVisible = false;
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_tbl009;
- this.layoutControlItem12.Location = new System.Drawing.Point(618, 0);
+ this.layoutControlItem12.Location = new System.Drawing.Point(691, 0);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem12.Size = new System.Drawing.Size(346, 31);
this.layoutControlItem12.Text = "鍒跺崟浜哄憳";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_tbl010;
- this.layoutControlItem13.Location = new System.Drawing.Point(618, 31);
+ this.layoutControlItem13.Location = new System.Drawing.Point(691, 31);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem13.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(346, 31);
this.layoutControlItem13.Text = "鍒跺崟鏃堕棿";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1151,7 +1152,7 @@
this.layoutControlItem5.Location = new System.Drawing.Point(0, 93);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem5.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(345, 31);
this.layoutControlItem5.Text = "閫�鏂欑被鍨�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1161,7 +1162,7 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem4.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(345, 31);
this.layoutControlItem4.Text = "鐢熶骇宸ュ崟";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1171,18 +1172,18 @@
this.layoutControlItem3.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(345, 31);
this.layoutControlItem3.Text = "鐢熶骇缁勭粐";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_itemNo;
- this.layoutControlItem18.Location = new System.Drawing.Point(618, 62);
+ this.layoutControlItem18.Location = new System.Drawing.Point(691, 62);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem18.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem18.Size = new System.Drawing.Size(346, 31);
this.layoutControlItem18.Text = "浜у搧缂栧彿";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1191,61 +1192,61 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(345, 31);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_workName;
- this.layoutControlItem6.Location = new System.Drawing.Point(309, 31);
+ this.layoutControlItem6.Location = new System.Drawing.Point(345, 31);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(346, 31);
this.layoutControlItem6.Text = "鐢熶骇杞﹂棿";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_rwd;
- this.layoutControlItem2.Location = new System.Drawing.Point(309, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(345, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(346, 31);
this.layoutControlItem2.Text = "浠诲姟鍗曞彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_tbl011;
- this.layoutControlItem9.Location = new System.Drawing.Point(618, 93);
+ this.layoutControlItem9.Location = new System.Drawing.Point(691, 93);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(346, 31);
this.layoutControlItem9.Text = "鍒跺崟瀹℃牳浜哄憳";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_tbl012;
- this.layoutControlItem10.Location = new System.Drawing.Point(618, 124);
+ this.layoutControlItem10.Location = new System.Drawing.Point(691, 124);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem10.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(346, 31);
this.layoutControlItem10.Text = "鍒跺崟瀹℃牳鏃堕棿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_tbl013;
- this.layoutControlItem11.Location = new System.Drawing.Point(618, 155);
+ this.layoutControlItem11.Location = new System.Drawing.Point(691, 155);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem11.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(346, 31);
this.layoutControlItem11.Text = "瀹℃牳鐘舵��";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -1258,7 +1259,7 @@
this.layoutControlItem16.MinSize = new System.Drawing.Size(30, 31);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem16.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem16.Size = new System.Drawing.Size(345, 31);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "閫夊彇鐗╂枡";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -1267,65 +1268,65 @@
// layoutControlItem36
//
this.layoutControlItem36.Control = this.txt_tbl029;
- this.layoutControlItem36.Location = new System.Drawing.Point(927, 0);
+ this.layoutControlItem36.Location = new System.Drawing.Point(1037, 0);
this.layoutControlItem36.Name = "layoutControlItem36";
this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem36.Size = new System.Drawing.Size(311, 31);
+ this.layoutControlItem36.Size = new System.Drawing.Size(346, 31);
this.layoutControlItem36.Text = "鍝佽川瀹℃牳浜哄憳";
this.layoutControlItem36.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem37
//
this.layoutControlItem37.Control = this.txt_tbl028;
- this.layoutControlItem37.Location = new System.Drawing.Point(927, 31);
+ this.layoutControlItem37.Location = new System.Drawing.Point(1037, 31);
this.layoutControlItem37.Name = "layoutControlItem37";
this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem37.Size = new System.Drawing.Size(311, 31);
+ this.layoutControlItem37.Size = new System.Drawing.Size(346, 31);
this.layoutControlItem37.Text = "鍝佽川瀹℃牳鏃堕棿";
this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.txt_tbl027;
- this.layoutControlItem38.Location = new System.Drawing.Point(927, 62);
+ this.layoutControlItem38.Location = new System.Drawing.Point(1037, 62);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem38.Size = new System.Drawing.Size(311, 31);
+ this.layoutControlItem38.Size = new System.Drawing.Size(346, 31);
this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem38.TextVisible = false;
//
// layoutControlItem35
//
this.layoutControlItem35.Control = this.checkEdit1;
- this.layoutControlItem35.Location = new System.Drawing.Point(927, 155);
+ this.layoutControlItem35.Location = new System.Drawing.Point(1037, 155);
this.layoutControlItem35.Name = "layoutControlItem35";
this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem35.Size = new System.Drawing.Size(311, 31);
+ this.layoutControlItem35.Size = new System.Drawing.Size(346, 31);
this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem35.TextVisible = false;
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_tbl025;
- this.layoutControlItem20.Location = new System.Drawing.Point(927, 124);
+ this.layoutControlItem20.Location = new System.Drawing.Point(1037, 124);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem20.Size = new System.Drawing.Size(311, 31);
+ this.layoutControlItem20.Size = new System.Drawing.Size(346, 31);
this.layoutControlItem20.Text = "鎵瑰噯鏃堕棿";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_tbl026;
- this.layoutControlItem19.Location = new System.Drawing.Point(927, 93);
+ this.layoutControlItem19.Location = new System.Drawing.Point(1037, 93);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem19.Size = new System.Drawing.Size(311, 31);
+ this.layoutControlItem19.Size = new System.Drawing.Size(346, 31);
this.layoutControlItem19.Text = "鎵瑰噯浜哄憳";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1335,51 +1336,51 @@
this.layoutControlItem15.Location = new System.Drawing.Point(0, 124);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem15.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(345, 31);
this.layoutControlItem15.Text = "澶囨敞璇存槑";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.txt_chkOut;
- this.layoutControlItem34.Location = new System.Drawing.Point(309, 155);
+ this.layoutControlItem34.Location = new System.Drawing.Point(345, 155);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem34.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem34.Size = new System.Drawing.Size(346, 31);
this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem34.TextVisible = false;
//
// lab_daa014
//
this.lab_daa014.Control = this.txt_daa014;
- this.lab_daa014.Location = new System.Drawing.Point(309, 124);
+ this.lab_daa014.Location = new System.Drawing.Point(345, 124);
this.lab_daa014.Name = "lab_daa014";
this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 1;
this.lab_daa014.OptionsTableLayoutItem.RowIndex = 4;
- this.lab_daa014.Size = new System.Drawing.Size(309, 31);
+ this.lab_daa014.Size = new System.Drawing.Size(346, 31);
this.lab_daa014.Text = "鎶曟枡鍗曞彿";
this.lab_daa014.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_itemName;
- this.layoutControlItem8.Location = new System.Drawing.Point(309, 93);
+ this.layoutControlItem8.Location = new System.Drawing.Point(345, 93);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(346, 31);
this.layoutControlItem8.Text = "浜у搧鍚嶇О";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem39
//
this.layoutControlItem39.Control = this.txt_line;
- this.layoutControlItem39.Location = new System.Drawing.Point(309, 62);
+ this.layoutControlItem39.Location = new System.Drawing.Point(345, 62);
this.layoutControlItem39.Name = "layoutControlItem39";
this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem39.Size = new System.Drawing.Size(309, 31);
+ this.layoutControlItem39.Size = new System.Drawing.Size(346, 31);
this.layoutControlItem39.Text = "鐢熶骇绾垮埆";
this.layoutControlItem39.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1389,7 +1390,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1258, 375);
+ this.tabMx.Size = new System.Drawing.Size(1424, 375);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1399,7 +1400,7 @@
//
this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1256, 343);
+ this.tabMxPage1.Size = new System.Drawing.Size(1422, 343);
this.tabMxPage1.Text = "閫�鏂欐槑缁�";
//
// split99
@@ -1419,7 +1420,7 @@
this.split99.Panel2.Controls.Add(this.gcMx1);
this.split99.Panel2.Text = "Panel2";
this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split99.Size = new System.Drawing.Size(1256, 343);
+ this.split99.Size = new System.Drawing.Size(1422, 343);
this.split99.SplitterPosition = 138;
this.split99.TabIndex = 1;
//
@@ -1443,7 +1444,7 @@
this.lay99.Name = "lay99";
this.lay99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(306, 272, 812, 500);
this.lay99.Root = this.layoutControlGroup1;
- this.lay99.Size = new System.Drawing.Size(1256, 138);
+ this.lay99.Size = new System.Drawing.Size(1422, 138);
this.lay99.TabIndex = 0;
this.lay99.Text = "layoutControl1";
//
@@ -1460,16 +1461,16 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 51);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1062, 51);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(336, 35);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(348, 35);
this.ucBtnPrint1.TabIndex = 478;
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(1032, 12);
+ this.radOut.Location = new System.Drawing.Point(1062, 12);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1478,7 +1479,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(336, 35);
+ this.radOut.Size = new System.Drawing.Size(348, 35);
this.radOut.StyleController = this.lay99;
this.radOut.TabIndex = 477;
//
@@ -1486,11 +1487,11 @@
//
this.dataLayoutControl1.Controls.Add(this.txt_iCount_1);
this.dataLayoutControl1.Controls.Add(this.txt_yuliang_1);
- this.dataLayoutControl1.Location = new System.Drawing.Point(692, 90);
+ this.dataLayoutControl1.Location = new System.Drawing.Point(712, 90);
this.dataLayoutControl1.Name = "dataLayoutControl1";
this.dataLayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 186, 812, 500);
this.dataLayoutControl1.Root = this.layoutControlGroup2;
- this.dataLayoutControl1.Size = new System.Drawing.Size(336, 36);
+ this.dataLayoutControl1.Size = new System.Drawing.Size(346, 36);
this.dataLayoutControl1.TabIndex = 227;
this.dataLayoutControl1.Text = "dataLayoutControl1";
//
@@ -1500,16 +1501,16 @@
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(67, 24);
this.txt_iCount_1.StyleController = this.dataLayoutControl1;
this.txt_iCount_1.TabIndex = 228;
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(277, 2);
this.txt_yuliang_1.Name = "txt_yuliang_1";
this.txt_yuliang_1.Properties.ReadOnly = true;
- this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(67, 24);
this.txt_yuliang_1.StyleController = this.dataLayoutControl1;
this.txt_yuliang_1.TabIndex = 229;
//
@@ -1534,7 +1535,7 @@
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition7});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 36);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(346, 36);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem30
@@ -1542,10 +1543,10 @@
this.layoutControlItem30.Control = this.txt_yuliang_1;
this.layoutControlItem30.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem30.CustomizationFormText = "鎵撳嵃浣欐暟";
- this.layoutControlItem30.Location = new System.Drawing.Point(168, 0);
+ this.layoutControlItem30.Location = new System.Drawing.Point(173, 0);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem30.Size = new System.Drawing.Size(168, 36);
+ this.layoutControlItem30.Size = new System.Drawing.Size(173, 36);
this.layoutControlItem30.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1556,7 +1557,7 @@
this.layoutControlItem29.CustomizationFormText = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem29.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem29.Name = "layoutControlItem29";
- this.layoutControlItem29.Size = new System.Drawing.Size(168, 36);
+ this.layoutControlItem29.Size = new System.Drawing.Size(173, 36);
this.layoutControlItem29.Text = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1566,29 +1567,29 @@
this.txtWlid.Name = "txtWlid";
this.txtWlid.Properties.Appearance.Options.UseFont = true;
this.txtWlid.Properties.ReadOnly = true;
- this.txtWlid.Size = new System.Drawing.Size(234, 24);
+ this.txtWlid.Size = new System.Drawing.Size(244, 24);
this.txtWlid.StyleController = this.lay99;
this.txtWlid.TabIndex = 214;
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(454, 12);
+ this.txtQuantity.Location = new System.Drawing.Point(464, 12);
this.txtQuantity.Name = "txtQuantity";
this.txtQuantity.Properties.Appearance.Options.UseFont = true;
this.txtQuantity.Properties.ReadOnly = true;
- this.txtQuantity.Size = new System.Drawing.Size(234, 24);
+ this.txtQuantity.Size = new System.Drawing.Size(244, 24);
this.txtQuantity.StyleController = this.lay99;
this.txtQuantity.TabIndex = 220;
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(794, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(814, 12);
this.txt_kQty.Name = "txt_kQty";
this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
this.txt_kQty.Properties.Appearance.Options.UseFont = true;
this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
this.txt_kQty.Properties.ReadOnly = true;
- this.txt_kQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(244, 24);
this.txt_kQty.StyleController = this.lay99;
this.txt_kQty.TabIndex = 224;
//
@@ -1598,26 +1599,26 @@
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
- this.txtWlmc.Size = new System.Drawing.Size(234, 24);
+ this.txtWlmc.Size = new System.Drawing.Size(244, 24);
this.txtWlmc.StyleController = this.lay99;
this.txtWlmc.TabIndex = 216;
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(454, 51);
+ this.txt_yQty.Location = new System.Drawing.Point(464, 51);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
- this.txt_yQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(244, 24);
this.txt_yQty.StyleController = this.lay99;
this.txt_yQty.TabIndex = 222;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 51);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(814, 51);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(244, 24);
this.txt_psnQty_1.StyleController = this.lay99;
this.txt_psnQty_1.TabIndex = 226;
//
@@ -1627,7 +1628,7 @@
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
- this.txtWlgg.Size = new System.Drawing.Size(574, 24);
+ this.txtWlgg.Size = new System.Drawing.Size(594, 24);
this.txtWlgg.StyleController = this.lay99;
this.txtWlgg.TabIndex = 218;
//
@@ -1683,7 +1684,7 @@
rowDefinition8,
rowDefinition9,
rowDefinition10});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 138);
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1422, 138);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem22
@@ -1691,10 +1692,10 @@
this.layoutControlItem22.Control = this.txtQuantity;
this.layoutControlItem22.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem22.CustomizationFormText = "鏈鐢宠鎬婚噺";
- this.layoutControlItem22.Location = new System.Drawing.Point(340, 0);
+ this.layoutControlItem22.Location = new System.Drawing.Point(350, 0);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem22.Size = new System.Drawing.Size(350, 39);
this.layoutControlItem22.Text = "鏈鐢宠鎬婚噺";
this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1703,10 +1704,10 @@
this.layoutControlItem23.Control = this.txt_kQty;
this.layoutControlItem23.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem23.CustomizationFormText = "鍙墦鍗版�绘暟";
- this.layoutControlItem23.Location = new System.Drawing.Point(680, 0);
+ this.layoutControlItem23.Location = new System.Drawing.Point(700, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem23.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem23.Size = new System.Drawing.Size(350, 39);
this.layoutControlItem23.Text = "鍙墦鍗版�绘暟";
this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1719,7 +1720,7 @@
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem27.Size = new System.Drawing.Size(680, 40);
+ this.layoutControlItem27.Size = new System.Drawing.Size(700, 40);
this.layoutControlItem27.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1731,7 +1732,7 @@
this.layoutControlItem24.Location = new System.Drawing.Point(0, 39);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem24.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem24.Size = new System.Drawing.Size(350, 39);
this.layoutControlItem24.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1740,11 +1741,11 @@
this.layoutControlItem25.Control = this.txt_yQty;
this.layoutControlItem25.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem25.CustomizationFormText = "宸叉墦鍗版�婚噺";
- this.layoutControlItem25.Location = new System.Drawing.Point(340, 39);
+ this.layoutControlItem25.Location = new System.Drawing.Point(350, 39);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem25.Size = new System.Drawing.Size(350, 39);
this.layoutControlItem25.Text = "宸叉墦鍗版�婚噺";
this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1753,22 +1754,22 @@
this.layoutControlItem26.Control = this.txt_psnQty_1;
this.layoutControlItem26.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem26.CustomizationFormText = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem26.Location = new System.Drawing.Point(680, 39);
+ this.layoutControlItem26.Location = new System.Drawing.Point(700, 39);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem26.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem26.Size = new System.Drawing.Size(350, 39);
this.layoutControlItem26.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.dataLayoutControl1;
- this.layoutControlItem28.Location = new System.Drawing.Point(680, 78);
+ this.layoutControlItem28.Location = new System.Drawing.Point(700, 78);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem28.Size = new System.Drawing.Size(340, 40);
+ this.layoutControlItem28.Size = new System.Drawing.Size(350, 40);
this.layoutControlItem28.Text = "鎵撳嵃寮犳暟";
this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem28.TextVisible = false;
@@ -1776,10 +1777,10 @@
// layoutControlItem31
//
this.layoutControlItem31.Control = this.radOut;
- this.layoutControlItem31.Location = new System.Drawing.Point(1020, 0);
+ this.layoutControlItem31.Location = new System.Drawing.Point(1050, 0);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem31.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem31.Size = new System.Drawing.Size(352, 39);
this.layoutControlItem31.Text = "鑷姩璁＄畻";
this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem31.TextVisible = false;
@@ -1791,18 +1792,18 @@
this.layoutControlItem21.CustomizationFormText = "鐗╂枡缂栫爜";
this.layoutControlItem21.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem21.Size = new System.Drawing.Size(350, 39);
this.layoutControlItem21.Text = "鐗╂枡缂栫爜";
this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem32
//
this.layoutControlItem32.Control = this.ucBtnPrint1;
- this.layoutControlItem32.Location = new System.Drawing.Point(1020, 39);
+ this.layoutControlItem32.Location = new System.Drawing.Point(1050, 39);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem32.Size = new System.Drawing.Size(340, 39);
+ this.layoutControlItem32.Size = new System.Drawing.Size(352, 39);
this.layoutControlItem32.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem32.TextVisible = false;
@@ -1816,7 +1817,7 @@
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
this.rptBl});
- this.gcMx1.Size = new System.Drawing.Size(1256, 193);
+ this.gcMx1.Size = new System.Drawing.Size(1422, 193);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1843,7 +1844,8 @@
this.gridColumn19,
this.gridColumn20,
this.gridColumn22,
- this.gridColumn23});
+ this.gridColumn23,
+ this.gridColumn26});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1913,7 +1915,7 @@
this.gvMx1tld004.Name = "gvMx1tld004";
this.gvMx1tld004.Tag = "query_a.tld004";
this.gvMx1tld004.Visible = true;
- this.gvMx1tld004.VisibleIndex = 3;
+ this.gvMx1tld004.VisibleIndex = 12;
this.gvMx1tld004.Width = 78;
//
// gvMx1tld005
@@ -1929,7 +1931,7 @@
this.gvMx1tld005.Name = "gvMx1tld005";
this.gvMx1tld005.Tag = "yz_quantity_0_edit";
this.gvMx1tld005.Visible = true;
- this.gvMx1tld005.VisibleIndex = 4;
+ this.gvMx1tld005.VisibleIndex = 3;
this.gvMx1tld005.Width = 78;
//
// gridColumn13
@@ -2003,7 +2005,7 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 12;
+ this.gvMxDel.VisibleIndex = 13;
this.gvMxDel.Width = 88;
//
// repositoryItemButtonEdit1
@@ -2029,7 +2031,7 @@
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Tag = "edit";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 5;
+ this.gridColumn18.VisibleIndex = 4;
this.gridColumn18.Width = 80;
//
// gridColumn19
@@ -2045,7 +2047,7 @@
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Tag = "edit";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 6;
+ this.gridColumn19.VisibleIndex = 5;
this.gridColumn19.Width = 100;
//
// rptBl
@@ -2067,8 +2069,6 @@
this.gridColumn20.FieldName = "sqQty";
this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
- this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 13;
this.gridColumn20.Width = 94;
//
// gridColumn22
@@ -2081,8 +2081,6 @@
this.gridColumn22.FieldName = "tQty";
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
- this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 14;
this.gridColumn22.Width = 94;
//
// gridColumn23
@@ -2095,15 +2093,27 @@
this.gridColumn23.FieldName = "bQty";
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
- this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 15;
this.gridColumn23.Width = 94;
+ //
+ // gridColumn26
+ //
+ this.gridColumn26.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn26.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn26.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn26.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn26.Caption = "Mes/Erp搴撳瓨";
+ this.gridColumn26.FieldName = "kcQty";
+ this.gridColumn26.MinWidth = 25;
+ this.gridColumn26.Name = "gridColumn26";
+ this.gridColumn26.Visible = true;
+ this.gridColumn26.VisibleIndex = 6;
+ this.gridColumn26.Width = 94;
//
// xtraTabPage3
//
this.xtraTabPage3.Controls.Add(this.gcMx2);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1256, 343);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1422, 343);
this.xtraTabPage3.Text = "宸叉墦鏉＄爜鏄庣粏";
//
// gcMx2
@@ -2112,7 +2122,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1256, 343);
+ this.gcMx2.Size = new System.Drawing.Size(1422, 343);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2293,7 +2303,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1260, 704);
+ this.ClientSize = new System.Drawing.Size(1426, 704);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
@@ -2577,5 +2587,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index aeb3a92..de2d3c8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -73,6 +73,7 @@
//閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
btnSelect.Click += (s, e) =>
{
+ tabMx.SelectedTabPageIndex = 0;
string _tbl002 = txt_tbl002.GetId();
if (string.IsNullOrEmpty(_tbl002))
{
@@ -106,7 +107,7 @@
gvMx1.CloseEditor();
gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
- gridView1.BestFitColumns();
+ gvMx1.BestFitColumns();
}
catch (Exception ex)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.Designer.cs
index 7905e80..eef924a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/SelectItemTbl.Designer.cs
@@ -44,6 +44,7 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
@@ -79,7 +80,8 @@
this.gridColumn7,
this.gridColumn8,
this.gridColumn3,
- this.gridColumn2});
+ this.gridColumn2,
+ this.gridColumn9});
this.gridView1.GridControl = this.gcMain;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -95,7 +97,7 @@
this.colChkInt.Name = "colChkInt";
this.colChkInt.Visible = true;
this.colChkInt.VisibleIndex = 0;
- this.colChkInt.Width = 94;
+ this.colChkInt.Width = 80;
//
// gv_guid
//
@@ -119,7 +121,7 @@
this.gridColumn1.Tag = "itemId";
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 2;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.Width = 80;
//
// gv_supplierItemCode
//
@@ -158,7 +160,7 @@
this.gridColumn5.OptionsColumn.ReadOnly = true;
this.gridColumn5.Tag = "dab005";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 9;
+ this.gridColumn5.VisibleIndex = 10;
this.gridColumn5.Width = 250;
//
// gridColumn6
@@ -195,7 +197,7 @@
this.gridColumn7.Tag = "ytsl";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 7;
- this.gridColumn7.Width = 94;
+ this.gridColumn7.Width = 80;
//
// gridColumn8
//
@@ -210,7 +212,7 @@
this.gridColumn8.Tag = "ktsl";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 8;
- this.gridColumn8.Width = 94;
+ this.gridColumn8.Width = 57;
//
// gridColumn3
//
@@ -230,7 +232,7 @@
this.gridColumn2.Tag = "dab001";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 1;
- this.gridColumn2.Width = 94;
+ this.gridColumn2.Width = 80;
//
// panelControl1
//
@@ -252,6 +254,20 @@
this.btnIn.Size = new System.Drawing.Size(94, 39);
this.btnIn.TabIndex = 4;
this.btnIn.Text = "纭畾瀵煎叆";
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn9.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn9.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn9.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn9.Caption = "Mes/Erp搴撳瓨";
+ this.gridColumn9.FieldName = "kcQty";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 9;
+ this.gridColumn9.Width = 76;
//
// SelectItemTbl
//
@@ -289,5 +305,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs
index db5aeb0..f3dccd0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/ItemQL.Designer.cs
@@ -68,10 +68,10 @@
this.toolBarMenu1.guidKey = null;
this.toolBarMenu1.isSetBtn = false;
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -79,11 +79,10 @@
// xtraTabControl1
//
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4);
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1});
@@ -91,9 +90,8 @@
// xtraTabPage1
//
this.xtraTabPage1.Controls.Add(this.split1);
- this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -102,7 +100,6 @@
this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
- this.split1.Margin = new System.Windows.Forms.Padding(4);
this.split1.Name = "split1";
//
// split1.Panel1
@@ -115,19 +112,17 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1408, 698);
+ this.split1.Size = new System.Drawing.Size(1126, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
// gcMain1
//
this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
- this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1408, 635);
+ this.gcMain1.Size = new System.Drawing.Size(1126, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -147,9 +142,8 @@
this.gridColumn5,
this.gridColumn6,
this.gridColumn7});
- this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain1;
- this.gridView1.IndicatorWidth = 62;
+ this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -159,143 +153,143 @@
//
this.gridColumn1.Caption = "棰勮寮�宸ユ椂闂�";
this.gridColumn1.FieldName = "mesStartProd";
- this.gridColumn1.MinWidth = 30;
+ this.gridColumn1.MinWidth = 24;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "mes_start_prod";
+ this.gridColumn1.UnboundDataType = typeof(string);
this.gridColumn1.Visible = true;
this.gridColumn1.VisibleIndex = 0;
- this.gridColumn1.Width = 112;
+ this.gridColumn1.Width = 90;
//
// gridColumn8
//
this.gridColumn8.Caption = "宸ュ崟鍗曞彿";
this.gridColumn8.FieldName = "daa001";
- this.gridColumn8.MinWidth = 30;
+ this.gridColumn8.MinWidth = 24;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Tag = "daa001";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 1;
- this.gridColumn8.Width = 112;
+ this.gridColumn8.Width = 90;
//
// itemNo1
//
this.itemNo1.Caption = "鐗╂枡缂栫爜";
this.itemNo1.FieldName = "itemNo";
- this.itemNo1.MinWidth = 30;
+ this.itemNo1.MinWidth = 24;
this.itemNo1.Name = "itemNo1";
this.itemNo1.Tag = "itemNo";
this.itemNo1.Visible = true;
this.itemNo1.VisibleIndex = 2;
- this.itemNo1.Width = 112;
+ this.itemNo1.Width = 90;
//
// itemName
//
this.itemName.Caption = "鐗╂枡鍚嶇О";
this.itemName.FieldName = "itemName";
- this.itemName.MinWidth = 30;
+ this.itemName.MinWidth = 24;
this.itemName.Name = "itemName";
this.itemName.Tag = "itemName";
this.itemName.Visible = true;
this.itemName.VisibleIndex = 3;
- this.itemName.Width = 112;
+ this.itemName.Width = 90;
//
// itemModel
//
this.itemModel.Caption = "瑙勬牸鍨嬪彿";
this.itemModel.FieldName = "itemModel";
- this.itemModel.MinWidth = 30;
+ this.itemModel.MinWidth = 24;
this.itemModel.Name = "itemModel";
this.itemModel.Tag = "itemModel";
this.itemModel.Visible = true;
this.itemModel.VisibleIndex = 4;
- this.itemModel.Width = 112;
+ this.itemModel.Width = 90;
//
// gridColumn2
//
this.gridColumn2.Caption = "闇�棰嗙敤閲�";
this.gridColumn2.FieldName = "dab006";
- this.gridColumn2.MinWidth = 30;
+ this.gridColumn2.MinWidth = 24;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Tag = "dab006";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 5;
- this.gridColumn2.Width = 112;
+ this.gridColumn2.Width = 90;
//
// gridColumn3
//
this.gridColumn3.Caption = "宸查鐢ㄩ噺";
this.gridColumn3.FieldName = "dab007";
- this.gridColumn3.MinWidth = 30;
+ this.gridColumn3.MinWidth = 24;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Tag = "dab007";
this.gridColumn3.Visible = true;
this.gridColumn3.VisibleIndex = 6;
- this.gridColumn3.Width = 112;
+ this.gridColumn3.Width = 90;
//
// gridColumn4
//
this.gridColumn4.Caption = "搴撳瓨鏁伴噺";
this.gridColumn4.FieldName = "kcnum";
- this.gridColumn4.MinWidth = 30;
+ this.gridColumn4.MinWidth = 24;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Tag = "kcnum";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 7;
- this.gridColumn4.Width = 112;
+ this.gridColumn4.Width = 90;
//
// gridColumn5
//
this.gridColumn5.Caption = "娆犳枡鏁伴噺";
this.gridColumn5.FieldName = "娆犳枡鏁伴噺";
- this.gridColumn5.MinWidth = 30;
+ this.gridColumn5.MinWidth = 24;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Tag = "娆犳枡鏁伴噺";
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 8;
- this.gridColumn5.Width = 112;
+ this.gridColumn5.Width = 90;
//
// gridColumn6
//
this.gridColumn6.Caption = "閲囪喘鏃ユ湡";
this.gridColumn6.FieldName = "daa024";
- this.gridColumn6.MinWidth = 30;
+ this.gridColumn6.MinWidth = 24;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Tag = "daa024";
this.gridColumn6.Visible = true;
this.gridColumn6.VisibleIndex = 9;
- this.gridColumn6.Width = 112;
+ this.gridColumn6.Width = 90;
//
// gridColumn7
//
this.gridColumn7.Caption = "缁勭粐鏈烘瀯";
this.gridColumn7.FieldName = "orgName";
- this.gridColumn7.MinWidth = 30;
+ this.gridColumn7.MinWidth = 24;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
this.gridColumn7.VisibleIndex = 10;
- this.gridColumn7.Width = 112;
+ this.gridColumn7.Width = 90;
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 635);
- this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1408, 48);
+ this.pageBar1.Size = new System.Drawing.Size(1126, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
// ItemQL
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1410, 834);
+ this.ClientSize = new System.Drawing.Size(1128, 682);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
- this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "ItemQL";
this.Text = "鐗╂枡娆犳枡鎶ヨ〃";
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.Designer.cs
new file mode 100644
index 0000000..197aee1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.Designer.cs
@@ -0,0 +1,260 @@
+锘縩amespace Gs.DevApp.DevFrm.Rpt
+{
+ partial class SysTuiSong
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.gcMain1 = new DevExpress.XtraGrid.GridControl();
+ this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
+ this.split1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
+ this.split1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // toolBarMenu1
+ //
+ this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.defaultActions = "鏌ヨ";
+ this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.toolBarMenu1.guidKey = null;
+ this.toolBarMenu1.isSetBtn = false;
+ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4);
+ this.toolBarMenu1.Name = "toolBarMenu1";
+ this.toolBarMenu1.rptParameter = null;
+ this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+ this.toolBarMenu1.TabIndex = 0;
+ this.toolBarMenu1.xlsInService = null;
+ this.toolBarMenu1.xlsOutParameter = null;
+ //
+ // xtraTabControl1
+ //
+ this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+ this.xtraTabControl1.Name = "xtraTabControl1";
+ this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
+ this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+ this.xtraTabControl1.TabIndex = 3;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.split1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
+ //
+ // split1
+ //
+ this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+ this.split1.Horizontal = false;
+ this.split1.Location = new System.Drawing.Point(0, 0);
+ this.split1.Name = "split1";
+ //
+ // split1.Panel1
+ //
+ this.split1.Panel1.Controls.Add(this.gcMain1);
+ this.split1.Panel1.Controls.Add(this.pageBar1);
+ this.split1.Panel1.Text = "Panel1";
+ //
+ // split1.Panel2
+ //
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Size = new System.Drawing.Size(1126, 570);
+ this.split1.SplitterPosition = 0;
+ this.split1.TabIndex = 0;
+ //
+ // gcMain1
+ //
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Name = "gcMain1";
+ this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+ this.gcMain1.TabIndex = 2;
+ this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gridView1});
+ //
+ // gridView1
+ //
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_guid,
+ this.gridColumn3,
+ this.gridColumn2,
+ this.gridColumn4,
+ this.gv_itemBarcode,
+ this.gv_quantity});
+ this.gridView1.GridControl = this.gcMain1;
+ this.gridView1.IndicatorWidth = 50;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_guid
+ //
+ this.gv_guid.AppearanceCell.Options.UseFont = true;
+ this.gv_guid.Caption = "涓婚敭GUID";
+ this.gv_guid.FieldName = "guid";
+ this.gv_guid.MinWidth = 50;
+ this.gv_guid.Name = "gv_guid";
+ this.gv_guid.OptionsColumn.AllowEdit = false;
+ this.gv_guid.Tag = "query_a.guid";
+ this.gv_guid.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鍗曟嵁缂栧彿";
+ this.gridColumn3.FieldName = "djbh";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 1;
+ this.gridColumn3.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鏈�鍚庝綔涓氭椂闂�";
+ this.gridColumn2.FieldName = "zysj";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 3;
+ this.gridColumn2.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鍗曟嵁绫诲瀷";
+ this.gridColumn4.FieldName = "djlx";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 2;
+ this.gridColumn4.Width = 94;
+ //
+ // gv_itemBarcode
+ //
+ this.gv_itemBarcode.AppearanceCell.Options.UseFont = true;
+ this.gv_itemBarcode.Caption = "鎺ㄩ�佺姸鎬�";
+ this.gv_itemBarcode.FieldName = "txtColor";
+ this.gv_itemBarcode.MinWidth = 50;
+ this.gv_itemBarcode.Name = "gv_itemBarcode";
+ this.gv_itemBarcode.OptionsColumn.AllowEdit = false;
+ this.gv_itemBarcode.Tag = "query_a.ITEM_BARCODE";
+ this.gv_itemBarcode.Visible = true;
+ this.gv_itemBarcode.VisibleIndex = 0;
+ this.gv_itemBarcode.Width = 94;
+ //
+ // gv_quantity
+ //
+ this.gv_quantity.AppearanceCell.Options.UseFont = true;
+ this.gv_quantity.Caption = "鑷姩鎺ㄩ�佹鏁�";
+ this.gv_quantity.FieldName = "tsSum";
+ this.gv_quantity.MinWidth = 50;
+ this.gv_quantity.Name = "gv_quantity";
+ this.gv_quantity.OptionsColumn.AllowEdit = false;
+ this.gv_quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+ new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣={0:0.##}")});
+ this.gv_quantity.Tag = "query_a.QUANTITY";
+ this.gv_quantity.Visible = true;
+ this.gv_quantity.VisibleIndex = 4;
+ this.gv_quantity.Width = 94;
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(0, 519);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.Size = new System.Drawing.Size(1126, 39);
+ this.pageBar1.TabIndex = 4;
+ this.pageBar1.TotalPages = 0;
+ //
+ // SysTuiSong
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(1128, 682);
+ this.Controls.Add(this.xtraTabControl1);
+ this.Controls.Add(this.toolBarMenu1);
+ this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.Name = "SysTuiSong";
+ this.Text = "鎺ㄩ�佹姤琛�";
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+ this.xtraTabControl1.ResumeLayout(false);
+ this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
+ this.split1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
+ this.split1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+ #endregion
+ private UserControl.UcToolBarMenu toolBarMenu1;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraEditors.SplitContainerControl split1;
+ private DevExpress.XtraGrid.GridControl gcMain1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_itemBarcode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_quantity;
+ private UserControls.Data.UcPageBar pageBar1;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.cs b/DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.cs
new file mode 100644
index 0000000..4dc21b4
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.cs
@@ -0,0 +1,150 @@
+锘縰sing DevExpress.Utils.DirectXPaint;
+using DevExpress.XtraEditors;
+using Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Gs.DevApp.UserControl;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.DevFrm.Rpt
+{
+ public partial class SysTuiSong : DevExpress.XtraEditors.XtraForm
+ {
+ string _webServiceName = "SysLog/";
+ List<FilterEntity> _filterList = new List<FilterEntity>();
+ public SysTuiSong()
+ {
+ InitializeComponent();
+ this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ this.toolBarMenu1.getXmlConfig();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "", "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ });
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ });
+ getPageList(1);
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ }
+ private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ await Task.Delay(100);
+ getPageList(1);
+ }
+ /// <summary>
+ /// 鏃ュ織
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ null, null, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ }
+
+ /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage);
+ }
+ /// <summary>
+ /// 鏌ヨ浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
+ }
+ /// <summary>
+ /// 鏌ヨ鍥炶皟
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
+ {
+ _filterList = e.FilterList;
+ getPageList(1);
+ }
+
+ /// <summary>
+ /// 鍒锋柊浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ private void getPageList(int curPage)
+ {
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());
+ string json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPageTuiSong", json);
+ ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
+ if (dd.rtnCode > 0)
+ {
+ DataTable dt = dd.rtnData.list;
+ gcMain1.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ if (dt.Rows.Count > 0)
+ {
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+ }
+ else
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.resx b/DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/DevFrm/Rpt/SysTuiSong.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
index ba1daf0..96df36d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.Designer.cs
@@ -31,61 +31,61 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesDbck));
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions9 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject33 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject34 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject35 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject36 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition31 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition32 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition33 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition34 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition35 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition36 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions46 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject181 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject182 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject183 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject184 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions47 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject185 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject186 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject187 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject188 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions48 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject189 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject190 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject191 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject192 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions49 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject193 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject194 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject195 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject196 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions50 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject197 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject198 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject199 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject200 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions51 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject201 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject202 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject203 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject204 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions52 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject205 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject206 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject207 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject208 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions53 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject209 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject210 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject211 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject212 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions54 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject213 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject214 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject215 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject216 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -230,6 +230,7 @@
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn55 = new DevExpress.XtraGrid.Columns.GridColumn();
this.btnTest1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -441,7 +442,7 @@
//
this.gv_isWc.AppearanceCell.Options.UseFont = true;
this.gv_isWc.Caption = "瀹岀粨鏍囪瘑 ";
- this.gv_isWc.FieldName = "wjStatus";
+ this.gv_isWc.FieldName = "txtColor";
this.gv_isWc.MinWidth = 25;
this.gv_isWc.Name = "gv_isWc";
this.gv_isWc.OptionsColumn.AllowEdit = false;
@@ -453,7 +454,7 @@
// gv_shState
//
this.gv_shState.AppearanceCell.Options.UseFont = true;
- this.gv_shState.Caption = "瀹℃牳鐘舵�� ";
+ this.gv_shState.Caption = "鍒跺崟瀹℃牳";
this.gv_shState.FieldName = "chkStatus";
this.gv_shState.MinWidth = 25;
this.gv_shState.Name = "gv_shState";
@@ -482,8 +483,6 @@
this.gridColumn25.FieldName = "fDocumentStatusTxt";
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
- this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 4;
this.gridColumn25.Width = 94;
//
// gridColumn26
@@ -493,7 +492,7 @@
this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 5;
+ this.gridColumn26.VisibleIndex = 4;
this.gridColumn26.Width = 94;
//
// gridColumn27
@@ -502,8 +501,6 @@
this.gridColumn27.FieldName = "fBillTypeID";
this.gridColumn27.MinWidth = 25;
this.gridColumn27.Name = "gridColumn27";
- this.gridColumn27.Visible = true;
- this.gridColumn27.VisibleIndex = 6;
this.gridColumn27.Width = 94;
//
// gridColumn28
@@ -512,8 +509,6 @@
this.gridColumn28.FieldName = "ftranstype";
this.gridColumn28.MinWidth = 25;
this.gridColumn28.Name = "gridColumn28";
- this.gridColumn28.Visible = true;
- this.gridColumn28.VisibleIndex = 7;
this.gridColumn28.Width = 94;
//
// gridColumn29
@@ -522,8 +517,6 @@
this.gridColumn29.FieldName = "fTransferDirect";
this.gridColumn29.MinWidth = 25;
this.gridColumn29.Name = "gridColumn29";
- this.gridColumn29.Visible = true;
- this.gridColumn29.VisibleIndex = 8;
this.gridColumn29.Width = 94;
//
// gridColumn30
@@ -532,8 +525,6 @@
this.gridColumn30.FieldName = "fOwnerTypeIdHead";
this.gridColumn30.MinWidth = 25;
this.gridColumn30.Name = "gridColumn30";
- this.gridColumn30.Visible = true;
- this.gridColumn30.VisibleIndex = 9;
this.gridColumn30.Width = 94;
//
// gridColumn31
@@ -542,8 +533,6 @@
this.gridColumn31.FieldName = "fOwnerTypeInIdHead";
this.gridColumn31.MinWidth = 25;
this.gridColumn31.Name = "gridColumn31";
- this.gridColumn31.Visible = true;
- this.gridColumn31.VisibleIndex = 10;
this.gridColumn31.Width = 94;
//
// gridColumn32
@@ -553,7 +542,7 @@
this.gridColumn32.MinWidth = 25;
this.gridColumn32.Name = "gridColumn32";
this.gridColumn32.Visible = true;
- this.gridColumn32.VisibleIndex = 11;
+ this.gridColumn32.VisibleIndex = 5;
this.gridColumn32.Width = 94;
//
// gridColumn33
@@ -571,7 +560,7 @@
this.gridColumn34.MinWidth = 25;
this.gridColumn34.Name = "gridColumn34";
this.gridColumn34.Visible = true;
- this.gridColumn34.VisibleIndex = 12;
+ this.gridColumn34.VisibleIndex = 6;
this.gridColumn34.Width = 94;
//
// gridColumn35
@@ -589,7 +578,7 @@
this.gridColumn36.MinWidth = 25;
this.gridColumn36.Name = "gridColumn36";
this.gridColumn36.Visible = true;
- this.gridColumn36.VisibleIndex = 13;
+ this.gridColumn36.VisibleIndex = 8;
this.gridColumn36.Width = 94;
//
// gridColumn37
@@ -599,7 +588,7 @@
this.gridColumn37.MinWidth = 25;
this.gridColumn37.Name = "gridColumn37";
this.gridColumn37.Visible = true;
- this.gridColumn37.VisibleIndex = 14;
+ this.gridColumn37.VisibleIndex = 10;
this.gridColumn37.Width = 94;
//
// gridColumn38
@@ -609,7 +598,7 @@
this.gridColumn38.MinWidth = 25;
this.gridColumn38.Name = "gridColumn38";
this.gridColumn38.Visible = true;
- this.gridColumn38.VisibleIndex = 15;
+ this.gridColumn38.VisibleIndex = 9;
this.gridColumn38.Width = 94;
//
// gridColumn39
@@ -618,8 +607,6 @@
this.gridColumn39.FieldName = "fCloseStatusTxt";
this.gridColumn39.MinWidth = 25;
this.gridColumn39.Name = "gridColumn39";
- this.gridColumn39.Visible = true;
- this.gridColumn39.VisibleIndex = 18;
this.gridColumn39.Width = 94;
//
// gridColumn40
@@ -668,8 +655,6 @@
this.gridColumn45.FieldName = "fBusinessType";
this.gridColumn45.MinWidth = 25;
this.gridColumn45.Name = "gridColumn45";
- this.gridColumn45.Visible = true;
- this.gridColumn45.VisibleIndex = 19;
this.gridColumn45.Width = 94;
//
// gridColumn46
@@ -678,8 +663,6 @@
this.gridColumn46.FieldName = "fCreatorName";
this.gridColumn46.MinWidth = 25;
this.gridColumn46.Name = "gridColumn46";
- this.gridColumn46.Visible = true;
- this.gridColumn46.VisibleIndex = 20;
this.gridColumn46.Width = 94;
//
// gridColumn47
@@ -689,7 +672,7 @@
this.gridColumn47.MinWidth = 25;
this.gridColumn47.Name = "gridColumn47";
this.gridColumn47.Visible = true;
- this.gridColumn47.VisibleIndex = 21;
+ this.gridColumn47.VisibleIndex = 13;
this.gridColumn47.Width = 94;
//
// gridColumn48
@@ -699,7 +682,7 @@
this.gridColumn48.MinWidth = 25;
this.gridColumn48.Name = "gridColumn48";
this.gridColumn48.Visible = true;
- this.gridColumn48.VisibleIndex = 22;
+ this.gridColumn48.VisibleIndex = 7;
this.gridColumn48.Width = 94;
//
// gridColumn49
@@ -708,8 +691,6 @@
this.gridColumn49.FieldName = "djtype";
this.gridColumn49.MinWidth = 25;
this.gridColumn49.Name = "gridColumn49";
- this.gridColumn49.Visible = true;
- this.gridColumn49.VisibleIndex = 23;
this.gridColumn49.Width = 94;
//
// gridColumn50
@@ -719,7 +700,7 @@
this.gridColumn50.MinWidth = 25;
this.gridColumn50.Name = "gridColumn50";
this.gridColumn50.Visible = true;
- this.gridColumn50.VisibleIndex = 24;
+ this.gridColumn50.VisibleIndex = 14;
this.gridColumn50.Width = 94;
//
// gv_id
@@ -747,7 +728,7 @@
this.gridColumn52.MinWidth = 25;
this.gridColumn52.Name = "gridColumn52";
this.gridColumn52.Visible = true;
- this.gridColumn52.VisibleIndex = 16;
+ this.gridColumn52.VisibleIndex = 11;
this.gridColumn52.Width = 94;
//
// gridColumn53
@@ -757,7 +738,7 @@
this.gridColumn53.MinWidth = 25;
this.gridColumn53.Name = "gridColumn53";
this.gridColumn53.Visible = true;
- this.gridColumn53.VisibleIndex = 17;
+ this.gridColumn53.VisibleIndex = 12;
this.gridColumn53.Width = 94;
//
// pageBar1
@@ -851,14 +832,14 @@
// txt_djtype
//
this.txt_djtype.EditValue = "鏍囧噯鐩存帴璋冩嫧鍗�(ZJDB01_SYS)";
- this.txt_djtype.Location = new System.Drawing.Point(385, 136);
+ this.txt_djtype.Location = new System.Drawing.Point(390, 136);
this.txt_djtype.Name = "txt_djtype";
this.txt_djtype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_djtype.Properties.Items.AddRange(new object[] {
"鏍囧噯鐩存帴璋冩嫧鍗�(ZJDB01_SYS)"});
this.txt_djtype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_djtype.Size = new System.Drawing.Size(165, 24);
+ this.txt_djtype.Size = new System.Drawing.Size(170, 24);
this.txt_djtype.StyleController = this.layoutMx1;
this.txt_djtype.TabIndex = 391;
//
@@ -875,14 +856,14 @@
this.txt_fRemarks.Location = new System.Drawing.Point(114, 136);
this.txt_fRemarks.Name = "txt_fRemarks";
this.txt_fRemarks.Properties.Appearance.Options.UseFont = true;
- this.txt_fRemarks.Size = new System.Drawing.Size(165, 24);
+ this.txt_fRemarks.Size = new System.Drawing.Size(170, 24);
this.txt_fRemarks.StyleController = this.layoutMx1;
this.txt_fRemarks.TabIndex = 371;
//
// txt_fOwnerTypeInIdHead
//
this.txt_fOwnerTypeInIdHead.EditValue = "缁勭粐(BD_OwnerOrg)";
- this.txt_fOwnerTypeInIdHead.Location = new System.Drawing.Point(385, 105);
+ this.txt_fOwnerTypeInIdHead.Location = new System.Drawing.Point(390, 105);
this.txt_fOwnerTypeInIdHead.Name = "txt_fOwnerTypeInIdHead";
this.txt_fOwnerTypeInIdHead.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -891,16 +872,16 @@
"渚涘簲鍟�(BD_Supplier)",
"瀹㈡埛(BD_Customer)"});
this.txt_fOwnerTypeInIdHead.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fOwnerTypeInIdHead.Size = new System.Drawing.Size(165, 24);
+ this.txt_fOwnerTypeInIdHead.Size = new System.Drawing.Size(170, 24);
this.txt_fOwnerTypeInIdHead.StyleController = this.layoutMx1;
this.txt_fOwnerTypeInIdHead.TabIndex = 382;
//
// txt_fCreateDate
//
- this.txt_fCreateDate.Location = new System.Drawing.Point(656, 43);
+ this.txt_fCreateDate.Location = new System.Drawing.Point(666, 43);
this.txt_fCreateDate.Name = "txt_fCreateDate";
this.txt_fCreateDate.Properties.Appearance.Options.UseFont = true;
- this.txt_fCreateDate.Size = new System.Drawing.Size(165, 24);
+ this.txt_fCreateDate.Size = new System.Drawing.Size(170, 24);
this.txt_fCreateDate.StyleController = this.layoutMx1;
this.txt_fCreateDate.TabIndex = 386;
this.txt_fCreateDate.Tag = "readonly";
@@ -908,7 +889,7 @@
// txt_fOwnerTypeIdHead
//
this.txt_fOwnerTypeIdHead.EditValue = "缁勭粐(BD_OwnerOrg)";
- this.txt_fOwnerTypeIdHead.Location = new System.Drawing.Point(385, 74);
+ this.txt_fOwnerTypeIdHead.Location = new System.Drawing.Point(390, 74);
this.txt_fOwnerTypeIdHead.Name = "txt_fOwnerTypeIdHead";
this.txt_fOwnerTypeIdHead.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -917,7 +898,7 @@
"渚涘簲鍟�(BD_Supplier)",
"瀹㈡埛(BD_Customer)"});
this.txt_fOwnerTypeIdHead.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fOwnerTypeIdHead.Size = new System.Drawing.Size(165, 24);
+ this.txt_fOwnerTypeIdHead.Size = new System.Drawing.Size(170, 24);
this.txt_fOwnerTypeIdHead.StyleController = this.layoutMx1;
this.txt_fOwnerTypeIdHead.TabIndex = 380;
//
@@ -931,7 +912,7 @@
this.txt_fBusinessType.Properties.Items.AddRange(new object[] {
"鏍囧噯(NORMAL)"});
this.txt_fBusinessType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fBusinessType.Size = new System.Drawing.Size(165, 24);
+ this.txt_fBusinessType.Size = new System.Drawing.Size(170, 24);
this.txt_fBusinessType.StyleController = this.layoutMx1;
this.txt_fBusinessType.TabIndex = 374;
//
@@ -947,16 +928,16 @@
"閫�璐�(RETURN)",
"鏅��(GENERAL)"});
this.txt_fTransferDirect.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fTransferDirect.Size = new System.Drawing.Size(165, 24);
+ this.txt_fTransferDirect.Size = new System.Drawing.Size(170, 24);
this.txt_fTransferDirect.StyleController = this.layoutMx1;
this.txt_fTransferDirect.TabIndex = 362;
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(656, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(666, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createBy.Size = new System.Drawing.Size(165, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(170, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 384;
this.txt_createBy.Tag = "readonly";
@@ -966,7 +947,7 @@
this.txt_fBillNo.Location = new System.Drawing.Point(114, 12);
this.txt_fBillNo.Name = "txt_fBillNo";
this.txt_fBillNo.Properties.Appearance.Options.UseFont = true;
- this.txt_fBillNo.Size = new System.Drawing.Size(165, 24);
+ this.txt_fBillNo.Size = new System.Drawing.Size(170, 24);
this.txt_fBillNo.StyleController = this.layoutMx1;
this.txt_fBillNo.TabIndex = 327;
this.txt_fBillNo.Tag = "readonly";
@@ -974,7 +955,7 @@
// txt_ftranstype
//
this.txt_ftranstype.EditValue = "缁勭粐鍐呰皟鎷�(InnerOrgTransfer)";
- this.txt_ftranstype.Location = new System.Drawing.Point(385, 43);
+ this.txt_ftranstype.Location = new System.Drawing.Point(390, 43);
this.txt_ftranstype.Name = "txt_ftranstype";
this.txt_ftranstype.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -982,16 +963,16 @@
"缁勭粐鍐呰皟鎷�(InnerOrgTransfer)",
"璺ㄧ粍缁囪皟鎷�(OverOrgTransfer)"});
this.txt_ftranstype.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_ftranstype.Size = new System.Drawing.Size(165, 24);
+ this.txt_ftranstype.Size = new System.Drawing.Size(170, 24);
this.txt_ftranstype.StyleController = this.layoutMx1;
this.txt_ftranstype.TabIndex = 378;
//
// txt_fapporgid
//
this.txt_fapporgid.IsReadly = false;
- this.txt_fapporgid.Location = new System.Drawing.Point(385, 12);
+ this.txt_fapporgid.Location = new System.Drawing.Point(390, 12);
this.txt_fapporgid.Name = "txt_fapporgid";
- this.txt_fapporgid.Size = new System.Drawing.Size(165, 24);
+ this.txt_fapporgid.Size = new System.Drawing.Size(170, 24);
this.txt_fapporgid.TabIndex = 376;
//
// txt_fBillTypeID
@@ -1004,110 +985,110 @@
this.txt_fBillTypeID.Properties.Items.AddRange(new object[] {
"鏍囧噯璋冩嫧鐢宠鍗�(DBSQD01_SYS)"});
this.txt_fBillTypeID.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_fBillTypeID.Size = new System.Drawing.Size(165, 24);
+ this.txt_fBillTypeID.Size = new System.Drawing.Size(170, 24);
this.txt_fBillTypeID.StyleController = this.layoutMx1;
this.txt_fBillTypeID.TabIndex = 361;
//
// txt_chkBy
//
- this.txt_chkBy.Location = new System.Drawing.Point(927, 12);
+ this.txt_chkBy.Location = new System.Drawing.Point(942, 12);
this.txt_chkBy.Name = "txt_chkBy";
this.txt_chkBy.Properties.Appearance.Options.UseFont = true;
- this.txt_chkBy.Size = new System.Drawing.Size(166, 24);
+ this.txt_chkBy.Size = new System.Drawing.Size(172, 24);
this.txt_chkBy.StyleController = this.layoutMx1;
this.txt_chkBy.TabIndex = 258;
this.txt_chkBy.Tag = "readonly";
//
// txt_fapprovedate
//
- this.txt_fapprovedate.Location = new System.Drawing.Point(927, 43);
+ this.txt_fapprovedate.Location = new System.Drawing.Point(942, 43);
this.txt_fapprovedate.Name = "txt_fapprovedate";
this.txt_fapprovedate.Properties.Appearance.Options.UseFont = true;
- this.txt_fapprovedate.Size = new System.Drawing.Size(166, 24);
+ this.txt_fapprovedate.Size = new System.Drawing.Size(172, 24);
this.txt_fapprovedate.StyleController = this.layoutMx1;
this.txt_fapprovedate.TabIndex = 262;
this.txt_fapprovedate.Tag = "readonly";
//
// txt_wjStatus
//
- this.txt_wjStatus.Location = new System.Drawing.Point(554, 167);
+ this.txt_wjStatus.Location = new System.Drawing.Point(564, 167);
this.txt_wjStatus.Name = "txt_wjStatus";
this.txt_wjStatus.Properties.Caption = "瀹岀粨鏍囪瘑";
- this.txt_wjStatus.Size = new System.Drawing.Size(267, 24);
+ this.txt_wjStatus.Size = new System.Drawing.Size(272, 24);
this.txt_wjStatus.StyleController = this.layoutMx1;
this.txt_wjStatus.TabIndex = 387;
this.txt_wjStatus.Tag = "readonly";
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(825, 74);
+ this.txt_chkStatus.Location = new System.Drawing.Point(840, 74);
this.txt_chkStatus.Name = "txt_chkStatus";
this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_chkStatus.Size = new System.Drawing.Size(268, 24);
+ this.txt_chkStatus.Size = new System.Drawing.Size(274, 24);
this.txt_chkStatus.StyleController = this.layoutMx1;
this.txt_chkStatus.TabIndex = 388;
this.txt_chkStatus.Tag = "readonly";
//
// txt_source
//
- this.txt_source.Location = new System.Drawing.Point(385, 167);
+ this.txt_source.Location = new System.Drawing.Point(390, 167);
this.txt_source.Name = "txt_source";
- this.txt_source.Size = new System.Drawing.Size(165, 24);
+ this.txt_source.Size = new System.Drawing.Size(170, 24);
this.txt_source.StyleController = this.layoutMx1;
this.txt_source.TabIndex = 390;
this.txt_source.Tag = "readonly";
//
// txt_fCloserId
//
- this.txt_fCloserId.Location = new System.Drawing.Point(656, 105);
+ this.txt_fCloserId.Location = new System.Drawing.Point(666, 105);
this.txt_fCloserId.Name = "txt_fCloserId";
- this.txt_fCloserId.Size = new System.Drawing.Size(165, 24);
+ this.txt_fCloserId.Size = new System.Drawing.Size(170, 24);
this.txt_fCloserId.StyleController = this.layoutMx1;
this.txt_fCloserId.TabIndex = 392;
this.txt_fCloserId.Tag = "readonly";
//
// txt_fCloseDate
//
- this.txt_fCloseDate.Location = new System.Drawing.Point(656, 136);
+ this.txt_fCloseDate.Location = new System.Drawing.Point(666, 136);
this.txt_fCloseDate.Name = "txt_fCloseDate";
- this.txt_fCloseDate.Size = new System.Drawing.Size(165, 24);
+ this.txt_fCloseDate.Size = new System.Drawing.Size(170, 24);
this.txt_fCloseDate.StyleController = this.layoutMx1;
this.txt_fCloseDate.TabIndex = 393;
this.txt_fCloseDate.Tag = "readonly";
//
// txt_fCloseStatusTxt
//
- this.txt_fCloseStatusTxt.Location = new System.Drawing.Point(656, 74);
+ this.txt_fCloseStatusTxt.Location = new System.Drawing.Point(666, 74);
this.txt_fCloseStatusTxt.Name = "txt_fCloseStatusTxt";
- this.txt_fCloseStatusTxt.Size = new System.Drawing.Size(165, 24);
+ this.txt_fCloseStatusTxt.Size = new System.Drawing.Size(170, 24);
this.txt_fCloseStatusTxt.StyleController = this.layoutMx1;
this.txt_fCloseStatusTxt.TabIndex = 394;
this.txt_fCloseStatusTxt.Tag = "readonly";
//
// txt_qt028
//
- this.txt_qt028.Location = new System.Drawing.Point(927, 105);
+ this.txt_qt028.Location = new System.Drawing.Point(942, 105);
this.txt_qt028.Name = "txt_qt028";
- this.txt_qt028.Size = new System.Drawing.Size(166, 24);
+ this.txt_qt028.Size = new System.Drawing.Size(172, 24);
this.txt_qt028.StyleController = this.layoutMx1;
this.txt_qt028.TabIndex = 395;
this.txt_qt028.Tag = "readonly";
//
// txt_qt027
//
- this.txt_qt027.Location = new System.Drawing.Point(927, 136);
+ this.txt_qt027.Location = new System.Drawing.Point(942, 136);
this.txt_qt027.Name = "txt_qt027";
- this.txt_qt027.Size = new System.Drawing.Size(166, 24);
+ this.txt_qt027.Size = new System.Drawing.Size(172, 24);
this.txt_qt027.StyleController = this.layoutMx1;
this.txt_qt027.TabIndex = 396;
this.txt_qt027.Tag = "readonly";
//
// txt_qt026
//
- this.txt_qt026.Location = new System.Drawing.Point(825, 167);
+ this.txt_qt026.Location = new System.Drawing.Point(840, 167);
this.txt_qt026.Name = "txt_qt026";
this.txt_qt026.Properties.Caption = "鍞悗瀹℃牳鐘舵��";
- this.txt_qt026.Size = new System.Drawing.Size(268, 24);
+ this.txt_qt026.Size = new System.Drawing.Size(274, 24);
this.txt_qt026.StyleController = this.layoutMx1;
this.txt_qt026.TabIndex = 397;
this.txt_qt026.Tag = "readonly";
@@ -1155,39 +1136,39 @@
this.layoutControlItem26});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition21.Width = 100D;
+ columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition22.Width = 100D;
+ columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition23.Width = 100D;
+ columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition24.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition2.Height = 100D;
- rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition3.Height = 100D;
- rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition4.Height = 100D;
- rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition21,
+ columnDefinition22,
+ columnDefinition23,
+ columnDefinition24});
+ rowDefinition31.Height = 100D;
+ rowDefinition31.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition32.Height = 100D;
+ rowDefinition32.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition33.Height = 100D;
+ rowDefinition33.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition34.Height = 100D;
+ rowDefinition34.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition35.Height = 100D;
+ rowDefinition35.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition36.Height = 100D;
+ rowDefinition36.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4,
- rowDefinition5,
- rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1105, 206);
+ rowDefinition31,
+ rowDefinition32,
+ rowDefinition33,
+ rowDefinition34,
+ rowDefinition35,
+ rowDefinition36});
+ this.Root.Size = new System.Drawing.Size(1126, 206);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1195,27 +1176,27 @@
this.layoutControlItem1.Control = this.txt_fBillNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fapporgid;
- this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem2.Text = "鐢宠缁勭粐";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_createBy;
- this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem3.Text = "鐢宠浜哄憳";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1225,29 +1206,29 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem4.Text = "鐢宠绫诲瀷";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_ftranstype;
- this.layoutControlItem5.Location = new System.Drawing.Point(271, 31);
+ this.layoutControlItem5.Location = new System.Drawing.Point(276, 31);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem5.Text = "璋冩嫧绫诲瀷 ";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_fCreateDate;
- this.layoutControlItem6.Location = new System.Drawing.Point(542, 31);
+ this.layoutControlItem6.Location = new System.Drawing.Point(552, 31);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem6.Text = "鐢宠鏃堕棿";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1257,39 +1238,39 @@
this.layoutControlItem7.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem7.Text = "涓氬姟绫诲瀷";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fOwnerTypeIdHead;
- this.layoutControlItem8.Location = new System.Drawing.Point(271, 62);
+ this.layoutControlItem8.Location = new System.Drawing.Point(276, 62);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem8.Text = "璋冨嚭璐т富绫诲瀷";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_chkBy;
- this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(278, 31);
this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_fapprovedate;
- this.layoutControlItem10.Location = new System.Drawing.Point(813, 31);
+ this.layoutControlItem10.Location = new System.Drawing.Point(828, 31);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(278, 31);
this.layoutControlItem10.Tag = "readonly";
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
@@ -1300,29 +1281,29 @@
this.layoutControlItem13.Location = new System.Drawing.Point(0, 93);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem13.Text = "璋冩嫧鏂瑰悜";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_fOwnerTypeInIdHead;
- this.layoutControlItem14.Location = new System.Drawing.Point(271, 93);
+ this.layoutControlItem14.Location = new System.Drawing.Point(276, 93);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem14.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem14.Text = "璋冨叆璐т富绫诲瀷";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_djtype;
- this.layoutControlItem19.Location = new System.Drawing.Point(271, 124);
+ this.layoutControlItem19.Location = new System.Drawing.Point(276, 124);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem19.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem19.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem19.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1332,18 +1313,18 @@
this.layoutControlItem15.Location = new System.Drawing.Point(0, 124);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem15.Text = "鐢宠澶囨敞";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_chkStatus;
- this.layoutControlItem12.Location = new System.Drawing.Point(813, 62);
+ this.layoutControlItem12.Location = new System.Drawing.Point(828, 62);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem12.Size = new System.Drawing.Size(278, 31);
this.layoutControlItem12.Text = "瀹℃牳鐘舵��";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
@@ -1351,66 +1332,66 @@
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_fCloseDate;
- this.layoutControlItem21.Location = new System.Drawing.Point(542, 124);
+ this.layoutControlItem21.Location = new System.Drawing.Point(552, 124);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem21.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem21.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem21.Text = "鍏抽棴鏃堕棿";
this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_fCloserId;
- this.layoutControlItem20.Location = new System.Drawing.Point(542, 93);
+ this.layoutControlItem20.Location = new System.Drawing.Point(552, 93);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem20.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem20.Text = "鍏抽棴浜哄憳";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_fCloseStatusTxt;
- this.layoutControlItem22.Location = new System.Drawing.Point(542, 62);
+ this.layoutControlItem22.Location = new System.Drawing.Point(552, 62);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem22.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem22.Text = "鍏抽棴鐘舵��";
this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txt_qt028;
- this.layoutControlItem23.Location = new System.Drawing.Point(813, 93);
+ this.layoutControlItem23.Location = new System.Drawing.Point(828, 93);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem23.Size = new System.Drawing.Size(278, 31);
this.layoutControlItem23.Text = "鍞悗瀹℃牳浜哄憳";
this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txt_qt027;
- this.layoutControlItem24.Location = new System.Drawing.Point(813, 124);
+ this.layoutControlItem24.Location = new System.Drawing.Point(828, 124);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem24.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem24.Size = new System.Drawing.Size(278, 31);
this.layoutControlItem24.Text = "鍞悗瀹℃牳鏃堕棿";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txt_qt026;
- this.layoutControlItem25.Location = new System.Drawing.Point(813, 155);
+ this.layoutControlItem25.Location = new System.Drawing.Point(828, 155);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem25.Size = new System.Drawing.Size(272, 31);
+ this.layoutControlItem25.Size = new System.Drawing.Size(278, 31);
this.layoutControlItem25.Text = "鍞悗瀹℃牳鐘舵��";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
@@ -1418,11 +1399,11 @@
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_wjStatus;
- this.layoutControlItem11.Location = new System.Drawing.Point(542, 155);
+ this.layoutControlItem11.Location = new System.Drawing.Point(552, 155);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem11.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem11.Text = "瀹岀粨鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -1430,11 +1411,11 @@
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_source;
- this.layoutControlItem17.Location = new System.Drawing.Point(271, 155);
+ this.layoutControlItem17.Location = new System.Drawing.Point(276, 155);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem17.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem17.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem17.Text = "婧愬崟绫诲瀷";
this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1446,7 +1427,7 @@
this.layoutControlItem26.MinSize = new System.Drawing.Size(90, 31);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem26.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem26.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem26.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem26.Text = "蹇嵎褰曞叆";
this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
@@ -1523,7 +1504,8 @@
this.gridColumn19,
this.gridColumn20,
this.gridColumn21,
- this.gridColumn22});
+ this.gridColumn22,
+ this.gridColumn55});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1567,7 +1549,7 @@
this.gvMx1bld012.Tag = "edit";
this.gvMx1bld012.Visible = true;
this.gvMx1bld012.VisibleIndex = 0;
- this.gvMx1bld012.Width = 94;
+ this.gvMx1bld012.Width = 63;
//
// repositoryItemSearchLookUpEdit1
//
@@ -1676,7 +1658,7 @@
this.gvMx1bld002.Tag = "query_a.bld002";
this.gvMx1bld002.Visible = true;
this.gvMx1bld002.VisibleIndex = 1;
- this.gvMx1bld002.Width = 100;
+ this.gvMx1bld002.Width = 67;
//
// gvMx1bld003
//
@@ -1689,7 +1671,7 @@
this.gvMx1bld003.Tag = "query_a.bld003";
this.gvMx1bld003.Visible = true;
this.gvMx1bld003.VisibleIndex = 2;
- this.gvMx1bld003.Width = 120;
+ this.gvMx1bld003.Width = 81;
//
// itemModel
//
@@ -1701,8 +1683,8 @@
this.itemModel.OptionsColumn.ReadOnly = true;
this.itemModel.Tag = "query_a.bld004";
this.itemModel.Visible = true;
- this.itemModel.VisibleIndex = 13;
- this.itemModel.Width = 120;
+ this.itemModel.VisibleIndex = 14;
+ this.itemModel.Width = 76;
//
// gvMx1bld007
//
@@ -1718,7 +1700,7 @@
this.gvMx1bld007.Tag = "yz_quantity_0_edit";
this.gvMx1bld007.Visible = true;
this.gvMx1bld007.VisibleIndex = 3;
- this.gvMx1bld007.Width = 94;
+ this.gvMx1bld007.Width = 63;
//
// gvMx1bld010
//
@@ -1734,7 +1716,7 @@
this.gvMx1bld010.Tag = "edit";
this.gvMx1bld010.Visible = true;
this.gvMx1bld010.VisibleIndex = 4;
- this.gvMx1bld010.Width = 150;
+ this.gvMx1bld010.Width = 101;
//
// gvMx1bld008
//
@@ -1746,8 +1728,8 @@
this.gvMx1bld008.OptionsColumn.ReadOnly = true;
this.gvMx1bld008.Tag = "query_a.bld008";
this.gvMx1bld008.Visible = true;
- this.gvMx1bld008.VisibleIndex = 5;
- this.gvMx1bld008.Width = 94;
+ this.gvMx1bld008.VisibleIndex = 12;
+ this.gvMx1bld008.Width = 63;
//
// gridColumn1
//
@@ -1756,8 +1738,8 @@
this.gridColumn1.MinWidth = 25;
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 6;
- this.gridColumn1.Width = 94;
+ this.gridColumn1.VisibleIndex = 13;
+ this.gridColumn1.Width = 63;
//
// gridColumn9
//
@@ -1771,15 +1753,15 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 7;
- this.gridColumn9.Width = 94;
+ this.gridColumn9.VisibleIndex = 5;
+ this.gridColumn9.Width = 63;
//
// rptDcOrg
//
this.rptDcOrg.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x162;
+ editorButtonImageOptions46.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x162;
this.rptDcOrg.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions46, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject181, serializableAppearanceObject182, serializableAppearanceObject183, serializableAppearanceObject184, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDcOrg.Name = "rptDcOrg";
this.rptDcOrg.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcOrg_ButtonClick);
//
@@ -1795,15 +1777,15 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 8;
- this.gridColumn10.Width = 94;
+ this.gridColumn10.VisibleIndex = 6;
+ this.gridColumn10.Width = 83;
//
// rptDcCk
//
this.rptDcCk.AutoHeight = false;
- editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions47.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDcCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions47, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject185, serializableAppearanceObject186, serializableAppearanceObject187, serializableAppearanceObject188, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDcCk.Name = "rptDcCk";
this.rptDcCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcCk_ButtonClick);
//
@@ -1821,9 +1803,9 @@
// rptDcCw
//
this.rptDcCw.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions48.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDcCw.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions48, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject189, serializableAppearanceObject190, serializableAppearanceObject191, serializableAppearanceObject192, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDcCw.Name = "rptDcCw";
this.rptDcCw.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcCw_ButtonClick);
//
@@ -1839,15 +1821,15 @@
this.gridColumn12.MinWidth = 25;
this.gridColumn12.Name = "gridColumn12";
this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 9;
- this.gridColumn12.Width = 94;
+ this.gridColumn12.VisibleIndex = 8;
+ this.gridColumn12.Width = 59;
//
// rptDrOrg
//
this.rptDrOrg.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions49.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDrOrg.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions49, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject193, serializableAppearanceObject194, serializableAppearanceObject195, serializableAppearanceObject196, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDrOrg.Name = "rptDrOrg";
this.rptDrOrg.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrOrg_ButtonClick);
//
@@ -1863,15 +1845,15 @@
this.gridColumn16.MinWidth = 25;
this.gridColumn16.Name = "gridColumn16";
this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 10;
- this.gridColumn16.Width = 94;
+ this.gridColumn16.VisibleIndex = 9;
+ this.gridColumn16.Width = 59;
//
// rptDrCk
//
this.rptDrCk.AutoHeight = false;
- editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions50.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDrCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions50, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject197, serializableAppearanceObject198, serializableAppearanceObject199, serializableAppearanceObject200, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDrCk.Name = "rptDrCk";
this.rptDrCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrCk_ButtonClick);
//
@@ -1887,9 +1869,9 @@
// rptDrCw
//
this.rptDrCw.AutoHeight = false;
- editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions51.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDrCw.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions51, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject201, serializableAppearanceObject202, serializableAppearanceObject203, serializableAppearanceObject204, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDrCw.Name = "rptDrCw";
this.rptDrCw.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrCw_ButtonClick);
//
@@ -1905,15 +1887,15 @@
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 11;
- this.gridColumn23.Width = 94;
+ this.gridColumn23.VisibleIndex = 10;
+ this.gridColumn23.Width = 59;
//
// rptDcHz
//
this.rptDcHz.AutoHeight = false;
- editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions52.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDcHz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions52, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject205, serializableAppearanceObject206, serializableAppearanceObject207, serializableAppearanceObject208, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDcHz.Name = "rptDcHz";
this.rptDcHz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDcHz_ButtonClick);
//
@@ -1929,15 +1911,15 @@
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 12;
- this.gridColumn24.Width = 94;
+ this.gridColumn24.VisibleIndex = 11;
+ this.gridColumn24.Width = 59;
//
// rptDrHz
//
this.rptDrHz.AutoHeight = false;
- editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions53.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptDrHz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions53, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject209, serializableAppearanceObject210, serializableAppearanceObject211, serializableAppearanceObject212, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptDrHz.Name = "rptDrHz";
this.rptDrHz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptDrHz_ButtonClick);
//
@@ -1948,16 +1930,16 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 14;
- this.gvMxDel.Width = 94;
+ this.gvMxDel.VisibleIndex = 15;
+ this.gvMxDel.Width = 59;
//
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions9.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions9.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions54.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions54.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions54, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject213, serializableAppearanceObject214, serializableAppearanceObject215, serializableAppearanceObject216, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -2034,6 +2016,20 @@
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Width = 94;
+ //
+ // gridColumn55
+ //
+ this.gridColumn55.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn55.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn55.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn55.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn55.Caption = "Mes/Erp搴撳瓨";
+ this.gridColumn55.FieldName = "kcQty";
+ this.gridColumn55.MinWidth = 25;
+ this.gridColumn55.Name = "gridColumn55";
+ this.gridColumn55.Visible = true;
+ this.gridColumn55.VisibleIndex = 7;
+ this.gridColumn55.Width = 76;
//
// btnTest1
//
@@ -2310,5 +2306,6 @@
private DevExpress.XtraEditors.SimpleButton btnCopyXls;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
}
}
\ 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 48daa38..0a6c145 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -123,6 +123,7 @@
//榛樿浠撳簱鍜屼粨搴撴暟閲�
_row["dcCk"] = dym.depotName;
_row["dcCkGuid"] = dym.depotId;
+ _row["kcQty"] = dym.kcQty;
if (!string.IsNullOrEmpty(_orgId))
{
_row["dcOrg"] = _orgName;
@@ -714,10 +715,9 @@
gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"].ToString());
gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());
-
gvMx1.SetFocusedRowCellValue("dcCk", SelectedDataRow["depotName"]);
gvMx1.SetFocusedRowCellValue("dcCkGuid", SelectedDataRow["depotId"]);
-
+ gvMx1.SetFocusedRowCellValue("kcQty", SelectedDataRow["kcQty"]);
gvMx1.CloseEditor();
gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
index f96de65..c5d4ff1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -267,7 +267,7 @@
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(981, 0, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(544, 408, 812, 500);
this.layoutMx1.Root = this.Root;
this.layoutMx1.Size = new System.Drawing.Size(828, 229);
this.layoutMx1.TabIndex = 0;
@@ -277,6 +277,7 @@
//
this.txt_gdbh.Location = new System.Drawing.Point(111, 12);
this.txt_gdbh.Name = "txt_gdbh";
+ this.txt_gdbh.Properties.Appearance.Options.UseFont = true;
this.txt_gdbh.Properties.ReadOnly = true;
this.txt_gdbh.Size = new System.Drawing.Size(99, 24);
this.txt_gdbh.StyleController = this.layoutMx1;
@@ -408,7 +409,6 @@
// btnGood
//
this.btnGood.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
- this.btnGood.Appearance.Font = new System.Drawing.Font("Tahoma", 20F);
this.btnGood.Appearance.Options.UseBackColor = true;
this.btnGood.Appearance.Options.UseFont = true;
this.btnGood.Location = new System.Drawing.Point(416, 116);
@@ -421,7 +421,6 @@
// btnBad
//
this.btnBad.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
- this.btnBad.Appearance.Font = new System.Drawing.Font("Tahoma", 20F);
this.btnBad.Appearance.Options.UseBackColor = true;
this.btnBad.Appearance.Options.UseFont = true;
this.btnBad.Location = new System.Drawing.Point(618, 116);
@@ -464,6 +463,8 @@
this.layDianJian});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
+ this.Root.OptionsPrint.AppearanceGroupCaption.Options.UseFont = true;
+ this.Root.OptionsPrint.AppearanceItem.Options.UseFont = true;
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
columnDefinition1.Width = 100D;
columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -501,9 +502,12 @@
//
// layoutControlItem1
//
+ this.layoutControlItem1.AppearanceItemCaption.Options.UseFont = true;
+ this.layoutControlItem1.AppearanceItemCaptionDisabled.Options.UseFont = true;
this.layoutControlItem1.Control = this.txt_gdbh;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.OptionsPrint.AppearanceItem.Options.UseFont = true;
this.layoutControlItem1.Size = new System.Drawing.Size(202, 34);
this.layoutControlItem1.Text = "宸ュ崟缂栧彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 18);
@@ -695,7 +699,6 @@
// simpleButton7
//
this.simpleButton7.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
- this.simpleButton7.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
this.simpleButton7.Appearance.Options.UseBackColor = true;
this.simpleButton7.Appearance.Options.UseFont = true;
this.simpleButton7.Location = new System.Drawing.Point(122, 154);
@@ -707,7 +710,6 @@
// simpleButton6
//
this.simpleButton6.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
- this.simpleButton6.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
this.simpleButton6.Appearance.Options.UseBackColor = true;
this.simpleButton6.Appearance.Options.UseFont = true;
this.simpleButton6.Location = new System.Drawing.Point(425, 154);
@@ -719,7 +721,6 @@
// simpleButton5
//
this.simpleButton5.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
- this.simpleButton5.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
this.simpleButton5.Appearance.Options.UseBackColor = true;
this.simpleButton5.Appearance.Options.UseFont = true;
this.simpleButton5.Location = new System.Drawing.Point(223, 154);
@@ -731,7 +732,6 @@
// simpleButton4
//
this.simpleButton4.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
- this.simpleButton4.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
this.simpleButton4.Appearance.Options.UseBackColor = true;
this.simpleButton4.Appearance.Options.UseFont = true;
this.simpleButton4.Location = new System.Drawing.Point(324, 154);
@@ -743,7 +743,6 @@
// simpleButton3
//
this.simpleButton3.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
- this.simpleButton3.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
this.simpleButton3.Appearance.Options.UseBackColor = true;
this.simpleButton3.Appearance.Options.UseFont = true;
this.simpleButton3.Location = new System.Drawing.Point(21, 154);
@@ -945,7 +944,6 @@
//
// gvMx2status
//
- this.gvMx2status.AppearanceCell.Options.UseFont = true;
this.gvMx2status.Caption = "宸ュ崟缂栧彿";
this.gvMx2status.FieldName = "gdbh";
this.gvMx2status.MinWidth = 10;
@@ -958,7 +956,6 @@
//
// gvMx2pbillNo
//
- this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true;
this.gvMx2pbillNo.Caption = "杩芥函鐮�";
this.gvMx2pbillNo.FieldName = "barCode";
this.gvMx2pbillNo.Name = "gvMx2pbillNo";
@@ -970,7 +967,6 @@
//
// gvMx2itemNo
//
- this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜";
this.gvMx2itemNo.FieldName = "itemNo";
this.gvMx2itemNo.Name = "gvMx2itemNo";
@@ -1011,7 +1007,6 @@
//
// gvMx2tlQty
//
- this.gvMx2tlQty.AppearanceCell.Options.UseFont = true;
this.gvMx2tlQty.Caption = "鍗曚綅";
this.gvMx2tlQty.FieldName = "dwName";
this.gvMx2tlQty.Name = "gvMx2tlQty";
@@ -1139,7 +1134,6 @@
//
// gridColumn8
//
- this.gridColumn8.AppearanceCell.Options.UseFont = true;
this.gridColumn8.Caption = "宸ュ崟缂栧彿";
this.gridColumn8.FieldName = "gdbh";
this.gridColumn8.MinWidth = 10;
@@ -1152,7 +1146,6 @@
//
// gridColumn9
//
- this.gridColumn9.AppearanceCell.Options.UseFont = true;
this.gridColumn9.Caption = "杩芥函鐮�";
this.gridColumn9.FieldName = "barCode";
this.gridColumn9.Name = "gridColumn9";
@@ -1164,7 +1157,6 @@
//
// gridColumn10
//
- this.gridColumn10.AppearanceCell.Options.UseFont = true;
this.gridColumn10.Caption = "鐗╂枡缂栫爜";
this.gridColumn10.FieldName = "itemNo";
this.gridColumn10.Name = "gridColumn10";
@@ -1207,7 +1199,6 @@
//
// gridColumn17
//
- this.gridColumn17.AppearanceCell.Options.UseFont = true;
this.gridColumn17.Caption = "鍗曚綅";
this.gridColumn17.FieldName = "dwName";
this.gridColumn17.Name = "gridColumn17";
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 70b698e..7e1079c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -47,6 +47,50 @@
public Frm_Work01(string _fGx, string _fBc, string _strinOther, int chkWater = 0)
{
InitializeComponent();
+ System.Drawing.Font ft1 = new System.Drawing.Font("瀹嬩綋", 35F);
+ System.Drawing.Font ft2 = new System.Drawing.Font("瀹嬩綋", 25F);
+ System.Drawing.Font ft3 = new System.Drawing.Font("瀹嬩綋", 20F);
+ System.Drawing.Font ft4 = new System.Drawing.Font("瀹嬩綋", 15F);
+ System.Drawing.Font ft5 = new System.Drawing.Font("瀹嬩綋", 12F);
+ //璁剧疆瀛椾綋澶у皬
+ this.btnGood.Appearance.Font = ft1;
+ this.btnBad.Appearance.Font = ft1;
+ this.simpleButton3.Appearance.Font =ft2;
+ this.simpleButton7.Appearance.Font =ft2;
+ this.simpleButton5.Appearance.Font =ft2;
+ this.simpleButton4.Appearance.Font =ft2;
+ this.simpleButton6.Appearance.Font =ft2;
+ this.gvMx1.Appearance.Row.Font = ft3;
+ this.gvMx2.Appearance.Row.Font = ft3;
+ this.layoutControlItem1.AppearanceItemCaption.Font = ft4;
+ this.layoutControlItem2.AppearanceItemCaption.Font = ft4;
+ this.layoutControlItem3.AppearanceItemCaption.Font = ft4;
+ this.layoutControlItem4.AppearanceItemCaption.Font = ft4;
+ this.layoutControlItem5.AppearanceItemCaption.Font = ft4;
+ this.layShuiJian.AppearanceItemCaption.Font = ft4;
+ this.layoutControlItem7.AppearanceItemCaption.Font = ft4;
+ this.layoutControlItem8.AppearanceItemCaption.Font = ft4;
+ this.layoutControlItem10.AppearanceItemCaption.Font = ft4;
+ this.layoutControlItem11.AppearanceItemCaption.Font = ft4;
+ this.layoutControlItem12.AppearanceItemCaption.Font = ft4;
+ this.layoutControlItem13.AppearanceItemCaption.Font = ft4;
+ this.layoutControlItem14.AppearanceItemCaption.Font = ft4;
+ this.layoutControlItem15.AppearanceItemCaption.Font = ft4;
+ this.txt_gdbh.Properties.Appearance.Font =ft5;
+ this.txt_itemNo.Properties.Appearance.Font =ft5;
+ this.txt_itemModel.Properties.Appearance.Font =ft5;
+ this.txt_gx.Properties.Appearance.Font =ft5;
+ this.txt_bc.Properties.Appearance.Font =ft5;
+ this.txt_itemName.Properties.Appearance.Font =ft5;
+ this.txt_yjDate.Properties.Appearance.Font =ft5;
+ this.txt_collectBy.Properties.Appearance.Font =ft5;
+ this.txt_sbNo.Properties.Appearance.Font =ft5;
+ this.txt_sjXt.Properties.Appearance.Font =ft5;
+ this.txt_sjDate.Properties.Appearance.Font =ft5;
+ this.txt_barCode.Properties.Appearance.Font =ft5;
+ this.txt_currentBarCode.Properties.Appearance.Font =ft5;
+ this.txt_gongWei.Properties.Appearance.Font =ft5;
+ this.txt_dianJianPath.Properties.Appearance.Font =ft5;
try
{
string _vanishingSeconds = chkWater.ToString();
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs
index 0ce8265..74fba48 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechniqueShow.cs
@@ -148,9 +148,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain.DataSource = null;
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
-
+ gcMain.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and org.fid in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
// var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), "workTechnique");
var pgq = new PageQueryModel(curPage, 5000, "item_no", "asc", "", _sbSqlWhere.ToString(), "workTechnique");
var json = JsonConvert.SerializeObject(pgq);
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 21b43e1..1a54d28 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -812,6 +812,12 @@
<Compile Include="DevFrm\Rpt\RptQT.Designer.cs">
<DependentUpon>RptQT.cs</DependentUpon>
</Compile>
+ <Compile Include="DevFrm\Rpt\SysTuiSong.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="DevFrm\Rpt\SysTuiSong.Designer.cs">
+ <DependentUpon>SysTuiSong.cs</DependentUpon>
+ </Compile>
<Compile Include="DevFrm\Rpt\UcRptCgdhd.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -1915,6 +1921,9 @@
<EmbeddedResource Include="DevFrm\Rpt\RptQT.resx">
<DependentUpon>RptQT.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="DevFrm\Rpt\SysTuiSong.resx">
+ <DependentUpon>SysTuiSong.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="DevFrm\Rpt\UcRptCgdhd.resx">
<DependentUpon>UcRptCgdhd.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSqLink.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSqLink.Designer.cs
index 71cfb7d..94bdb2e 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSqLink.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSqLink.Designer.cs
@@ -28,11 +28,11 @@
/// </summary>
private void InitializeComponent()
{
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -44,6 +44,7 @@
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.pageBar1 = new UserControls.Data.UcPageBar();
((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
this.panelControl2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -54,6 +55,7 @@
// panelControl2
//
this.panelControl2.Controls.Add(this.gcMain);
+ this.panelControl2.Controls.Add(this.pageBar1);
this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelControl2.Location = new System.Drawing.Point(0, 0);
this.panelControl2.Name = "panelControl2";
@@ -68,7 +70,7 @@
this.gcMain.Name = "gcMain";
this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMain.Size = new System.Drawing.Size(851, 687);
+ this.gcMain.Size = new System.Drawing.Size(851, 641);
this.gcMain.TabIndex = 6;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -103,7 +105,7 @@
this.gv_depotCode.MinWidth = 50;
this.gv_depotCode.Name = "gv_depotCode";
this.gv_depotCode.OptionsColumn.AllowEdit = false;
- this.gv_depotCode.Tag = "query_a.depot_code";
+ this.gv_depotCode.Tag = "a.id";
this.gv_depotCode.Width = 100;
//
// gv_depotName
@@ -115,7 +117,7 @@
this.gv_depotName.MinWidth = 50;
this.gv_depotName.Name = "gv_depotName";
this.gv_depotName.OptionsColumn.AllowEdit = false;
- this.gv_depotName.Tag = "query_a.depot_name";
+ this.gv_depotName.Tag = "a.item_no";
this.gv_depotName.Visible = true;
this.gv_depotName.VisibleIndex = 0;
this.gv_depotName.Width = 150;
@@ -138,8 +140,9 @@
this.gridColumn2.FieldName = "itemName";
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Tag = "a.item_name";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 2;
+ this.gridColumn2.VisibleIndex = 1;
this.gridColumn2.Width = 94;
//
// gridColumn4
@@ -148,18 +151,23 @@
this.gridColumn4.FieldName = "itemModel";
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Tag = "a.item_model";
this.gridColumn4.Visible = true;
this.gridColumn4.VisibleIndex = 3;
this.gridColumn4.Width = 94;
//
// gridColumn3
//
+ this.gridColumn3.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn3.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn3.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+ this.gridColumn3.AppearanceHeader.Options.UseForeColor = true;
this.gridColumn3.Caption = "搴撳瓨";
this.gridColumn3.FieldName = "kcQty";
this.gridColumn3.MinWidth = 25;
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 1;
+ this.gridColumn3.VisibleIndex = 2;
this.gridColumn3.Width = 94;
//
// gv_Btn
@@ -176,13 +184,25 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.checkbox2_16x16;
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
+ // pageBar1
+ //
+ this.pageBar1.CurrentPage = 1;
+ this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.pageBar1.Location = new System.Drawing.Point(2, 643);
+ this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6);
+ this.pageBar1.Name = "pageBar1";
+ this.pageBar1.RecordCount = 0;
+ this.pageBar1.Size = new System.Drawing.Size(851, 46);
+ this.pageBar1.TabIndex = 7;
+ this.pageBar1.TotalPages = 0;
//
// SelectMesCgthSqLink
//
@@ -217,5 +237,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private UserControls.Data.UcPageBar pageBar1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSqLink.cs b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSqLink.cs
index 042033a..b3d8c90 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectMesCgthSqLink.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectMesCgthSqLink.cs
@@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.Threading.Tasks;
using System.Web.UI.WebControls;
using System.Windows.Forms;
@@ -11,6 +12,7 @@
{
public partial class SelectMesCgthSqLink : DevExpress.XtraEditors.XtraForm
{
+ private List<FilterEntity> _filterList = new List<FilterEntity>();
public readonly string _webServiceName = "MesItemsManager/";
public string orgId = "";
/// <summary>
@@ -23,24 +25,36 @@
{
InitializeComponent();
this.orgId = _orgId;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", null, null, false);
+ this.pageBar1.setBar(false);
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
getPageList(1);
}
-
-
- /// <summary>
- /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
- /// </summary>
- public event EventHandler<UpdateParentEventArgs> UpdateParent;
-
- /// <summary>
- /// </summary>
- /// <param name="curPage">绗嚑椤�</param>
- /// <param name="pageSize">姣忛〉鍑犳潯</param>
+ #region 婧愮墿鏂欐暟鎹粦瀹�
+ private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ {
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ Task.Delay(100);
+ getPageList(1);
+ } /// <summary>
+ /// 鍒嗛〉浜嬩欢
+ /// </summary>
+ /// <param name="curPage"></param>
+ /// <param name="pageSize"></param>
+ private void PageBar1_PagerEvent(int curPage, int pageSize)
+ {
+ getPageList(curPage);
+ } /// <summary>
+ /// </summary>
+ /// <param name="curPage">绗嚑椤�</param>
+ /// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = " and a.FSubsidiary=" + orgId;
- var pgq = new PageQueryModel(curPage, 999999, "org.FNumber asc", "asc", "", _sbSqlWhere.ToString());
+ gcMain.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.FSubsidiary=" + orgId);
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
+ var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc", "asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
{
@@ -49,8 +63,10 @@
var dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
+
DataTable dt = dd.rtnData.list;
gcMain.BindingContext = new BindingContext();
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
if (dt.Rows.Count > 0)
{
gcMain.DataSource = dt;
@@ -59,6 +75,10 @@
}
else
UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+ pageBar1.CurrentPage = curPage;//褰撳墠椤�
+ pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
}
else
{
@@ -70,6 +90,16 @@
MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
+ #endregion
+
+
+
+ /// <summary>
+ /// 閫夋嫨鍚庣殑鍥炶皟浜嬩欢
+ /// </summary>
+ public event EventHandler<UpdateParentEventArgs> UpdateParent;
+
+
/// <summary>
/// 閫夋嫨鐗╂枡
/// </summary>
@@ -112,7 +142,7 @@
depotName = dr["depotName"].ToString(),//
});
UpdateParent?.Invoke(this, new UpdateParentEventArgs { DynamicList = list });
- Close();
+ // Close();
}
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs b/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs
index 84402df..2c93df2 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowLogcs.Designer.cs
@@ -34,8 +34,14 @@
this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_msg = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit2)).BeginInit();
this.SuspendLayout();
//
// gcMain
@@ -44,6 +50,9 @@
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
+ this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemMemoEdit1,
+ this.repositoryItemMemoEdit2});
this.gcMain.Size = new System.Drawing.Size(933, 590);
this.gcMain.TabIndex = 2;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -56,12 +65,15 @@
this.gv_operationTime,
this.gv_userName,
this.gv_operationTable,
- this.gv_msg});
+ this.gv_msg,
+ this.gridColumn1,
+ this.gridColumn2});
this.gridView1.GridControl = this.gcMain;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
+
//
// gv_operationTime
//
@@ -112,6 +124,33 @@
this.gv_msg.VisibleIndex = 2;
this.gv_msg.Width = 300;
//
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "鍙戦�丣son";
+ this.gridColumn1.ColumnEdit = this.repositoryItemMemoEdit1;
+ this.gridColumn1.FieldName = "sendJson";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Width = 94;
+ //
+ // repositoryItemMemoEdit1
+ //
+ this.repositoryItemMemoEdit1.LinesCount = 10;
+ this.repositoryItemMemoEdit1.Name = "repositoryItemMemoEdit1";
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "杩斿洖Json";
+ this.gridColumn2.ColumnEdit = this.repositoryItemMemoEdit2;
+ this.gridColumn2.FieldName = "rtnJson";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Width = 94;
+ //
+ // repositoryItemMemoEdit2
+ //
+ this.repositoryItemMemoEdit2.Name = "repositoryItemMemoEdit2";
+ //
// ShowLogcs
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -127,6 +166,8 @@
this.TopMost = true;
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit2)).EndInit();
this.ResumeLayout(false);
}
@@ -139,5 +180,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable;
private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
private DevExpress.XtraGrid.Columns.GridColumn gv_msg;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit2;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs b/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
index 1ef78f7..f22815e 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowLogcs.cs
@@ -12,15 +12,34 @@
{
public string guidKey;
- public ShowLogcs(string _guidKey)
+ public bool isLog;
+ public ShowLogcs(string _guidKey, bool _isLog = false)
{
this.guidKey = _guidKey;
+ this.isLog = _isLog;
InitializeComponent();
+ if (isLog == true)
+ {
+ gridColumn1.Visible = true;
+ gridColumn2.Visible = true;
+ gridColumn1.VisibleIndex = 99;
+ gridColumn2.VisibleIndex = 100;
+ this.gridView1.RowHeight = 150;
+ gv_msg.Visible = false;
+ gv_userName.Visible = false;
+ gridView1.OptionsView.ShowAutoFilterRow = false;
+ }
+ else
+ {
+ gv_msg.Visible = true;
+ gv_userName.Visible = true;
+ this.gridView1.RowHeight = -1;
+ gridView1.OptionsView.ShowAutoFilterRow = true;
+ }
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
-
}, null, false);
- getPageList(1,999999);
+ getPageList(1, 999999);
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 2de362f..8a055ea 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -202,7 +202,10 @@
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
- UserControl.ShowLogcs frm = new ShowLogcs(this.guidKey);
+ bool b = false;
+ if (this.Parent.Text == "鎺ㄩ�佹姤琛�")
+ b = true;
+ UserControl.ShowLogcs frm = new ShowLogcs(this.guidKey, b);
frm.ShowDialog();
}
--
Gitblit v1.9.3