From 8640117678528a0c5388f7d4534f0162dcf05fd0 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 20 五月 2025 16:08:20 +0800
Subject: [PATCH] 采购
---
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 371 ++++++++++++++++++++++++++++++++++++----------------
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 20 ++
3 files changed, 274 insertions(+), 121 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 4a5b59e..c2dd903 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:81/" />
+ <add key="WebApiUrl" value="http://localhost:5263/" />
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index ed4e60b..44d62ac 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -30,13 +30,13 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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 rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -148,6 +148,17 @@
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -201,6 +212,9 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ this.tabMxPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -516,7 +530,7 @@
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.REMARKS";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 15;
+ this.gv_remarks.VisibleIndex = 13;
this.gv_remarks.Width = 100;
//
// gv_cancellationStatus
@@ -529,7 +543,7 @@
this.gv_cancellationStatus.OptionsColumn.AllowEdit = false;
this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS";
this.gv_cancellationStatus.Visible = true;
- this.gv_cancellationStatus.VisibleIndex = 16;
+ this.gv_cancellationStatus.VisibleIndex = 14;
this.gv_cancellationStatus.Width = 60;
//
// gv_cancellationPerson
@@ -542,7 +556,7 @@
this.gv_cancellationPerson.OptionsColumn.AllowEdit = false;
this.gv_cancellationPerson.Tag = "query_a.CANCELLATION_PERSON";
this.gv_cancellationPerson.Visible = true;
- this.gv_cancellationPerson.VisibleIndex = 17;
+ this.gv_cancellationPerson.VisibleIndex = 15;
this.gv_cancellationPerson.Width = 60;
//
// gv_cancellationDate
@@ -555,7 +569,7 @@
this.gv_cancellationDate.OptionsColumn.AllowEdit = false;
this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE";
this.gv_cancellationDate.Visible = true;
- this.gv_cancellationDate.VisibleIndex = 18;
+ this.gv_cancellationDate.VisibleIndex = 16;
this.gv_cancellationDate.Width = 180;
//
// gv_createBy
@@ -568,7 +582,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.CREATE_BY";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 19;
+ this.gv_createBy.VisibleIndex = 17;
this.gv_createBy.Width = 80;
//
// gv_createDate
@@ -581,7 +595,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.CREATE_DATE";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 20;
+ this.gv_createDate.VisibleIndex = 18;
this.gv_createDate.Width = 180;
//
// gv_lastupdateDate
@@ -594,7 +608,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 21;
+ this.gv_lastupdateDate.VisibleIndex = 19;
this.gv_lastupdateDate.Width = 200;
//
// gv_lastupdateBy
@@ -607,7 +621,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 22;
+ this.gv_lastupdateBy.VisibleIndex = 20;
this.gv_lastupdateBy.Width = 100;
//
// gv_erpCheckBy
@@ -620,7 +634,7 @@
this.gv_erpCheckBy.OptionsColumn.AllowEdit = false;
this.gv_erpCheckBy.Tag = "query_a.ERP_CHECK_BY";
this.gv_erpCheckBy.Visible = true;
- this.gv_erpCheckBy.VisibleIndex = 23;
+ this.gv_erpCheckBy.VisibleIndex = 21;
this.gv_erpCheckBy.Width = 80;
//
// gv_erpCheckDate
@@ -633,7 +647,7 @@
this.gv_erpCheckDate.OptionsColumn.AllowEdit = false;
this.gv_erpCheckDate.Tag = "query_a.ERP_CHECK_DATE";
this.gv_erpCheckDate.Visible = true;
- this.gv_erpCheckDate.VisibleIndex = 24;
+ this.gv_erpCheckDate.VisibleIndex = 22;
this.gv_erpCheckDate.Width = 180;
//
// gv_changereason
@@ -646,7 +660,7 @@
this.gv_changereason.OptionsColumn.AllowEdit = false;
this.gv_changereason.Tag = "query_a.CHANGEREASON";
this.gv_changereason.Visible = true;
- this.gv_changereason.VisibleIndex = 25;
+ this.gv_changereason.VisibleIndex = 23;
this.gv_changereason.Width = 100;
//
// gridColumn4
@@ -656,7 +670,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 26;
+ this.gridColumn4.VisibleIndex = 24;
this.gridColumn4.Width = 94;
//
// gridColumn5
@@ -690,7 +704,7 @@
this.gridColumn11.MinWidth = 25;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
- this.gridColumn11.VisibleIndex = 28;
+ this.gridColumn11.VisibleIndex = 25;
this.gridColumn11.Width = 94;
//
// pageBar1
@@ -773,7 +787,7 @@
this.txt_billNo.Location = new System.Drawing.Point(109, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(234, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(229, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
//
@@ -787,41 +801,41 @@
//
// txt_suppName
//
- this.txt_suppName.Location = new System.Drawing.Point(780, 12);
+ this.txt_suppName.Location = new System.Drawing.Point(769, 12);
this.txt_suppName.Name = "txt_suppName";
- this.txt_suppName.Size = new System.Drawing.Size(235, 24);
+ this.txt_suppName.Size = new System.Drawing.Size(229, 24);
this.txt_suppName.StyleController = this.layoutMx1;
this.txt_suppName.TabIndex = 231;
//
// txt_documentTypeTxt
//
- this.txt_documentTypeTxt.Location = new System.Drawing.Point(444, 12);
+ this.txt_documentTypeTxt.Location = new System.Drawing.Point(439, 12);
this.txt_documentTypeTxt.Name = "txt_documentTypeTxt";
- this.txt_documentTypeTxt.Size = new System.Drawing.Size(235, 24);
+ this.txt_documentTypeTxt.Size = new System.Drawing.Size(229, 24);
this.txt_documentTypeTxt.StyleController = this.layoutMx1;
this.txt_documentTypeTxt.TabIndex = 232;
//
// txt_suppNo
//
- this.txt_suppNo.Location = new System.Drawing.Point(780, 40);
+ this.txt_suppNo.Location = new System.Drawing.Point(769, 40);
this.txt_suppNo.Name = "txt_suppNo";
- this.txt_suppNo.Size = new System.Drawing.Size(235, 24);
+ this.txt_suppNo.Size = new System.Drawing.Size(229, 24);
this.txt_suppNo.StyleController = this.layoutMx1;
this.txt_suppNo.TabIndex = 233;
//
// txt_closeStatusTxt
//
- this.txt_closeStatusTxt.Location = new System.Drawing.Point(1116, 40);
+ this.txt_closeStatusTxt.Location = new System.Drawing.Point(1099, 40);
this.txt_closeStatusTxt.Name = "txt_closeStatusTxt";
- this.txt_closeStatusTxt.Size = new System.Drawing.Size(235, 24);
+ this.txt_closeStatusTxt.Size = new System.Drawing.Size(231, 24);
this.txt_closeStatusTxt.StyleController = this.layoutMx1;
this.txt_closeStatusTxt.TabIndex = 234;
//
// txt_cancellationStatusTxt
//
- this.txt_cancellationStatusTxt.Location = new System.Drawing.Point(1116, 68);
+ this.txt_cancellationStatusTxt.Location = new System.Drawing.Point(1099, 68);
this.txt_cancellationStatusTxt.Name = "txt_cancellationStatusTxt";
- this.txt_cancellationStatusTxt.Size = new System.Drawing.Size(235, 24);
+ this.txt_cancellationStatusTxt.Size = new System.Drawing.Size(231, 24);
this.txt_cancellationStatusTxt.StyleController = this.layoutMx1;
this.txt_cancellationStatusTxt.TabIndex = 235;
//
@@ -829,39 +843,39 @@
//
this.txt_dptName.Location = new System.Drawing.Point(109, 40);
this.txt_dptName.Name = "txt_dptName";
- this.txt_dptName.Size = new System.Drawing.Size(234, 24);
+ this.txt_dptName.Size = new System.Drawing.Size(229, 24);
this.txt_dptName.StyleController = this.layoutMx1;
this.txt_dptName.TabIndex = 236;
//
// txt_purchaseDate
//
- this.txt_purchaseDate.Location = new System.Drawing.Point(444, 40);
+ this.txt_purchaseDate.Location = new System.Drawing.Point(439, 40);
this.txt_purchaseDate.Name = "txt_purchaseDate";
- this.txt_purchaseDate.Size = new System.Drawing.Size(235, 24);
+ this.txt_purchaseDate.Size = new System.Drawing.Size(229, 24);
this.txt_purchaseDate.StyleController = this.layoutMx1;
this.txt_purchaseDate.TabIndex = 237;
//
// txt_docStusTxt
//
- this.txt_docStusTxt.Location = new System.Drawing.Point(1116, 12);
+ this.txt_docStusTxt.Location = new System.Drawing.Point(1099, 12);
this.txt_docStusTxt.Name = "txt_docStusTxt";
- this.txt_docStusTxt.Size = new System.Drawing.Size(235, 24);
+ this.txt_docStusTxt.Size = new System.Drawing.Size(231, 24);
this.txt_docStusTxt.StyleController = this.layoutMx1;
this.txt_docStusTxt.TabIndex = 238;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(780, 68);
+ this.txt_createDate.Location = new System.Drawing.Point(769, 68);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(235, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(229, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 239;
//
// txt_erpCheckDate
//
- this.txt_erpCheckDate.Location = new System.Drawing.Point(444, 68);
+ this.txt_erpCheckDate.Location = new System.Drawing.Point(439, 68);
this.txt_erpCheckDate.Name = "txt_erpCheckDate";
- this.txt_erpCheckDate.Size = new System.Drawing.Size(235, 24);
+ this.txt_erpCheckDate.Size = new System.Drawing.Size(229, 24);
this.txt_erpCheckDate.StyleController = this.layoutMx1;
this.txt_erpCheckDate.TabIndex = 240;
//
@@ -869,7 +883,7 @@
//
this.txt_erpCheckBy.Location = new System.Drawing.Point(109, 68);
this.txt_erpCheckBy.Name = "txt_erpCheckBy";
- this.txt_erpCheckBy.Size = new System.Drawing.Size(234, 24);
+ this.txt_erpCheckBy.Size = new System.Drawing.Size(229, 24);
this.txt_erpCheckBy.StyleController = this.layoutMx1;
this.txt_erpCheckBy.TabIndex = 241;
//
@@ -913,30 +927,30 @@
this.layoutControlItem14});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- 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;
+ 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[] {
- columnDefinition9,
- columnDefinition10,
- columnDefinition11,
- columnDefinition12});
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition7,
- rowDefinition8,
- rowDefinition9});
- this.Root.Size = new System.Drawing.Size(1363, 104);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3});
+ this.Root.Size = new System.Drawing.Size(1342, 104);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -944,38 +958,38 @@
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(335, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem1.Text = "閲囪喘鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_documentTypeTxt;
- this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(330, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem5.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem5.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_suppName;
- this.layoutControlItem2.Location = new System.Drawing.Point(671, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(660, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_suppNo;
- this.layoutControlItem6.Location = new System.Drawing.Point(671, 28);
+ this.layoutControlItem6.Location = new System.Drawing.Point(660, 28);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem6.Text = "渚涘簲鍟嗙紪鍙�";
this.layoutControlItem6.TextSize = new System.Drawing.Size(85, 18);
//
@@ -985,72 +999,72 @@
this.layoutControlItem9.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(335, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem9.Text = "閲囪喘閮ㄩ棬";
this.layoutControlItem9.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_purchaseDate;
- this.layoutControlItem10.Location = new System.Drawing.Point(335, 28);
+ this.layoutControlItem10.Location = new System.Drawing.Point(330, 28);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem10.Text = "閲囪喘鏃ユ湡";
this.layoutControlItem10.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_cancellationStatusTxt;
- this.layoutControlItem8.Location = new System.Drawing.Point(1007, 56);
+ this.layoutControlItem8.Location = new System.Drawing.Point(990, 56);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(332, 28);
this.layoutControlItem8.Text = "浣滃簾鐘舵��";
this.layoutControlItem8.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_closeStatusTxt;
- this.layoutControlItem7.Location = new System.Drawing.Point(1007, 28);
+ this.layoutControlItem7.Location = new System.Drawing.Point(990, 28);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(332, 28);
this.layoutControlItem7.Text = "鍏抽棴鐘舵��";
this.layoutControlItem7.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_docStusTxt;
- this.layoutControlItem11.Location = new System.Drawing.Point(1007, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(990, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(332, 28);
this.layoutControlItem11.Text = "鍗曟嵁鐘舵��";
this.layoutControlItem11.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_createDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(671, 56);
+ this.layoutControlItem12.Location = new System.Drawing.Point(660, 56);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem12.Text = "鍚屾鏃堕棿";
this.layoutControlItem12.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_erpCheckDate;
- this.layoutControlItem13.Location = new System.Drawing.Point(335, 56);
+ this.layoutControlItem13.Location = new System.Drawing.Point(330, 56);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem13.Text = "ERP瀹℃牳鏃堕棿";
this.layoutControlItem13.TextSize = new System.Drawing.Size(85, 18);
//
@@ -1060,7 +1074,7 @@
this.layoutControlItem14.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(335, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(330, 28);
this.layoutControlItem14.Text = "ERP瀹℃牳浜�";
this.layoutControlItem14.TextSize = new System.Drawing.Size(85, 18);
//
@@ -1073,7 +1087,8 @@
this.tabMx.Size = new System.Drawing.Size(1363, 458);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.tabMxPage1});
+ this.tabMxPage1,
+ this.tabMxPage2});
//
// tabMxPage1
//
@@ -1200,8 +1215,6 @@
this.gvMx1pricingQty.MinWidth = 25;
this.gvMx1pricingQty.Name = "gvMx1pricingQty";
this.gvMx1pricingQty.Tag = "query_a.PRICING_QTY";
- this.gvMx1pricingQty.Visible = true;
- this.gvMx1pricingQty.VisibleIndex = 5;
this.gvMx1pricingQty.Width = 25;
//
// gvMx1pricingUnit
@@ -1212,8 +1225,6 @@
this.gvMx1pricingUnit.MinWidth = 25;
this.gvMx1pricingUnit.Name = "gvMx1pricingUnit";
this.gvMx1pricingUnit.Tag = "query_a.PRICING_UNIT";
- this.gvMx1pricingUnit.Visible = true;
- this.gvMx1pricingUnit.VisibleIndex = 6;
this.gvMx1pricingUnit.Width = 25;
//
// gvMx1deliveryDate
@@ -1225,7 +1236,7 @@
this.gvMx1deliveryDate.Name = "gvMx1deliveryDate";
this.gvMx1deliveryDate.Tag = "query_a.DELIVERY_DATE";
this.gvMx1deliveryDate.Visible = true;
- this.gvMx1deliveryDate.VisibleIndex = 7;
+ this.gvMx1deliveryDate.VisibleIndex = 18;
this.gvMx1deliveryDate.Width = 92;
//
// gvMx1earliestDeliveryDate
@@ -1237,7 +1248,7 @@
this.gvMx1earliestDeliveryDate.Name = "gvMx1earliestDeliveryDate";
this.gvMx1earliestDeliveryDate.Tag = "query_a.EARLIEST_DELIVERY_DATE";
this.gvMx1earliestDeliveryDate.Visible = true;
- this.gvMx1earliestDeliveryDate.VisibleIndex = 8;
+ this.gvMx1earliestDeliveryDate.VisibleIndex = 19;
this.gvMx1earliestDeliveryDate.Width = 92;
//
// gvMx1latestDeliveryDate
@@ -1249,7 +1260,7 @@
this.gvMx1latestDeliveryDate.Name = "gvMx1latestDeliveryDate";
this.gvMx1latestDeliveryDate.Tag = "query_a.LATEST_DELIVERY_DATE";
this.gvMx1latestDeliveryDate.Visible = true;
- this.gvMx1latestDeliveryDate.VisibleIndex = 9;
+ this.gvMx1latestDeliveryDate.VisibleIndex = 20;
this.gvMx1latestDeliveryDate.Width = 92;
//
// gvMx1purchaseQty
@@ -1261,7 +1272,7 @@
this.gvMx1purchaseQty.Name = "gvMx1purchaseQty";
this.gvMx1purchaseQty.Tag = "query_a.PURCHASE_QTY";
this.gvMx1purchaseQty.Visible = true;
- this.gvMx1purchaseQty.VisibleIndex = 10;
+ this.gvMx1purchaseQty.VisibleIndex = 5;
this.gvMx1purchaseQty.Width = 25;
//
// gvMx1purchaseUnit
@@ -1273,7 +1284,7 @@
this.gvMx1purchaseUnit.Name = "gvMx1purchaseUnit";
this.gvMx1purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
this.gvMx1purchaseUnit.Visible = true;
- this.gvMx1purchaseUnit.VisibleIndex = 11;
+ this.gvMx1purchaseUnit.VisibleIndex = 6;
this.gvMx1purchaseUnit.Width = 25;
//
// gvMx1inventoryUnit
@@ -1284,8 +1295,6 @@
this.gvMx1inventoryUnit.MinWidth = 25;
this.gvMx1inventoryUnit.Name = "gvMx1inventoryUnit";
this.gvMx1inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
- this.gvMx1inventoryUnit.Visible = true;
- this.gvMx1inventoryUnit.VisibleIndex = 12;
this.gvMx1inventoryUnit.Width = 25;
//
// gvMx1demandDocumentId
@@ -1296,8 +1305,6 @@
this.gvMx1demandDocumentId.MinWidth = 25;
this.gvMx1demandDocumentId.Name = "gvMx1demandDocumentId";
this.gvMx1demandDocumentId.Tag = "query_a.DEMAND_DOCUMENT_ID";
- this.gvMx1demandDocumentId.Visible = true;
- this.gvMx1demandDocumentId.VisibleIndex = 13;
this.gvMx1demandDocumentId.Width = 46;
//
// gvMx1isGift
@@ -1309,7 +1316,7 @@
this.gvMx1isGift.Name = "gvMx1isGift";
this.gvMx1isGift.Tag = "query_a.IS_GIFT";
this.gvMx1isGift.Visible = true;
- this.gvMx1isGift.VisibleIndex = 14;
+ this.gvMx1isGift.VisibleIndex = 7;
this.gvMx1isGift.Width = 25;
//
// gvMx1remarks
@@ -1321,7 +1328,7 @@
this.gvMx1remarks.Name = "gvMx1remarks";
this.gvMx1remarks.Tag = "query_a.REMARKS";
this.gvMx1remarks.Visible = true;
- this.gvMx1remarks.VisibleIndex = 15;
+ this.gvMx1remarks.VisibleIndex = 8;
this.gvMx1remarks.Width = 46;
//
// gvMx1businessTerminate
@@ -1345,7 +1352,7 @@
this.gvMx1businessClose.Name = "gvMx1businessClose";
this.gvMx1businessClose.Tag = "query_a.BUSINESS_CLOSE";
this.gvMx1businessClose.Visible = true;
- this.gvMx1businessClose.VisibleIndex = 16;
+ this.gvMx1businessClose.VisibleIndex = 9;
this.gvMx1businessClose.Width = 25;
//
// gvMx1businessFreeze
@@ -1357,7 +1364,7 @@
this.gvMx1businessFreeze.Name = "gvMx1businessFreeze";
this.gvMx1businessFreeze.Tag = "query_a.BUSINESS_FREEZE";
this.gvMx1businessFreeze.Visible = true;
- this.gvMx1businessFreeze.VisibleIndex = 17;
+ this.gvMx1businessFreeze.VisibleIndex = 10;
this.gvMx1businessFreeze.Width = 25;
//
// gvMx1freezer
@@ -1409,7 +1416,7 @@
this.gvMx1totalReceivedQty.Name = "gvMx1totalReceivedQty";
this.gvMx1totalReceivedQty.Tag = "query_a.TOTAL_RECEIVED_QTY";
this.gvMx1totalReceivedQty.Visible = true;
- this.gvMx1totalReceivedQty.VisibleIndex = 18;
+ this.gvMx1totalReceivedQty.VisibleIndex = 11;
this.gvMx1totalReceivedQty.Width = 32;
//
// gridColumn10
@@ -1419,7 +1426,7 @@
this.gridColumn10.MinWidth = 25;
this.gridColumn10.Name = "gridColumn10";
this.gridColumn10.Visible = true;
- this.gridColumn10.VisibleIndex = 19;
+ this.gridColumn10.VisibleIndex = 12;
this.gridColumn10.Width = 37;
//
// gvMx1totalStoredQty
@@ -1431,7 +1438,7 @@
this.gvMx1totalStoredQty.Name = "gvMx1totalStoredQty";
this.gvMx1totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY";
this.gvMx1totalStoredQty.Visible = true;
- this.gvMx1totalStoredQty.VisibleIndex = 20;
+ this.gvMx1totalStoredQty.VisibleIndex = 13;
this.gvMx1totalStoredQty.Width = 28;
//
// gvMx1remainingStoredQty
@@ -1443,7 +1450,7 @@
this.gvMx1remainingStoredQty.Name = "gvMx1remainingStoredQty";
this.gvMx1remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY";
this.gvMx1remainingStoredQty.Visible = true;
- this.gvMx1remainingStoredQty.VisibleIndex = 21;
+ this.gvMx1remainingStoredQty.VisibleIndex = 14;
this.gvMx1remainingStoredQty.Width = 32;
//
// gvMx1totalReturnedQty
@@ -1455,7 +1462,7 @@
this.gvMx1totalReturnedQty.Name = "gvMx1totalReturnedQty";
this.gvMx1totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY";
this.gvMx1totalReturnedQty.Visible = true;
- this.gvMx1totalReturnedQty.VisibleIndex = 22;
+ this.gvMx1totalReturnedQty.VisibleIndex = 15;
this.gvMx1totalReturnedQty.Width = 32;
//
// gvMx1returnableReceivedQty
@@ -1467,7 +1474,7 @@
this.gvMx1returnableReceivedQty.Name = "gvMx1returnableReceivedQty";
this.gvMx1returnableReceivedQty.Tag = "query_a.RETURNABLE_RECEIVED_QTY";
this.gvMx1returnableReceivedQty.Visible = true;
- this.gvMx1returnableReceivedQty.VisibleIndex = 23;
+ this.gvMx1returnableReceivedQty.VisibleIndex = 16;
this.gvMx1returnableReceivedQty.Width = 32;
//
// gvMx1returnableStoredQty
@@ -1479,7 +1486,7 @@
this.gvMx1returnableStoredQty.Name = "gvMx1returnableStoredQty";
this.gvMx1returnableStoredQty.Tag = "query_a.RETURNABLE_STORED_QTY";
this.gvMx1returnableStoredQty.Visible = true;
- this.gvMx1returnableStoredQty.VisibleIndex = 24;
+ this.gvMx1returnableStoredQty.VisibleIndex = 17;
this.gvMx1returnableStoredQty.Width = 32;
//
// gvMx1sourceDocumentType
@@ -1490,8 +1497,6 @@
this.gvMx1sourceDocumentType.MinWidth = 25;
this.gvMx1sourceDocumentType.Name = "gvMx1sourceDocumentType";
this.gvMx1sourceDocumentType.Tag = "query_a.SOURCE_DOCUMENT_TYPE";
- this.gvMx1sourceDocumentType.Visible = true;
- this.gvMx1sourceDocumentType.VisibleIndex = 25;
this.gvMx1sourceDocumentType.Width = 36;
//
// gvMx1planTrackingId
@@ -1502,8 +1507,6 @@
this.gvMx1planTrackingId.MinWidth = 25;
this.gvMx1planTrackingId.Name = "gvMx1planTrackingId";
this.gvMx1planTrackingId.Tag = "query_a.PLAN_TRACKING_ID";
- this.gvMx1planTrackingId.Visible = true;
- this.gvMx1planTrackingId.VisibleIndex = 26;
this.gvMx1planTrackingId.Width = 46;
//
// gvMx1changeFlag
@@ -1514,8 +1517,6 @@
this.gvMx1changeFlag.MinWidth = 25;
this.gvMx1changeFlag.Name = "gvMx1changeFlag";
this.gvMx1changeFlag.Tag = "query_a.CHANGE_FLAG";
- this.gvMx1changeFlag.Visible = true;
- this.gvMx1changeFlag.VisibleIndex = 27;
this.gvMx1changeFlag.Width = 25;
//
// gvMx1demandDocumentLineId
@@ -1543,7 +1544,7 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 28;
+ this.gridColumn8.VisibleIndex = 21;
this.gridColumn8.Width = 43;
//
// gridColumn9
@@ -1553,8 +1554,130 @@
this.gridColumn9.MinWidth = 25;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 29;
+ this.gridColumn9.VisibleIndex = 22;
this.gridColumn9.Width = 94;
+ //
+ // tabMxPage2
+ //
+ this.tabMxPage2.Controls.Add(this.gcMx2);
+ this.tabMxPage2.Name = "tabMxPage2";
+ this.tabMxPage2.Size = new System.Drawing.Size(1361, 426);
+ this.tabMxPage2.Text = "鍒拌揣鏄庣粏";
+ //
+ // gcMx2
+ //
+ this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ 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(1361, 426);
+ this.gcMx2.TabIndex = 1;
+ this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx2});
+ //
+ // gvMx2
+ //
+ this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMx2.ColumnPanelRowHeight = 60;
+ this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn13,
+ this.gridColumn14,
+ this.gridColumn15,
+ this.gridColumn16,
+ this.gridColumn17,
+ this.gridColumn22,
+ this.gridColumn47,
+ this.gridColumn48});
+ this.gvMx2.GridControl = this.gcMx2;
+ this.gvMx2.Name = "gvMx2";
+ this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx2.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.Caption = "ERP涓ID";
+ this.gridColumn13.FieldName = "ebelnK3id";
+ this.gridColumn13.MinWidth = 25;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 0;
+ this.gridColumn13.Width = 46;
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.AppearanceCell.Options.UseFont = true;
+ this.gridColumn14.Caption = "鐗╂枡ID";
+ this.gridColumn14.FieldName = "itemId";
+ this.gridColumn14.MinWidth = 25;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Tag = "query_a.ITEM_ID";
+ this.gridColumn14.Width = 100;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.Caption = "鐗╂枡缂栫爜";
+ this.gridColumn15.FieldName = "itemNo";
+ this.gridColumn15.MinWidth = 25;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.VisibleIndex = 1;
+ this.gridColumn15.Width = 46;
+ //
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn16.FieldName = "itemName";
+ this.gridColumn16.MinWidth = 25;
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Visible = true;
+ this.gridColumn16.VisibleIndex = 2;
+ this.gridColumn16.Width = 55;
+ //
+ // gridColumn17
+ //
+ this.gridColumn17.AppearanceCell.Options.UseFont = true;
+ this.gridColumn17.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn17.FieldName = "itemModel";
+ this.gridColumn17.MinWidth = 25;
+ this.gridColumn17.Name = "gridColumn17";
+ this.gridColumn17.Tag = "query_a.PRICING_QTY";
+ this.gridColumn17.Visible = true;
+ this.gridColumn17.VisibleIndex = 3;
+ this.gridColumn17.Width = 25;
+ //
+ // gridColumn22
+ //
+ this.gridColumn22.AppearanceCell.Options.UseFont = true;
+ this.gridColumn22.Caption = "鏀惰揣鏁伴噺";
+ this.gridColumn22.FieldName = "quantity";
+ this.gridColumn22.MinWidth = 25;
+ this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.Tag = "query_a.PURCHASE_QTY";
+ this.gridColumn22.Visible = true;
+ this.gridColumn22.VisibleIndex = 4;
+ this.gridColumn22.Width = 25;
+ //
+ // gridColumn47
+ //
+ this.gridColumn47.Caption = "鏀舵枡浜�";
+ this.gridColumn47.FieldName = "createBy";
+ this.gridColumn47.MinWidth = 25;
+ this.gridColumn47.Name = "gridColumn47";
+ this.gridColumn47.Visible = true;
+ this.gridColumn47.VisibleIndex = 5;
+ this.gridColumn47.Width = 43;
+ //
+ // gridColumn48
+ //
+ this.gridColumn48.Caption = "鏀舵枡鏃堕棿";
+ this.gridColumn48.FieldName = "createDate";
+ this.gridColumn48.MinWidth = 25;
+ this.gridColumn48.Name = "gridColumn48";
+ this.gridColumn48.Visible = true;
+ this.gridColumn48.VisibleIndex = 6;
+ this.gridColumn48.Width = 94;
//
// Frm_MesRohIn
//
@@ -1617,6 +1740,9 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ this.tabMxPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
this.ResumeLayout(false);
}
@@ -1733,5 +1859,16 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraTab.XtraTabPage tabMxPage2;
+ private DevExpress.XtraGrid.GridControl gcMx2;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn47;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn48;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
index 1b8d435..948d1b4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
@@ -24,6 +24,7 @@
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "docStusTxt", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -182,8 +183,7 @@
var _job = JObject.Parse(strJson);
var array = new JArray();
foreach (var a in _job["rtnData"]["list"]) array.Add(a);
- var dt =
- JsonConvert.DeserializeObject<DataTable>(
+ var dt = JsonConvert.DeserializeObject<DataTable>(
array.ToString());
if (dt.Rows.Count > 0)
{
@@ -196,6 +196,22 @@
{
UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
+
+ var array2 = new JArray();
+ foreach (var a in _job["rtnData"]["list2"]) array2.Add(a);
+ var dt2 = JsonConvert.DeserializeObject<DataTable>(
+ array2.ToString());
+ if (dt2.Rows.Count > 0)
+ {
+ gcMx2.BindingContext = new BindingContext();
+ gcMx2.DataSource = dt2;
+ gcMx2.ForceInitialize();
+ gvMx2.BestFitColumns();
+ }
+ else
+ {
+ UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ }
}
else
{
--
Gitblit v1.9.3