From 114c2d502cb0cb094b2626f5056fef7ab9a2dfcb Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 14 三月 2025 08:32:52 +0800
Subject: [PATCH] toErp
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 3
DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs | 5
DevApp/Gs.DevApp/UserControl/SelectCgMx.cs | 13
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs | 630 ++++++++++++++++++++++++++++--------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 103 +++---
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | 147 +++++---
DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs | 105 ++++-
7 files changed, 717 insertions(+), 289 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 7d0197a..cb3bbb7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -586,27 +586,27 @@
this.btnSelect.Size = new System.Drawing.Size(116, 27);
this.btnSelect.StyleController = this.layoutMx1;
this.btnSelect.TabIndex = 443;
- this.btnSelect.Text = "閫夊緟鍏ヤ粨鐗╂枡 ";
+ this.btnSelect.Text = "閫夋嫨鐗╂枡 ";
//
// txtDepotsCode
//
- this.txtDepotsCode.Location = new System.Drawing.Point(416, 76);
+ this.txtDepotsCode.Location = new System.Drawing.Point(411, 76);
this.txtDepotsCode.Name = "txtDepotsCode";
this.txtDepotsCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txtDepotsCode.Properties.Appearance.Options.UseFont = true;
this.txtDepotsCode.Properties.Tag = "";
- this.txtDepotsCode.Size = new System.Drawing.Size(197, 28);
+ this.txtDepotsCode.Size = new System.Drawing.Size(191, 28);
this.txtDepotsCode.StyleController = this.layoutMx1;
this.txtDepotsCode.TabIndex = 454;
this.txtDepotsCode.Tag = "readOnly";
//
// txt_remark
//
- this.txt_remark.Location = new System.Drawing.Point(416, 108);
+ this.txt_remark.Location = new System.Drawing.Point(411, 108);
this.txt_remark.Name = "txt_remark";
this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_remark.Properties.Appearance.Options.UseFont = true;
- this.txt_remark.Size = new System.Drawing.Size(500, 28);
+ this.txt_remark.Size = new System.Drawing.Size(488, 28);
this.txt_remark.StyleController = this.layoutMx1;
this.txt_remark.TabIndex = 240;
//
@@ -615,17 +615,17 @@
this.txt_receiveOrgId.IsReadly = false;
this.txt_receiveOrgId.Location = new System.Drawing.Point(114, 44);
this.txt_receiveOrgId.Name = "txt_receiveOrgId";
- this.txt_receiveOrgId.Size = new System.Drawing.Size(196, 28);
+ this.txt_receiveOrgId.Size = new System.Drawing.Size(191, 28);
this.txt_receiveOrgId.TabIndex = 457;
//
// txtSupplierCode
//
- this.txtSupplierCode.Location = new System.Drawing.Point(416, 44);
+ this.txtSupplierCode.Location = new System.Drawing.Point(411, 44);
this.txtSupplierCode.Name = "txtSupplierCode";
this.txtSupplierCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txtSupplierCode.Properties.Appearance.Options.UseFont = true;
this.txtSupplierCode.Properties.Tag = "";
- this.txtSupplierCode.Size = new System.Drawing.Size(197, 28);
+ this.txtSupplierCode.Size = new System.Drawing.Size(191, 28);
this.txtSupplierCode.StyleController = this.layoutMx1;
this.txtSupplierCode.TabIndex = 451;
this.txtSupplierCode.Tag = "readOnly";
@@ -637,7 +637,7 @@
this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
this.txt_billNo.Properties.Tag = "";
- this.txt_billNo.Size = new System.Drawing.Size(196, 28);
+ this.txt_billNo.Size = new System.Drawing.Size(191, 28);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
this.txt_billNo.Tag = "readOnly";
@@ -648,7 +648,7 @@
this.txt_depotsId.Location = new System.Drawing.Point(114, 108);
this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0);
this.txt_depotsId.Name = "txt_depotsId";
- this.txt_depotsId.Size = new System.Drawing.Size(196, 28);
+ this.txt_depotsId.Size = new System.Drawing.Size(191, 28);
this.txt_depotsId.TabIndex = 445;
//
// txt_suppId
@@ -657,69 +657,70 @@
this.txt_suppId.Location = new System.Drawing.Point(114, 76);
this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
this.txt_suppId.Name = "txt_suppId";
- this.txt_suppId.Size = new System.Drawing.Size(196, 28);
+ this.txt_suppId.Size = new System.Drawing.Size(191, 28);
this.txt_suppId.TabIndex = 440;
//
// txt_fstatus
//
- this.txt_fstatus.Location = new System.Drawing.Point(920, 76);
+ this.txt_fstatus.Location = new System.Drawing.Point(903, 76);
this.txt_fstatus.Name = "txt_fstatus";
this.txt_fstatus.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_fstatus.Size = new System.Drawing.Size(299, 24);
+ this.txt_fstatus.Size = new System.Drawing.Size(295, 24);
this.txt_fstatus.StyleController = this.layoutMx1;
this.txt_fstatus.TabIndex = 458;
this.txt_fstatus.Tag = "readOnly";
//
// txt_fType
//
- this.txt_fType.Location = new System.Drawing.Point(314, 12);
+ this.txt_fType.Location = new System.Drawing.Point(309, 12);
this.txt_fType.Name = "txt_fType";
this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
- this.txt_fType.Size = new System.Drawing.Size(299, 24);
+ this.txt_fType.Size = new System.Drawing.Size(293, 24);
this.txt_fType.StyleController = this.layoutMx1;
this.txt_fType.TabIndex = 459;
+ this.txt_fType.Tag = "readOnly";
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(719, 12);
+ this.txt_createBy.Location = new System.Drawing.Point(708, 12);
this.txt_createBy.Name = "txt_createBy";
- this.txt_createBy.Size = new System.Drawing.Size(197, 24);
+ this.txt_createBy.Size = new System.Drawing.Size(191, 24);
this.txt_createBy.StyleController = this.layoutMx1;
this.txt_createBy.TabIndex = 461;
this.txt_createBy.Tag = "readOnly";
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(719, 44);
+ this.txt_createDate.Location = new System.Drawing.Point(708, 44);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(197, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(191, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 462;
this.txt_createDate.Tag = "readOnly";
//
// txt_checkUser
//
- this.txt_checkUser.Location = new System.Drawing.Point(1022, 12);
+ this.txt_checkUser.Location = new System.Drawing.Point(1005, 12);
this.txt_checkUser.Name = "txt_checkUser";
- this.txt_checkUser.Size = new System.Drawing.Size(197, 24);
+ this.txt_checkUser.Size = new System.Drawing.Size(193, 24);
this.txt_checkUser.StyleController = this.layoutMx1;
this.txt_checkUser.TabIndex = 463;
this.txt_checkUser.Tag = "readOnly";
//
// txt_checkDate
//
- this.txt_checkDate.Location = new System.Drawing.Point(1022, 44);
+ this.txt_checkDate.Location = new System.Drawing.Point(1005, 44);
this.txt_checkDate.Name = "txt_checkDate";
- this.txt_checkDate.Size = new System.Drawing.Size(197, 24);
+ this.txt_checkDate.Size = new System.Drawing.Size(193, 24);
this.txt_checkDate.StyleController = this.layoutMx1;
this.txt_checkDate.TabIndex = 464;
this.txt_checkDate.Tag = "readOnly";
//
// txt_paperBillNo
//
- this.txt_paperBillNo.Location = new System.Drawing.Point(719, 76);
+ this.txt_paperBillNo.Location = new System.Drawing.Point(708, 76);
this.txt_paperBillNo.Name = "txt_paperBillNo";
- this.txt_paperBillNo.Size = new System.Drawing.Size(197, 24);
+ this.txt_paperBillNo.Size = new System.Drawing.Size(191, 24);
this.txt_paperBillNo.StyleController = this.layoutMx1;
this.txt_paperBillNo.TabIndex = 465;
//
@@ -806,7 +807,7 @@
rowDefinition3,
rowDefinition4,
rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1231, 180);
+ this.Root.Size = new System.Drawing.Size(1210, 180);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -815,7 +816,7 @@
this.layoutControlItem1.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem1.Name = "layoutControlItem1";
this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem1.Size = new System.Drawing.Size(302, 32);
+ this.layoutControlItem1.Size = new System.Drawing.Size(297, 32);
this.layoutControlItem1.Text = "鏀舵枡缁勭粐";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
@@ -824,7 +825,7 @@
this.layoutControlItem2.Control = this.txt_billNo;
this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.Size = new System.Drawing.Size(302, 32);
+ this.layoutControlItem2.Size = new System.Drawing.Size(297, 32);
this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
@@ -834,7 +835,7 @@
this.layoutControlItem3.Location = new System.Drawing.Point(0, 64);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(302, 32);
+ this.layoutControlItem3.Size = new System.Drawing.Size(297, 32);
this.layoutControlItem3.Text = "閫変緵搴斿晢";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
@@ -844,7 +845,7 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 96);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(302, 32);
+ this.layoutControlItem4.Size = new System.Drawing.Size(297, 32);
this.layoutControlItem4.Text = "閫夋嫨浠撳簱";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
@@ -856,7 +857,7 @@
this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem16.Size = new System.Drawing.Size(302, 32);
+ this.layoutControlItem16.Size = new System.Drawing.Size(297, 32);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "閫夋嫨鐗╂枡";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -865,53 +866,53 @@
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_createBy;
- this.layoutControlItem11.Location = new System.Drawing.Point(605, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(594, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(303, 32);
+ this.layoutControlItem11.Size = new System.Drawing.Size(297, 32);
this.layoutControlItem11.Text = "寤虹珛浜�";
this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_createDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(605, 32);
+ this.layoutControlItem12.Location = new System.Drawing.Point(594, 32);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem12.Size = new System.Drawing.Size(303, 32);
+ this.layoutControlItem12.Size = new System.Drawing.Size(297, 32);
this.layoutControlItem12.Text = "寤虹珛鏃ユ湡";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_checkUser;
- this.layoutControlItem13.Location = new System.Drawing.Point(908, 0);
+ this.layoutControlItem13.Location = new System.Drawing.Point(891, 0);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(303, 32);
+ this.layoutControlItem13.Size = new System.Drawing.Size(299, 32);
this.layoutControlItem13.Text = "鎻愪氦妫�楠屼汉";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_checkDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(908, 32);
+ this.layoutControlItem14.Location = new System.Drawing.Point(891, 32);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(303, 32);
+ this.layoutControlItem14.Size = new System.Drawing.Size(299, 32);
this.layoutControlItem14.Text = "鎻愪氦妫�楠屾棩鏈�";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_fstatus;
- this.layoutControlItem7.Location = new System.Drawing.Point(908, 64);
+ this.layoutControlItem7.Location = new System.Drawing.Point(891, 64);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(303, 32);
+ this.layoutControlItem7.Size = new System.Drawing.Size(299, 32);
this.layoutControlItem7.Text = "鎻愪氦妫�楠�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem7.TextVisible = false;
@@ -919,10 +920,10 @@
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fType;
- this.layoutControlItem8.Location = new System.Drawing.Point(302, 0);
+ this.layoutControlItem8.Location = new System.Drawing.Point(297, 0);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(303, 32);
+ this.layoutControlItem8.Size = new System.Drawing.Size(297, 32);
this.layoutControlItem8.Text = "濮斿鏍囪瘑";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
@@ -930,45 +931,45 @@
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txtSupplierCode;
- this.layoutControlItem5.Location = new System.Drawing.Point(302, 32);
+ this.layoutControlItem5.Location = new System.Drawing.Point(297, 32);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(303, 32);
+ this.layoutControlItem5.Size = new System.Drawing.Size(297, 32);
this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鐮�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txtDepotsCode;
- this.layoutControlItem6.Location = new System.Drawing.Point(302, 64);
+ this.layoutControlItem6.Location = new System.Drawing.Point(297, 64);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(303, 32);
+ this.layoutControlItem6.Size = new System.Drawing.Size(297, 32);
this.layoutControlItem6.Text = "浠撳簱缂栫爜";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_remark;
- this.layoutControlItem17.Location = new System.Drawing.Point(302, 96);
+ this.layoutControlItem17.Location = new System.Drawing.Point(297, 96);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem17.Size = new System.Drawing.Size(606, 32);
+ this.layoutControlItem17.Size = new System.Drawing.Size(594, 32);
this.layoutControlItem17.Text = "澶囨敞淇℃伅";
this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
// lab_paperBillNo
//
this.lab_paperBillNo.Control = this.txt_paperBillNo;
- this.lab_paperBillNo.Location = new System.Drawing.Point(605, 64);
+ this.lab_paperBillNo.Location = new System.Drawing.Point(594, 64);
this.lab_paperBillNo.Name = "lab_paperBillNo";
this.lab_paperBillNo.OptionsTableLayoutItem.ColumnIndex = 2;
this.lab_paperBillNo.OptionsTableLayoutItem.RowIndex = 2;
- this.lab_paperBillNo.Size = new System.Drawing.Size(303, 32);
+ this.lab_paperBillNo.Size = new System.Drawing.Size(297, 32);
this.lab_paperBillNo.Text = "閫佽揣鍗曞彿";
this.lab_paperBillNo.TextSize = new System.Drawing.Size(90, 18);
//
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index f739e3c..a8e87da 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -82,7 +82,7 @@
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨渚涘簲鍟嗭紝鎵嶈兘閫夋嫨鏉ユ枡鏄庣粏锛�");
return;
}
- var frm = new SelectCgMx(this.txt_suppId.GetId(), txt_receiveOrgId.GetId(), (txt_fType.Checked == true ? 2 : 1).ToString());
+ var frm = new SelectCgMx(this.txt_suppId.GetId(), txt_receiveOrgId.GetId());
//璧嬪�肩粰鏄庣粏琛�
frm.UpdateParent += (ss, ee) =>
{
@@ -345,7 +345,6 @@
Remark = txt_remark.Text.Trim(), //澶囨敞
SuppId = _gysId, //渚涘簲鍟�
DepotsId = _ckId,//浠撳簱
- FType = txt_fType.Checked ? 1 : 0,//0=閲囪喘锛�1=濮斿
OrgId = _orgId,
list = new List<dynamic>(),
};
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
index 67a273d..b0bf6e3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.Designer.cs
@@ -29,43 +29,185 @@
/// </summary>
private void InitializeComponent()
{
- this.gv_msg = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
+ 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
- this.gcMain = new DevExpress.XtraGrid.GridControl();
- this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
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_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_msg = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
+ this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
this.pageBar1 = new UserControls.Data.UcPageBar();
- ((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.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layoutMx1 = new DevExpress.XtraDataLayout.DataLayoutControl();
+ this.lbGuid = new System.Windows.Forms.Label();
+ this.txt_userName = new DevExpress.XtraEditors.TextEdit();
+ this.txt_operationTime = new DevExpress.XtraEditors.TextEdit();
+ this.txt_operationTable = new DevExpress.XtraEditors.TextEdit();
+ this.txt_abtHno = new DevExpress.XtraEditors.TextEdit();
+ this.txt_rtnJson = new DevExpress.XtraEditors.MemoEdit();
+ this.txt_msg = new DevExpress.XtraEditors.MemoEdit();
+ this.txt_sendJson = new DevExpress.XtraEditors.MemoEdit();
+ this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
((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();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit2)).BeginInit();
+ this.xtraTabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
+ this.splitMx1.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
+ this.splitMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
+ this.layoutMx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_operationTime.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_operationTable.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_abtHno.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_rtnJson.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sendJson.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
this.SuspendLayout();
//
- // gv_msg
+ // toolBarMenu1
//
- this.gv_msg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_msg.AppearanceCell.Options.UseFont = true;
- this.gv_msg.Caption = "鎿嶄綔璇︽儏";
- this.gv_msg.FieldName = "msg";
- this.gv_msg.MaxWidth = 800;
- this.gv_msg.Name = "gv_msg";
- this.gv_msg.OptionsColumn.AllowEdit = false;
- this.gv_msg.Tag = "query_MSG";
- this.gv_msg.Visible = true;
- this.gv_msg.VisibleIndex = 3;
- this.gv_msg.Width = 20;
+ this.toolBarMenu1.chkParameter = null;
+ this.toolBarMenu1.currentAction = null;
+ this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.toolBarMenu1.guidKey = null;
+ this.toolBarMenu1.isSetBtn = false;
+ this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+ this.toolBarMenu1.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,
+ this.xtraTabPage2});
+ //
+ // 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.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.Size = new System.Drawing.Size(1126, 570);
+ this.split1.SplitterPosition = 558;
+ this.split1.TabIndex = 0;
+ //
+ // gcMain1
+ //
+ this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain1.Location = new System.Drawing.Point(0, 0);
+ this.gcMain1.MainView = this.gridView1;
+ this.gcMain1.Name = "gcMain1";
+ this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemMemoEdit1,
+ this.repositoryItemMemoEdit2});
+ 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.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gridView1.Appearance.Row.Options.UseFont = true;
+ this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gv_operationTime,
+ this.gv_userName,
+ this.gv_operationTable,
+ this.gridColumn1,
+ this.gv_msg});
+ this.gridView1.GridControl = this.gcMain1;
+ this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsFind.ShowSearchNavButtons = false;
+ this.gridView1.OptionsView.ShowAutoFilterRow = true;
+ this.gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gv_operationTime
+ //
+ this.gv_operationTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_operationTime.AppearanceCell.Options.UseFont = true;
+ this.gv_operationTime.Caption = "鎿嶄綔鏃堕棿";
+ this.gv_operationTime.FieldName = "operationTime";
+ this.gv_operationTime.Name = "gv_operationTime";
+ this.gv_operationTime.OptionsColumn.AllowEdit = false;
+ this.gv_operationTime.Tag = "query_OPERATION_TIME";
+ this.gv_operationTime.Visible = true;
+ this.gv_operationTime.VisibleIndex = 0;
+ this.gv_operationTime.Width = 180;
//
// gv_userName
//
@@ -91,67 +233,6 @@
this.gv_operationTable.Tag = "query_OPERATION_TABLE";
this.gv_operationTable.Width = 100;
//
- // gv_operationTime
- //
- this.gv_operationTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_operationTime.AppearanceCell.Options.UseFont = true;
- this.gv_operationTime.Caption = "鎿嶄綔鏃堕棿";
- this.gv_operationTime.FieldName = "operationTime";
- this.gv_operationTime.Name = "gv_operationTime";
- this.gv_operationTime.OptionsColumn.AllowEdit = false;
- this.gv_operationTime.Tag = "query_OPERATION_TIME";
- this.gv_operationTime.Visible = true;
- this.gv_operationTime.VisibleIndex = 0;
- this.gv_operationTime.Width = 180;
- //
- // toolBarMenu1
- //
- this.toolBarMenu1.chkParameter = null;
- this.toolBarMenu1.currentAction = null;
- this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
- this.toolBarMenu1.guidKey = null;
- this.toolBarMenu1.isSetBtn = false;
- this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
- this.toolBarMenu1.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;
- //
- // gcMain
- //
- this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gcMain.Location = new System.Drawing.Point(0, 0);
- this.gcMain.MainView = this.gridView1;
- this.gcMain.Name = "gcMain";
- this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemMemoEdit1,
- this.repositoryItemMemoEdit2});
- this.gcMain.Size = new System.Drawing.Size(1126, 531);
- this.gcMain.TabIndex = 1;
- this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gridView1});
- //
- // gridView1
- //
- this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gridView1.Appearance.Row.Options.UseFont = true;
- this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gv_operationTime,
- this.gv_userName,
- this.gv_operationTable,
- this.gridColumn1,
- this.gv_msg,
- this.gridColumn2,
- this.gridColumn3});
- this.gridView1.GridControl = this.gcMain;
- this.gridView1.Name = "gridView1";
- this.gridView1.OptionsFind.ShowSearchNavButtons = false;
- this.gridView1.OptionsView.ShowAutoFilterRow = true;
- this.gridView1.OptionsView.ShowGroupPanel = false;
- //
// gridColumn1
//
this.gridColumn1.Caption = "鐩稿叧鍗曞彿";
@@ -162,68 +243,285 @@
this.gridColumn1.VisibleIndex = 2;
this.gridColumn1.Width = 94;
//
- // gridColumn2
+ // gv_msg
//
- this.gridColumn2.Caption = "鍙戦�丣SON";
- this.gridColumn2.ColumnEdit = this.repositoryItemMemoEdit1;
- this.gridColumn2.FieldName = "sendJson";
- this.gridColumn2.MaxWidth = 300;
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 4;
- this.gridColumn2.Width = 94;
+ this.gv_msg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gv_msg.AppearanceCell.Options.UseFont = true;
+ this.gv_msg.Caption = "鎿嶄綔璇︽儏";
+ this.gv_msg.FieldName = "msg";
+ this.gv_msg.MaxWidth = 800;
+ this.gv_msg.Name = "gv_msg";
+ this.gv_msg.OptionsColumn.AllowEdit = false;
+ this.gv_msg.Tag = "query_MSG";
+ this.gv_msg.Visible = true;
+ this.gv_msg.VisibleIndex = 3;
+ this.gv_msg.Width = 20;
//
// repositoryItemMemoEdit1
//
this.repositoryItemMemoEdit1.Name = "repositoryItemMemoEdit1";
//
- // gridColumn3
- //
- this.gridColumn3.Caption = "杩斿洖JSON";
- this.gridColumn3.ColumnEdit = this.repositoryItemMemoEdit2;
- this.gridColumn3.FieldName = "rtnJson";
- this.gridColumn3.MaxWidth = 300;
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 5;
- this.gridColumn3.Width = 94;
- //
// repositoryItemMemoEdit2
//
this.repositoryItemMemoEdit2.Name = "repositoryItemMemoEdit2";
- //
- // 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.gcMain);
- this.xtraTabPage1.Controls.Add(this.pageBar1);
- this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
- this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// pageBar1
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 531);
+ 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 = 3;
+ this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
+ //
+ // xtraTabPage2
+ //
+ this.xtraTabPage2.Controls.Add(this.splitMx1);
+ this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+ this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
+ //
+ // splitMx1
+ //
+ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitMx1.Horizontal = false;
+ this.splitMx1.Location = new System.Drawing.Point(0, 0);
+ this.splitMx1.Name = "splitMx1";
+ //
+ // splitMx1.Panel1
+ //
+ this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
+ this.splitMx1.Panel1.Text = "Panel1";
+ //
+ // splitMx1.Panel2
+ //
+ this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.Size = new System.Drawing.Size(1126, 570);
+ this.splitMx1.SplitterPosition = 192;
+ this.splitMx1.TabIndex = 0;
+ //
+ // layoutMx1
+ //
+ this.layoutMx1.Controls.Add(this.lbGuid);
+ this.layoutMx1.Controls.Add(this.txt_userName);
+ this.layoutMx1.Controls.Add(this.txt_operationTime);
+ this.layoutMx1.Controls.Add(this.txt_operationTable);
+ this.layoutMx1.Controls.Add(this.txt_abtHno);
+ this.layoutMx1.Controls.Add(this.txt_rtnJson);
+ this.layoutMx1.Controls.Add(this.txt_msg);
+ this.layoutMx1.Controls.Add(this.txt_sendJson);
+ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem8});
+ this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+ this.layoutMx1.Name = "layoutMx1";
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(733, 279, 812, 500);
+ this.layoutMx1.Root = this.Root;
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 192);
+ this.layoutMx1.TabIndex = 0;
+ this.layoutMx1.Text = "dataLayoutControl1";
+ //
+ // lbGuid
+ //
+ this.lbGuid.Location = new System.Drawing.Point(840, 42);
+ this.lbGuid.Name = "lbGuid";
+ this.lbGuid.Size = new System.Drawing.Size(274, 27);
+ this.lbGuid.TabIndex = 13;
+ this.lbGuid.Text = "label1";
+ //
+ // txt_userName
+ //
+ this.txt_userName.Location = new System.Drawing.Point(89, 12);
+ this.txt_userName.Name = "txt_userName";
+ this.txt_userName.Size = new System.Drawing.Size(195, 24);
+ this.txt_userName.StyleController = this.layoutMx1;
+ this.txt_userName.TabIndex = 4;
+ //
+ // txt_operationTime
+ //
+ this.txt_operationTime.Location = new System.Drawing.Point(365, 12);
+ this.txt_operationTime.Name = "txt_operationTime";
+ this.txt_operationTime.Size = new System.Drawing.Size(195, 24);
+ this.txt_operationTime.StyleController = this.layoutMx1;
+ this.txt_operationTime.TabIndex = 5;
+ //
+ // txt_operationTable
+ //
+ this.txt_operationTable.Location = new System.Drawing.Point(641, 12);
+ this.txt_operationTable.Name = "txt_operationTable";
+ this.txt_operationTable.Size = new System.Drawing.Size(195, 24);
+ this.txt_operationTable.StyleController = this.layoutMx1;
+ this.txt_operationTable.TabIndex = 6;
+ //
+ // txt_abtHno
+ //
+ this.txt_abtHno.Location = new System.Drawing.Point(917, 12);
+ this.txt_abtHno.Name = "txt_abtHno";
+ this.txt_abtHno.Size = new System.Drawing.Size(197, 24);
+ this.txt_abtHno.StyleController = this.layoutMx1;
+ this.txt_abtHno.TabIndex = 7;
+ //
+ // txt_rtnJson
+ //
+ this.txt_rtnJson.Location = new System.Drawing.Point(89, 126);
+ this.txt_rtnJson.Name = "txt_rtnJson";
+ this.txt_rtnJson.Size = new System.Drawing.Size(1025, 54);
+ this.txt_rtnJson.StyleController = this.layoutMx1;
+ this.txt_rtnJson.TabIndex = 10;
+ //
+ // txt_msg
+ //
+ this.txt_msg.Location = new System.Drawing.Point(89, 40);
+ this.txt_msg.Name = "txt_msg";
+ this.txt_msg.Size = new System.Drawing.Size(1025, 24);
+ this.txt_msg.StyleController = this.layoutMx1;
+ this.txt_msg.TabIndex = 11;
+ //
+ // txt_sendJson
+ //
+ this.txt_sendJson.Location = new System.Drawing.Point(89, 68);
+ this.txt_sendJson.Name = "txt_sendJson";
+ this.txt_sendJson.Size = new System.Drawing.Size(1025, 54);
+ this.txt_sendJson.StyleController = this.layoutMx1;
+ this.txt_sendJson.TabIndex = 12;
+ //
+ // Root
+ //
+ this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.Root.GroupBordersVisible = false;
+ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem1,
+ this.layoutControlItem2,
+ this.layoutControlItem3,
+ this.layoutControlItem4,
+ this.layoutControlItem5,
+ this.layoutControlItem6,
+ this.layoutControlItem7});
+ this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.Root.Name = "Root";
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
+ this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
+ this.Root.Size = new System.Drawing.Size(1126, 192);
+ this.Root.TextVisible = false;
+ //
+ // layoutControlItem1
+ //
+ this.layoutControlItem1.Control = this.txt_userName;
+ this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem1.Name = "layoutControlItem1";
+ this.layoutControlItem1.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem1.Text = "鎿嶄綔浜哄憳";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem2
+ //
+ this.layoutControlItem2.Control = this.txt_operationTime;
+ 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(276, 28);
+ this.layoutControlItem2.Text = "鎿嶄綔鏃堕棿";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_operationTable;
+ 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(276, 28);
+ this.layoutControlItem3.Text = "鐩稿叧琛�";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem4
+ //
+ this.layoutControlItem4.Control = this.txt_abtHno;
+ this.layoutControlItem4.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem4.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem4.Text = "鐩稿叧鍗曞彿";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_msg;
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 4;
+ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem5.Size = new System.Drawing.Size(1106, 28);
+ this.layoutControlItem5.Text = "鎿嶄綔璇︽儏";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.lbGuid;
+ this.layoutControlItem8.Location = new System.Drawing.Point(828, 30);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem8.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem8.Text = "lbGuid";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem8.TextVisible = false;
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_sendJson;
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnSpan = 4;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowSpan = 2;
+ this.layoutControlItem6.Size = new System.Drawing.Size(1106, 58);
+ this.layoutControlItem6.Text = "鍙戦�丣SON";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(65, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_rtnJson;
+ this.layoutControlItem7.Location = new System.Drawing.Point(0, 114);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 4;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowSpan = 2;
+ this.layoutControlItem7.Size = new System.Drawing.Size(1106, 58);
+ this.layoutControlItem7.Text = "杩斿洖JSON";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(65, 18);
//
// SysLog
//
@@ -234,31 +532,79 @@
this.Controls.Add(this.toolBarMenu1);
this.Name = "SysLog";
this.Text = "绯荤粺鏃ュ織";
- ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit2)).EndInit();
((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();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit2)).EndInit();
+ this.xtraTabPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
+ this.splitMx1.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
+ this.splitMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
+ this.layoutMx1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_userName.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_operationTime.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_operationTable.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_abtHno.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_rtnJson.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_sendJson.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
this.ResumeLayout(false);
}
#endregion
private UserControl.UcToolBarMenu toolBarMenu1;
- private DevExpress.XtraGrid.GridControl gcMain;
- private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private UserControls.Data.UcPageBar pageBar1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_msg;
+ private DevExpress.XtraEditors.SplitContainerControl split1;
+ private DevExpress.XtraGrid.GridControl gcMain1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_operationTime;
private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable;
- private DevExpress.XtraGrid.Columns.GridColumn gv_operationTime;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_msg;
private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit2;
+ private UserControls.Data.UcPageBar pageBar1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraEditors.SplitContainerControl splitMx1;
+ private DevExpress.XtraDataLayout.DataLayoutControl layoutMx1;
+ private DevExpress.XtraLayout.LayoutControlGroup Root;
+ private DevExpress.XtraEditors.TextEdit txt_userName;
+ private DevExpress.XtraEditors.TextEdit txt_operationTime;
+ private DevExpress.XtraEditors.TextEdit txt_operationTable;
+ private DevExpress.XtraEditors.TextEdit txt_abtHno;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraEditors.MemoEdit txt_rtnJson;
+ private DevExpress.XtraEditors.MemoEdit txt_msg;
+ private DevExpress.XtraEditors.MemoEdit txt_sendJson;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private System.Windows.Forms.Label lbGuid;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
index 4158fef..48879fa 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/SysLog.cs
@@ -8,32 +8,43 @@
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
namespace Gs.DevApp.DevFrm.Sys
{
public partial class SysLog : XtraForm
{
+ string _webServiceName = "SysLog/";
private List<FilterEntity> _filterList = new List<FilterEntity>();
public SysLog()
{
InitializeComponent();
- toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
- toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gridView1);
- Gs.DevApp.ToolBox.UtilityHelper.getGridViewConfig(this.GetType().FullName, gvList);
+ this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
+ this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+ this.toolBarMenu1.getXmlConfig();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, null, "", (value) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
+ });
+ Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
+ {
+ getModel(value);
+ }, (value) =>
+ {
+ getPageList(this.pageBar1.CurrentPage);
+ });
getPageList(1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
}
- private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
+ private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
- Task.Delay(100);
+ await Task.Delay(100);
getPageList(1);
}
+
/// <summary>
- /// 鍒嗛〉浜嬩欢
+ /// 鍒嗛〉浜嬩欢
/// </summary>
/// <param name="curPage"></param>
/// <param name="pageSize"></param>
@@ -41,9 +52,8 @@
{
getPageList(curPage);
}
-
/// <summary>
- /// 鏌ヨ浜嬩欢
+ /// 鏌ヨ浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -56,9 +66,8 @@
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
-
/// <summary>
- /// 鏌ヨ鍥炶皟
+ /// 鏌ヨ鍥炶皟
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
@@ -69,43 +78,55 @@
}
/// <summary>
- /// 鍒锋柊浜嬩欢
+ /// 鍒锋柊浜嬩欢
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- getPageList(this.pageBar1.CurrentPage);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ getModel(lbGuid.Text.Trim());
+ else
+ {
+ //_filterList.Clear();
+ //if (gridView1.ActiveFilter.Count > 0)
+ //{
+ // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ // gridView1.ActiveFilter.Clear();
+ // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ //}
+ //getPageList(1);
+ getPageList(this.pageBar1.CurrentPage);
+ }
}
/// <summary>
+ ///
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "OPERATION_TIME",
- "desc", "", _sbSqlWhere.ToString());
- var json = JsonConvert.SerializeObject(pgq);
+ PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "OPERATION_TIME", "desc,ABT_HNO desc", "", _sbSqlWhere.ToString());
+ string json = JsonConvert.SerializeObject(pgq);
try
{
- var strReturn =
- UtilityHelper.HttpPost("", "SysLog/GetListPage", json);
- var dd = UtilityHelper.ReturnToTablePage(strReturn);
+ var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPage", json);
+ ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
+ gcMain1.BindingContext = new BindingContext();
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
if (dt.Rows.Count > 0)
{
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
gridView1.BestFitColumns();
}
else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
@@ -118,7 +139,39 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ private void getModel(string strGuid)
+ {
+ bool isEdit = false;
+ if (toolBarMenu1.currentAction == "add") return;
+ if (toolBarMenu1.currentAction == "edit") isEdit = true;
+ if (string.IsNullOrEmpty(strGuid))
+ {
+ ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ var _obj = new
+ {
+ guid = strGuid,//涓诲缓
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ dynamic dy = _rtn.rtnData;
+ lbGuid.Text = strGuid;
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
+ }
+ else
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
index 29f6147..9e75f06 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_ProductionOrder.cs
@@ -195,10 +195,5 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
- private void lb_storageLowerLimit_Click(object sender, EventArgs e)
- {
-
- }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index 2df1456..58ecc10 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -29,6 +29,7 @@
/// </summary>
private void InitializeComponent()
{
+ this.panelControl2 = new DevExpress.XtraEditors.PanelControl();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gv_chk = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -48,30 +49,44 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
- this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.panelControl3 = new DevExpress.XtraEditors.PanelControl();
+ this.label1 = new System.Windows.Forms.Label();
+ this.radioGroup1 = new DevExpress.XtraEditors.RadioGroup();
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
this.btnIn = new DevExpress.XtraEditors.SimpleButton();
this.pageBar1 = new UserControls.Data.UcPageBar();
- this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).BeginInit();
+ this.panelControl2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
- this.xtraTabControl1.SuspendLayout();
- this.xtraTabPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl3)).BeginInit();
+ this.panelControl3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.radioGroup1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
this.panelControl1.SuspendLayout();
this.SuspendLayout();
+ //
+ // panelControl2
+ //
+ this.panelControl2.Controls.Add(this.gcMain);
+ this.panelControl2.Controls.Add(this.panelControl3);
+ this.panelControl2.Controls.Add(this.panelControl1);
+ this.panelControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.panelControl2.Location = new System.Drawing.Point(0, 0);
+ this.panelControl2.Name = "panelControl2";
+ this.panelControl2.Size = new System.Drawing.Size(1128, 682);
+ this.panelControl2.TabIndex = 4;
//
// gcMain
//
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gcMain.Location = new System.Drawing.Point(0, 0);
+ this.gcMain.Location = new System.Drawing.Point(2, 40);
this.gcMain.MainView = this.gridView1;
this.gcMain.Name = "gcMain";
- this.gcMain.Size = new System.Drawing.Size(1126, 607);
- this.gcMain.TabIndex = 1;
+ this.gcMain.Size = new System.Drawing.Size(1124, 597);
+ this.gcMain.TabIndex = 2;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
//
@@ -325,34 +340,55 @@
this.gridColumn8.OptionsColumn.ReadOnly = true;
this.gridColumn8.Width = 50;
//
- // xtraTabControl1
+ // gridColumn1
//
- this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.xtraTabControl1.Location = new System.Drawing.Point(0, 0);
- this.xtraTabControl1.Name = "xtraTabControl1";
- this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1128, 682);
- this.xtraTabControl1.TabIndex = 3;
- this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage1});
+ this.gridColumn1.Caption = "鍗曟嵁绫诲瀷";
+ this.gridColumn1.FieldName = "documentTypeTxt";
+ this.gridColumn1.MinWidth = 25;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 14;
+ this.gridColumn1.Width = 60;
//
- // xtraTabPage1
+ // panelControl3
//
- this.xtraTabPage1.Controls.Add(this.gcMain);
- this.xtraTabPage1.Controls.Add(this.panelControl1);
- this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1126, 650);
- this.xtraTabPage1.Text = "璇烽�夋嫨閲囬渶瑕佸叆搴撶殑鏁版嵁";
+ this.panelControl3.Controls.Add(this.label1);
+ this.panelControl3.Controls.Add(this.radioGroup1);
+ this.panelControl3.Dock = System.Windows.Forms.DockStyle.Top;
+ this.panelControl3.Location = new System.Drawing.Point(2, 2);
+ this.panelControl3.Name = "panelControl3";
+ this.panelControl3.Size = new System.Drawing.Size(1124, 38);
+ this.panelControl3.TabIndex = 6;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(54, 11);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(128, 18);
+ this.label1.TabIndex = 1;
+ this.label1.Text = "閫夋嫨閲囪喘鍗曠被鍨嬶細";
+ //
+ // radioGroup1
+ //
+ this.radioGroup1.EditValue = ((short)(0));
+ this.radioGroup1.Location = new System.Drawing.Point(189, 4);
+ this.radioGroup1.Name = "radioGroup1";
+ this.radioGroup1.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(((short)(0)), "閲囪喘"),
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(((short)(1)), "濮斿")});
+ this.radioGroup1.Size = new System.Drawing.Size(197, 34);
+ this.radioGroup1.TabIndex = 0;
//
// panelControl1
//
this.panelControl1.Controls.Add(this.btnIn);
this.panelControl1.Controls.Add(this.pageBar1);
this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panelControl1.Location = new System.Drawing.Point(0, 607);
+ this.panelControl1.Location = new System.Drawing.Point(2, 637);
this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(1126, 43);
- this.panelControl1.TabIndex = 4;
+ this.panelControl1.Size = new System.Drawing.Size(1124, 43);
+ this.panelControl1.TabIndex = 5;
//
// btnIn
//
@@ -368,7 +404,7 @@
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Right;
- this.pageBar1.Location = new System.Drawing.Point(140, 2);
+ this.pageBar1.Location = new System.Drawing.Point(138, 2);
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
@@ -376,22 +412,12 @@
this.pageBar1.TabIndex = 3;
this.pageBar1.TotalPages = 0;
//
- // gridColumn1
- //
- this.gridColumn1.Caption = "鍗曟嵁绫诲瀷";
- this.gridColumn1.FieldName = "documentTypeTxt";
- this.gridColumn1.MinWidth = 25;
- this.gridColumn1.Name = "gridColumn1";
- this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 14;
- this.gridColumn1.Width = 60;
- //
// SelectCgMx
//
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.panelControl2);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
this.MinimizeBox = false;
@@ -399,41 +425,46 @@
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏";
this.TopMost = true;
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl2)).EndInit();
+ this.panelControl2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
- this.xtraTabControl1.ResumeLayout(false);
- this.xtraTabPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.panelControl3)).EndInit();
+ this.panelControl3.ResumeLayout(false);
+ this.panelControl3.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.radioGroup1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
this.panelControl1.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
+ private DevExpress.XtraEditors.PanelControl panelControl2;
private DevExpress.XtraGrid.GridControl gcMain;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
- private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
- private UserControls.Data.UcPageBar pageBar1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_ebelnK3id;
- private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
- private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
- private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
- private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
- private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
private DevExpress.XtraGrid.Columns.GridColumn gv_chk;
- private DevExpress.XtraEditors.PanelControl panelControl1;
- private DevExpress.XtraEditors.SimpleButton btnIn;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_ebelnK3id;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemCode;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_supplierItemName;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseUnit;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraEditors.PanelControl panelControl3;
+ private DevExpress.XtraEditors.RadioGroup radioGroup1;
+ private DevExpress.XtraEditors.PanelControl panelControl1;
+ private DevExpress.XtraEditors.SimpleButton btnIn;
+ private UserControls.Data.UcPageBar pageBar1;
+ private System.Windows.Forms.Label label1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
index 09ebbd8..ddbc91e 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -18,21 +18,20 @@
private readonly string _webServiceName = "MesInvItemArnManager/";
private string suppId = "";
private string receiveOrgId = "";
- private string isWw = "";
/// <summary>
///
/// </summary>
/// <param name="_suppId">渚涘簲鍟�</param>
/// <param name="_receiveOrgId">鏀舵枡缁勭粐</param>
/// <param name="_isWw">鏄惁濮斿</param>
- public SelectCgMx(string _suppId, string _receiveOrgId, string _isWw)
+ public SelectCgMx(string _suppId, string _receiveOrgId)
{
InitializeComponent();
+ radioGroup1.SelectedIndex = 0;
this.suppId = _suppId;
this.receiveOrgId = _receiveOrgId;
- this.isWw= _isWw;
pageBar1.PagerEvent += PageBar1_PagerEvent;
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter( gridView1, null, null, null, "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
});
@@ -53,6 +52,10 @@
UpdateParent?.Invoke(this,
new UpdateParentEventArgs { StringList = list });
Close();
+ };
+ radioGroup1.SelectedIndexChanged += (s, e) =>
+ {
+ getPageList(1, UtilityHelper.GetPageSize());
};
}
@@ -83,7 +86,7 @@
everyPageSize = pageSize,
sortName = "",
keyWhere = "",
- inBusType = isWw,
+ inBusType = (radioGroup1.SelectedIndex+1),//1鏄噰璐紝2鏄澶�
inSupId = this.suppId,
inReceiveOrgId = this.receiveOrgId,
};
--
Gitblit v1.9.3