From fa43bc9d26c7b9ec2b07e2d3e1a7f07abe68da5b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 15 五月 2025 14:46:59 +0800
Subject: [PATCH] 导入
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs | 20
DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs | 6
DevApp/Gs.DevApp/UserControl/ShowUp.cs | 80 ++
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs | 76 +-
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs | 154 ++---
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 95 ---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs | 852 ++++++++++++++++++++----------
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 8
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 97 +--
DevApp/Gs.DevApp/UserControl/UCUpFile.cs | 8
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs | 4
DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.Designer.cs | 5
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs | 87 +-
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 8
DevApp/Gs.DevApp/UserControl/ShowUp.Designer.cs | 87 +++
DevApp/Gs.DevApp/Program.cs | 2
DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs | 1
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 17
DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs | 1
20 files changed, 973 insertions(+), 637 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
index 8f1928d..860859b 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -68,7 +68,6 @@
this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fbatchQty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckBy = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fcheckDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -153,6 +152,10 @@
this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -218,10 +221,6 @@
this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -304,6 +303,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -347,10 +350,6 @@
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
this.SuspendLayout();
//
// repositoryItemComboBox1
@@ -452,7 +451,6 @@
this.gridColumn14,
this.gv_fcovertQty,
this.gv_fbatchQty,
- this.gv_fcheckResu,
this.gv_remarks,
this.gv_fcheckBy,
this.gv_fcheckDate,
@@ -633,19 +631,6 @@
this.gv_fbatchQty.VisibleIndex = 12;
this.gv_fbatchQty.Width = 80;
//
- // gv_fcheckResu
- //
- this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
- this.gv_fcheckResu.Caption = "妫�楠岀粨鏋�";
- this.gv_fcheckResu.FieldName = "fcheckResu";
- this.gv_fcheckResu.MinWidth = 30;
- this.gv_fcheckResu.Name = "gv_fcheckResu";
- this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
- this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
- this.gv_fcheckResu.Visible = true;
- this.gv_fcheckResu.VisibleIndex = 13;
- this.gv_fcheckResu.Width = 50;
- //
// gv_remarks
//
this.gv_remarks.AppearanceCell.Options.UseFont = true;
@@ -656,7 +641,7 @@
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.remarks";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 14;
+ this.gv_remarks.VisibleIndex = 13;
this.gv_remarks.Width = 100;
//
// gv_fcheckBy
@@ -669,7 +654,7 @@
this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
this.gv_fcheckBy.Tag = "query_a.fcheck_by";
this.gv_fcheckBy.Visible = true;
- this.gv_fcheckBy.VisibleIndex = 15;
+ this.gv_fcheckBy.VisibleIndex = 14;
this.gv_fcheckBy.Width = 118;
//
// gv_fcheckDate
@@ -682,7 +667,7 @@
this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
this.gv_fcheckDate.Tag = "query_a.fcheck_date";
this.gv_fcheckDate.Visible = true;
- this.gv_fcheckDate.VisibleIndex = 16;
+ this.gv_fcheckDate.VisibleIndex = 15;
this.gv_fcheckDate.Width = 182;
//
// gv_createBy
@@ -695,7 +680,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.create_by";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 17;
+ this.gv_createBy.VisibleIndex = 16;
this.gv_createBy.Width = 67;
//
// gridColumn15
@@ -705,7 +690,7 @@
this.gridColumn15.MinWidth = 25;
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 18;
+ this.gridColumn15.VisibleIndex = 17;
this.gridColumn15.Width = 94;
//
// gv_lastupdateBy
@@ -718,7 +703,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 19;
+ this.gv_lastupdateBy.VisibleIndex = 18;
this.gv_lastupdateBy.Width = 60;
//
// gv_lastupdateDate
@@ -731,7 +716,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 20;
+ this.gv_lastupdateDate.VisibleIndex = 19;
this.gv_lastupdateDate.Width = 120;
//
// gridColumn18
@@ -741,7 +726,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 21;
+ this.gridColumn18.VisibleIndex = 20;
this.gridColumn18.Width = 94;
//
// gridColumn19
@@ -751,7 +736,7 @@
this.gridColumn19.MinWidth = 25;
this.gridColumn19.Name = "gridColumn19";
this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 22;
+ this.gridColumn19.VisibleIndex = 21;
this.gridColumn19.Width = 94;
//
// gridColumn30
@@ -769,7 +754,7 @@
this.gridColumn13.MinWidth = 25;
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 23;
+ this.gridColumn13.VisibleIndex = 22;
this.gridColumn13.Width = 94;
//
// gridColumn17
@@ -787,7 +772,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 24;
+ this.gridColumn7.VisibleIndex = 23;
this.gridColumn7.Width = 94;
//
// pageBar1
@@ -1650,6 +1635,52 @@
this.layoutControlItem25.Text = "杩斿伐宸ュ簭";
this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
//
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txt_fsubmitDate;
+ this.layoutControlItem16.Location = new System.Drawing.Point(660, 174);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem16.Size = new System.Drawing.Size(330, 29);
+ this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txt_fsubmitBy;
+ this.layoutControlItem15.Location = new System.Drawing.Point(660, 203);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem15.Size = new System.Drawing.Size(330, 29);
+ this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_fsubmit;
+ this.layoutControlItem14.Location = new System.Drawing.Point(660, 232);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem14.Size = new System.Drawing.Size(330, 30);
+ this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem14.TextVisible = false;
+ //
+ // layoutControlItem27
+ //
+ this.layoutControlItem27.Control = this.txt_msg;
+ this.layoutControlItem27.Location = new System.Drawing.Point(990, 0);
+ this.layoutControlItem27.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 3;
+ this.layoutControlItem27.Size = new System.Drawing.Size(332, 87);
+ this.layoutControlItem27.Text = "杩濊绫诲埆";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem27.TextVisible = false;
+ //
// xtraTabControl2
//
this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -2402,52 +2433,6 @@
//
this.gridView4.Name = "gridView4";
//
- // layoutControlItem16
- //
- this.layoutControlItem16.Control = this.txt_fsubmitDate;
- this.layoutControlItem16.Location = new System.Drawing.Point(660, 174);
- this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 6;
- this.layoutControlItem16.Size = new System.Drawing.Size(330, 29);
- this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_fsubmitBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(660, 203);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 7;
- this.layoutControlItem15.Size = new System.Drawing.Size(330, 29);
- this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_fsubmit;
- this.layoutControlItem14.Location = new System.Drawing.Point(660, 232);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 8;
- this.layoutControlItem14.Size = new System.Drawing.Size(330, 30);
- this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem14.TextVisible = false;
- //
- // layoutControlItem27
- //
- this.layoutControlItem27.Control = this.txt_msg;
- this.layoutControlItem27.Location = new System.Drawing.Point(990, 0);
- this.layoutControlItem27.Name = "layoutControlItem27";
- this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 3;
- this.layoutControlItem27.Size = new System.Drawing.Size(332, 87);
- this.layoutControlItem27.Text = "杩濊绫诲埆";
- this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem27.TextVisible = false;
- //
// Frm_FqcDetect01
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2540,6 +2525,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2583,10 +2572,6 @@
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
this.ResumeLayout(false);
}
@@ -2608,7 +2593,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_boardStyle;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
private DevExpress.XtraGrid.Columns.GridColumn gv_fbatchQty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckResu;
private DevExpress.XtraGrid.Columns.GridColumn gv_fcovertQty;
private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
index d3c50ea..27a8dc3 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.Designer.cs
@@ -30,16 +30,16 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -72,6 +72,7 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -144,6 +145,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -156,7 +158,8 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1126, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
@@ -180,7 +183,8 @@
this.gv_lookupTypeName,
this.gridColumn5,
this.gridColumn4,
- this.gridColumn1});
+ this.gridColumn1,
+ this.gridColumn3});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -274,7 +278,7 @@
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";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -285,6 +289,7 @@
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
this.splitMx1.SplitterPosition = 49;
this.splitMx1.TabIndex = 0;
@@ -353,23 +358,23 @@
this.layoutControlItem2});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition1.Width = 100D;
- columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition2.Width = 100D;
- columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition3.Width = 100D;
- columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition4.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition1,
- columnDefinition2,
- columnDefinition3,
- columnDefinition4});
- rowDefinition1.Height = 100D;
- rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6,
+ columnDefinition7,
+ columnDefinition8});
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1});
+ rowDefinition2});
this.Root.Size = new System.Drawing.Size(1126, 49);
this.Root.TextVisible = false;
//
@@ -461,10 +466,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -487,6 +492,14 @@
this.picCheckBox.TabIndex = 5;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "涓婚敭GUID";
+ this.gridColumn3.FieldName = "guid";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Width = 94;
//
// Frm_IQCLookups
//
@@ -566,5 +579,6 @@
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
index 1cf550e..8a342a0 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_IQCLookups.cs
@@ -28,6 +28,7 @@
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.xlsInService = "XlsInJyxm";
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
index fcf7055..1e28b6e 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
@@ -72,6 +72,7 @@
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -144,6 +145,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -156,7 +158,8 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1126, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
@@ -180,7 +183,8 @@
this.gv_lookupTypeName,
this.gridColumn5,
this.gridColumn4,
- this.gridColumn1});
+ this.gridColumn1,
+ this.gridColumn3});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -274,7 +278,7 @@
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";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -285,6 +289,7 @@
//
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
this.splitMx1.SplitterPosition = 55;
this.splitMx1.TabIndex = 0;
@@ -488,6 +493,14 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "涓婚敭GUID";
+ this.gridColumn3.FieldName = "guid";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Width = 94;
+ //
// Frm_MesSysLookups
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -566,5 +579,6 @@
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.Utils.ToolTipController tips;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
index 8cc3099..5406e2c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
@@ -28,6 +28,7 @@
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.xlsInService = "XlsInJygj";
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
index ab48392..07225ae 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
@@ -481,7 +481,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1127, 570);
- this.splitMx1.SplitterPosition = 107;
+ this.splitMx1.SplitterPosition = 113;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -505,14 +505,14 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(599, 447, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1127, 107);
+ this.layoutMx1.Size = new System.Drawing.Size(1127, 113);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "dataLayoutControl1";
//
// btnCopy
//
this.btnCopy.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.chartswitchrowcolumn_16x16;
- this.btnCopy.Location = new System.Drawing.Point(554, 74);
+ this.btnCopy.Location = new System.Drawing.Point(565, 74);
this.btnCopy.Name = "btnCopy";
this.btnCopy.Size = new System.Drawing.Size(131, 27);
this.btnCopy.StyleController = this.layoutMx1;
@@ -533,7 +533,7 @@
this.txt_fSubsidiary.IsReadly = false;
this.txt_fSubsidiary.Location = new System.Drawing.Point(84, 12);
this.txt_fSubsidiary.Name = "txt_fSubsidiary";
- this.txt_fSubsidiary.Size = new System.Drawing.Size(195, 24);
+ this.txt_fSubsidiary.Size = new System.Drawing.Size(200, 24);
this.txt_fSubsidiary.TabIndex = 383;
//
// txt_itemId
@@ -541,36 +541,36 @@
this.txt_itemId.IsReadly = false;
this.txt_itemId.Location = new System.Drawing.Point(84, 43);
this.txt_itemId.Name = "txt_itemId";
- this.txt_itemId.Size = new System.Drawing.Size(195, 24);
+ this.txt_itemId.Size = new System.Drawing.Size(200, 24);
this.txt_itemId.TabIndex = 380;
this.txt_itemId.Tag = "no";
//
// txt_foneCheckdate
//
- this.txt_foneCheckdate.Location = new System.Drawing.Point(897, 43);
+ this.txt_foneCheckdate.Location = new System.Drawing.Point(914, 43);
this.txt_foneCheckdate.Name = "txt_foneCheckdate";
this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
- this.txt_foneCheckdate.Size = new System.Drawing.Size(197, 24);
+ this.txt_foneCheckdate.Size = new System.Drawing.Size(201, 24);
this.txt_foneCheckdate.StyleController = this.layoutMx1;
this.txt_foneCheckdate.TabIndex = 267;
this.txt_foneCheckdate.Tag = "readOnly";
//
// txt_foneCheckor
//
- this.txt_foneCheckor.Location = new System.Drawing.Point(897, 12);
+ this.txt_foneCheckor.Location = new System.Drawing.Point(914, 12);
this.txt_foneCheckor.Name = "txt_foneCheckor";
this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
- this.txt_foneCheckor.Size = new System.Drawing.Size(197, 24);
+ this.txt_foneCheckor.Size = new System.Drawing.Size(201, 24);
this.txt_foneCheckor.StyleController = this.layoutMx1;
this.txt_foneCheckor.TabIndex = 262;
this.txt_foneCheckor.Tag = "readOnly";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(355, 12);
+ this.txt_itemNo.Location = new System.Drawing.Point(360, 12);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(195, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(201, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 370;
this.txt_itemNo.Tag = "readOnly";
@@ -580,44 +580,44 @@
this.txt_memo.Location = new System.Drawing.Point(84, 74);
this.txt_memo.Name = "txt_memo";
this.txt_memo.Properties.Appearance.Options.UseFont = true;
- this.txt_memo.Size = new System.Drawing.Size(466, 24);
+ this.txt_memo.Size = new System.Drawing.Size(477, 24);
this.txt_memo.StyleController = this.layoutMx1;
this.txt_memo.TabIndex = 219;
//
// txt_gg
//
- this.txt_gg.Location = new System.Drawing.Point(355, 43);
+ this.txt_gg.Location = new System.Drawing.Point(360, 43);
this.txt_gg.Name = "txt_gg";
- this.txt_gg.Size = new System.Drawing.Size(195, 24);
+ this.txt_gg.Size = new System.Drawing.Size(201, 24);
this.txt_gg.StyleController = this.layoutMx1;
this.txt_gg.TabIndex = 384;
this.txt_gg.Tag = "readOnly";
//
// txt_foneChecked
//
- this.txt_foneChecked.Location = new System.Drawing.Point(825, 74);
+ this.txt_foneChecked.Location = new System.Drawing.Point(842, 74);
this.txt_foneChecked.Name = "txt_foneChecked";
this.txt_foneChecked.Properties.Caption = "瀹℃牳鏍囪瘑";
- this.txt_foneChecked.Size = new System.Drawing.Size(269, 24);
+ this.txt_foneChecked.Size = new System.Drawing.Size(273, 24);
this.txt_foneChecked.StyleController = this.layoutMx1;
this.txt_foneChecked.TabIndex = 386;
this.txt_foneChecked.Tag = "readOnly";
//
// txt_ftype
//
- this.txt_ftype.Location = new System.Drawing.Point(626, 12);
+ this.txt_ftype.Location = new System.Drawing.Point(637, 12);
this.txt_ftype.Name = "txt_ftype";
- this.txt_ftype.Size = new System.Drawing.Size(195, 24);
+ this.txt_ftype.Size = new System.Drawing.Size(201, 24);
this.txt_ftype.StyleController = this.layoutMx1;
this.txt_ftype.TabIndex = 389;
this.txt_ftype.Tag = "readOnly";
//
// txt_isenabled
//
- this.txt_isenabled.Location = new System.Drawing.Point(554, 43);
+ this.txt_isenabled.Location = new System.Drawing.Point(565, 43);
this.txt_isenabled.Name = "txt_isenabled";
this.txt_isenabled.Properties.Caption = "鍙敤鏍囪瘑";
- this.txt_isenabled.Size = new System.Drawing.Size(267, 24);
+ this.txt_isenabled.Size = new System.Drawing.Size(273, 24);
this.txt_isenabled.StyleController = this.layoutMx1;
this.txt_isenabled.TabIndex = 390;
this.txt_isenabled.Tag = "readOnly";
@@ -675,7 +675,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1106, 113);
+ this.Root.Size = new System.Drawing.Size(1127, 113);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -683,7 +683,7 @@
this.layoutControlItem1.Control = this.txt_fSubsidiary;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem1.Text = "閫夋嫨缁勭粐";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
@@ -693,7 +693,7 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
this.layoutControlItem4.Text = "閫夋嫨鐗╂枡";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
@@ -704,39 +704,39 @@
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(542, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(553, 31);
this.layoutControlItem2.Text = "澶囨敞";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_foneCheckor;
- this.layoutControlItem10.Location = new System.Drawing.Point(813, 0);
+ this.layoutControlItem10.Location = new System.Drawing.Point(830, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(273, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem10.Text = "瀹℃牳浜哄憳";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_foneCheckdate;
- this.layoutControlItem11.Location = new System.Drawing.Point(813, 31);
+ this.layoutControlItem11.Location = new System.Drawing.Point(830, 31);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(273, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem11.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_foneChecked;
- this.layoutControlItem12.Location = new System.Drawing.Point(813, 62);
+ this.layoutControlItem12.Location = new System.Drawing.Point(830, 62);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(273, 31);
+ this.layoutControlItem12.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem12.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
@@ -744,13 +744,13 @@
// layoutControlItem14
//
this.layoutControlItem14.Control = this.btnCopy;
- this.layoutControlItem14.Location = new System.Drawing.Point(542, 62);
+ this.layoutControlItem14.Location = new System.Drawing.Point(553, 62);
this.layoutControlItem14.MaxSize = new System.Drawing.Size(135, 31);
this.layoutControlItem14.MinSize = new System.Drawing.Size(135, 31);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem14.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem14.Text = "澶嶅埗";
this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
@@ -759,42 +759,42 @@
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_ftype;
- this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(553, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem3.Text = "椤圭洰鍒嗙被";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_itemNo;
- this.layoutControlItem7.Location = new System.Drawing.Point(271, 0);
+ this.layoutControlItem7.Location = new System.Drawing.Point(276, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem7.Text = "鐗╂枡缂栫爜";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_gg;
- this.layoutControlItem8.Location = new System.Drawing.Point(271, 31);
+ this.layoutControlItem8.Location = new System.Drawing.Point(276, 31);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem8.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_isenabled;
- this.layoutControlItem5.Location = new System.Drawing.Point(542, 31);
+ this.layoutControlItem5.Location = new System.Drawing.Point(553, 31);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(277, 31);
this.layoutControlItem5.Text = "鍙敤鏍囪瘑";
this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem5.TextVisible = false;
@@ -805,7 +805,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1127, 451);
+ this.tabMx.Size = new System.Drawing.Size(1127, 445);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -814,7 +814,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1125, 419);
+ this.tabMxPage1.Size = new System.Drawing.Size(1125, 413);
this.tabMxPage1.Text = "妫�楠岄」鐩槑缁�";
//
// gcMx1
@@ -832,7 +832,7 @@
this.repositoryItemButtonEdit1,
this.rptShunXui,
this.rptStation});
- this.gcMx1.Size = new System.Drawing.Size(1125, 419);
+ this.gcMx1.Size = new System.Drawing.Size(1125, 413);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -975,7 +975,6 @@
this.rptJYGJ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.rptJYGJ.Name = "rptJYGJ";
- this.rptJYGJ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
//
// gvMx1sampleSizeNo
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 7e15eca..237b7be 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -40,6 +40,7 @@
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ toolBarMenu1.xlsInService = "XlsInItemJyxm&"+ strType;
//绫诲瀷锛宨qc,ipqc宸℃锛宨pqc棣栨鏌�,fqc锛宨qc鐨勬牱鍝佸�奸粯璁や负5锛屽叾瀹冧负1
txt_ftype.Text = strType;
if (strType == "iqc")
@@ -251,6 +252,13 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
+ string _orgId = txt_fSubsidiary.GetId();
+ if (string.IsNullOrEmpty(_orgId))
+ {
+ MsgHelper.Warning("璇烽�夋嫨浣跨敤缁勭粐锛�");
+ txt_fSubsidiary.Focus();
+ return;
+ }
string _ItemId = txt_itemId.GetId();
if (string.IsNullOrEmpty(_ItemId))
{
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.Designer.cs
index 8586576..debb4ba 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/EasyRptEdt.Designer.cs
@@ -42,7 +42,7 @@
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";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -52,6 +52,7 @@
// splitMx1.Panel2
//
this.splitMx1.Panel2.Text = "Panel2";
+ this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(918, 623);
this.splitMx1.SplitterPosition = 593;
this.splitMx1.TabIndex = 0;
@@ -73,7 +74,7 @@
this.ClientSize = new System.Drawing.Size(918, 623);
this.Controls.Add(this.splitMx1);
this.Name = "EasyRptEdt";
- this.Text = "EasyRptEdt";
+ this.Text = "鎵撳嵃妯℃澘";
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
this.splitMx1.Panel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
index b95c785..5b51dd4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Organization.Designer.cs
@@ -149,7 +149,7 @@
//
this.gv_userName.AppearanceCell.Options.UseFont = true;
this.gv_userName.Caption = "鍚屾鏃堕棿";
- this.gv_userName.FieldName = "edtTime";
+ this.gv_userName.FieldName = "synchronousDate";
this.gv_userName.MinWidth = 10;
this.gv_userName.Name = "gv_userName";
this.gv_userName.OptionsColumn.AllowEdit = false;
diff --git a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
index 082529e..92979ef 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/UserSelectRole.cs
@@ -60,7 +60,9 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+ /// <summary>
+ /// 璇诲彇瑙掕壊鍒楄〃
+ /// </summary>
private void GetCheckList()
{
var _obj = new
@@ -74,6 +76,8 @@
JsonConvert.SerializeObject(_obj));
var dd = UtilityHelper.ReturnToList(strReturn);
var dt = dd.rtnData;
+ if (dt == null)
+ return;
ckList.DataSource = dt;
ckList.ValueMember = "guid";
ckList.DisplayMember = "roleName";
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
index a659d3a..c1b0c3c 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.Designer.cs
@@ -40,6 +40,9 @@
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -63,13 +66,9 @@
this.gv_saleOrderNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_saleOrderEntryseq = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_forceCloserid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_closeType = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_caa016 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -116,6 +115,18 @@
this.txt_typebTxt = new DevExpress.XtraEditors.TextEdit();
this.txt_ypQty = new DevExpress.XtraEditors.TextEdit();
this.txt_kpQty = new DevExpress.XtraEditors.TextEdit();
+ this.txt_saleOrderEntryseq = new DevExpress.XtraEditors.TextEdit();
+ this.txt_ydflxh = new DevExpress.XtraEditors.TextEdit();
+ this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_stockInLimitL = new DevExpress.XtraEditors.TextEdit();
+ this.txt_jaTime = new DevExpress.XtraEditors.TextEdit();
+ this.txt_jaBs = new DevExpress.XtraEditors.CheckEdit();
+ this.txt_caa018 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_caa019 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_mtono = new DevExpress.XtraEditors.TextEdit();
+ this.txt_srcBillType = new DevExpress.XtraEditors.TextEdit();
+ this.txt_caa013 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_lot = new DevExpress.XtraEditors.TextEdit();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -123,23 +134,35 @@
this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.txt_ypQty1111 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_jaBs1111 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_stockInLimitH = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -211,6 +234,18 @@
((System.ComponentModel.ISupportInitialize)(this.txt_typebTxt.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ypQty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kpQty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderEntryseq.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ydflxh.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_stockInLimitL.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_jaTime.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_jaBs.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa018.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa019.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mtono.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_srcBillType.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa013.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lot.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
@@ -218,23 +253,35 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ypQty1111)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_jaBs1111)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_stockInLimitH)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -333,13 +380,9 @@
this.gv_saleOrderNo,
this.gv_saleOrderEntryseq,
this.gridColumn2,
- this.gv_forceCloserid,
- this.gv_closeType,
this.gv_caa016,
this.gridColumn7,
this.gridColumn4,
- this.gridColumn18,
- this.gridColumn19,
this.gridColumn20,
this.gridColumn21,
this.gridColumn22,
@@ -549,8 +592,6 @@
this.gv_saleOrderNo.Name = "gv_saleOrderNo";
this.gv_saleOrderNo.OptionsColumn.AllowEdit = false;
this.gv_saleOrderNo.Tag = "query_a.SALE_ORDER_NO";
- this.gv_saleOrderNo.Visible = true;
- this.gv_saleOrderNo.VisibleIndex = 14;
this.gv_saleOrderNo.Width = 100;
//
// gv_saleOrderEntryseq
@@ -563,8 +604,6 @@
this.gv_saleOrderEntryseq.Name = "gv_saleOrderEntryseq";
this.gv_saleOrderEntryseq.OptionsColumn.AllowEdit = false;
this.gv_saleOrderEntryseq.Tag = "query_a.SALE_ORDER_ENTRYSEQ";
- this.gv_saleOrderEntryseq.Visible = true;
- this.gv_saleOrderEntryseq.VisibleIndex = 15;
this.gv_saleOrderEntryseq.Width = 50;
//
// gridColumn2
@@ -575,34 +614,8 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.AllowEdit = false;
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 16;
+ this.gridColumn2.VisibleIndex = 14;
this.gridColumn2.Width = 110;
- //
- // gv_forceCloserid
- //
- this.gv_forceCloserid.AppearanceCell.Options.UseFont = true;
- this.gv_forceCloserid.Caption = "缁撴浜�";
- this.gv_forceCloserid.FieldName = "forceCloserid";
- this.gv_forceCloserid.MinWidth = 50;
- this.gv_forceCloserid.Name = "gv_forceCloserid";
- this.gv_forceCloserid.OptionsColumn.AllowEdit = false;
- this.gv_forceCloserid.Tag = "query_a.FORCE_CLOSERID";
- this.gv_forceCloserid.Visible = true;
- this.gv_forceCloserid.VisibleIndex = 17;
- this.gv_forceCloserid.Width = 80;
- //
- // gv_closeType
- //
- this.gv_closeType.AppearanceCell.Options.UseFont = true;
- this.gv_closeType.Caption = "缁撴绫诲瀷";
- this.gv_closeType.FieldName = "closeType";
- this.gv_closeType.MinWidth = 50;
- this.gv_closeType.Name = "gv_closeType";
- this.gv_closeType.OptionsColumn.AllowEdit = false;
- this.gv_closeType.Tag = "query_a.CLOSE_TYPE";
- this.gv_closeType.Visible = true;
- this.gv_closeType.VisibleIndex = 18;
- this.gv_closeType.Width = 80;
//
// gv_caa016
//
@@ -614,7 +627,7 @@
this.gv_caa016.OptionsColumn.AllowEdit = false;
this.gv_caa016.Tag = "query_a.CAA016";
this.gv_caa016.Visible = true;
- this.gv_caa016.VisibleIndex = 19;
+ this.gv_caa016.VisibleIndex = 15;
this.gv_caa016.Width = 100;
//
// gridColumn7
@@ -625,7 +638,7 @@
this.gridColumn7.MinWidth = 50;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 20;
+ this.gridColumn7.VisibleIndex = 16;
this.gridColumn7.Width = 50;
//
// gridColumn4
@@ -636,28 +649,8 @@
this.gridColumn4.MinWidth = 50;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 21;
+ this.gridColumn4.VisibleIndex = 17;
this.gridColumn4.Width = 50;
- //
- // gridColumn18
- //
- this.gridColumn18.Caption = "宸ヨ壓璺嚎";
- this.gridColumn18.FieldName = "routingId";
- this.gridColumn18.MinWidth = 25;
- this.gridColumn18.Name = "gridColumn18";
- this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 22;
- this.gridColumn18.Width = 94;
- //
- // gridColumn19
- //
- this.gridColumn19.Caption = "浜х嚎";
- this.gridColumn19.FieldName = "wShopId";
- this.gridColumn19.MinWidth = 25;
- this.gridColumn19.Name = "gridColumn19";
- this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 23;
- this.gridColumn19.Width = 94;
//
// gridColumn20
//
@@ -665,8 +658,6 @@
this.gridColumn20.FieldName = "depotCode";
this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
- this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 24;
this.gridColumn20.Width = 94;
//
// gridColumn21
@@ -675,8 +666,6 @@
this.gridColumn21.FieldName = "workGroupId";
this.gridColumn21.MinWidth = 25;
this.gridColumn21.Name = "gridColumn21";
- this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 25;
this.gridColumn21.Width = 94;
//
// gridColumn22
@@ -685,8 +674,6 @@
this.gridColumn22.FieldName = "planID";
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
- this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 26;
this.gridColumn22.Width = 94;
//
// gridColumn23
@@ -696,7 +683,7 @@
this.gridColumn23.MinWidth = 25;
this.gridColumn23.Name = "gridColumn23";
this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 27;
+ this.gridColumn23.VisibleIndex = 18;
this.gridColumn23.Width = 94;
//
// gridColumn24
@@ -705,8 +692,6 @@
this.gridColumn24.FieldName = "stockInLimitH";
this.gridColumn24.MinWidth = 25;
this.gridColumn24.Name = "gridColumn24";
- this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 28;
this.gridColumn24.Width = 94;
//
// gridColumn25
@@ -715,8 +700,6 @@
this.gridColumn25.FieldName = "stockInLimitL";
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
- this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 29;
this.gridColumn25.Width = 94;
//
// gridColumn26
@@ -725,8 +708,6 @@
this.gridColumn26.FieldName = "mtono";
this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
- this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 30;
this.gridColumn26.Width = 94;
//
// gridColumn27
@@ -735,8 +716,6 @@
this.gridColumn27.FieldName = "lot";
this.gridColumn27.MinWidth = 25;
this.gridColumn27.Name = "gridColumn27";
- this.gridColumn27.Visible = true;
- this.gridColumn27.VisibleIndex = 31;
this.gridColumn27.Width = 94;
//
// gridColumn28
@@ -745,8 +724,6 @@
this.gridColumn28.FieldName = "caa013";
this.gridColumn28.MinWidth = 25;
this.gridColumn28.Name = "gridColumn28";
- this.gridColumn28.Visible = true;
- this.gridColumn28.VisibleIndex = 32;
this.gridColumn28.Width = 94;
//
// gridColumn31
@@ -756,7 +733,7 @@
this.gridColumn31.MinWidth = 25;
this.gridColumn31.Name = "gridColumn31";
this.gridColumn31.Visible = true;
- this.gridColumn31.VisibleIndex = 33;
+ this.gridColumn31.VisibleIndex = 19;
this.gridColumn31.Width = 94;
//
// gridColumn32
@@ -765,8 +742,6 @@
this.gridColumn32.FieldName = "caa018";
this.gridColumn32.MinWidth = 25;
this.gridColumn32.Name = "gridColumn32";
- this.gridColumn32.Visible = true;
- this.gridColumn32.VisibleIndex = 34;
this.gridColumn32.Width = 94;
//
// gridColumn33
@@ -775,8 +750,6 @@
this.gridColumn33.FieldName = "caa019";
this.gridColumn33.MinWidth = 25;
this.gridColumn33.Name = "gridColumn33";
- this.gridColumn33.Visible = true;
- this.gridColumn33.VisibleIndex = 35;
this.gridColumn33.Width = 94;
//
// gridColumn35
@@ -785,8 +758,6 @@
this.gridColumn35.FieldName = "srcBillType";
this.gridColumn35.MinWidth = 25;
this.gridColumn35.Name = "gridColumn35";
- this.gridColumn35.Visible = true;
- this.gridColumn35.VisibleIndex = 36;
this.gridColumn35.Width = 94;
//
// gridColumn36
@@ -795,8 +766,6 @@
this.gridColumn36.FieldName = "srcBillNo";
this.gridColumn36.MinWidth = 25;
this.gridColumn36.Name = "gridColumn36";
- this.gridColumn36.Visible = true;
- this.gridColumn36.VisibleIndex = 38;
this.gridColumn36.Width = 94;
//
// gridColumn37
@@ -805,8 +774,6 @@
this.gridColumn37.FieldName = "ydflxh";
this.gridColumn37.MinWidth = 25;
this.gridColumn37.Name = "gridColumn37";
- this.gridColumn37.Visible = true;
- this.gridColumn37.VisibleIndex = 37;
this.gridColumn37.Width = 94;
//
// gridColumn38
@@ -816,7 +783,7 @@
this.gridColumn38.MinWidth = 25;
this.gridColumn38.Name = "gridColumn38";
this.gridColumn38.Visible = true;
- this.gridColumn38.VisibleIndex = 39;
+ this.gridColumn38.VisibleIndex = 20;
this.gridColumn38.Width = 94;
//
// gridColumn39
@@ -825,8 +792,6 @@
this.gridColumn39.FieldName = "wtOrg";
this.gridColumn39.MinWidth = 25;
this.gridColumn39.Name = "gridColumn39";
- this.gridColumn39.Visible = true;
- this.gridColumn39.VisibleIndex = 40;
this.gridColumn39.Width = 94;
//
// gridColumn30
@@ -836,7 +801,7 @@
this.gridColumn30.MinWidth = 25;
this.gridColumn30.Name = "gridColumn30";
this.gridColumn30.Visible = true;
- this.gridColumn30.VisibleIndex = 41;
+ this.gridColumn30.VisibleIndex = 21;
this.gridColumn30.Width = 94;
//
// gridColumn34
@@ -884,7 +849,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1283, 570);
- this.splitMx1.SplitterPosition = 201;
+ this.splitMx1.SplitterPosition = 276;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -912,6 +877,18 @@
this.layoutMx1.Controls.Add(this.txt_typebTxt);
this.layoutMx1.Controls.Add(this.txt_ypQty);
this.layoutMx1.Controls.Add(this.txt_kpQty);
+ this.layoutMx1.Controls.Add(this.txt_saleOrderEntryseq);
+ this.layoutMx1.Controls.Add(this.txt_ydflxh);
+ this.layoutMx1.Controls.Add(this.textEdit1);
+ this.layoutMx1.Controls.Add(this.txt_stockInLimitL);
+ this.layoutMx1.Controls.Add(this.txt_jaTime);
+ this.layoutMx1.Controls.Add(this.txt_jaBs);
+ this.layoutMx1.Controls.Add(this.txt_caa018);
+ this.layoutMx1.Controls.Add(this.txt_caa019);
+ this.layoutMx1.Controls.Add(this.txt_mtono);
+ this.layoutMx1.Controls.Add(this.txt_srcBillType);
+ this.layoutMx1.Controls.Add(this.txt_caa013);
+ this.layoutMx1.Controls.Add(this.txt_lot);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem19});
@@ -919,7 +896,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1283, 201);
+ this.layoutMx1.Size = new System.Drawing.Size(1283, 276);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -933,7 +910,7 @@
//
// txt_wtOrg
//
- this.txt_wtOrg.Location = new System.Drawing.Point(1061, 132);
+ this.txt_wtOrg.Location = new System.Drawing.Point(1061, 124);
this.txt_wtOrg.Name = "txt_wtOrg";
this.txt_wtOrg.Properties.Appearance.Options.UseFont = true;
this.txt_wtOrg.Size = new System.Drawing.Size(210, 24);
@@ -942,7 +919,7 @@
//
// txt_scOrg
//
- this.txt_scOrg.Location = new System.Drawing.Point(1061, 102);
+ this.txt_scOrg.Location = new System.Drawing.Point(1061, 96);
this.txt_scOrg.Name = "txt_scOrg";
this.txt_scOrg.Properties.Appearance.Options.UseFont = true;
this.txt_scOrg.Size = new System.Drawing.Size(210, 24);
@@ -951,7 +928,7 @@
//
// txt_caa016
//
- this.txt_caa016.Location = new System.Drawing.Point(114, 162);
+ this.txt_caa016.Location = new System.Drawing.Point(114, 180);
this.txt_caa016.Name = "txt_caa016";
this.txt_caa016.Properties.Appearance.Options.UseFont = true;
this.txt_caa016.Size = new System.Drawing.Size(525, 24);
@@ -960,7 +937,7 @@
//
// txt_djlx
//
- this.txt_djlx.Location = new System.Drawing.Point(745, 102);
+ this.txt_djlx.Location = new System.Drawing.Point(745, 68);
this.txt_djlx.Name = "txt_djlx";
this.txt_djlx.Properties.Appearance.Options.UseFont = true;
this.txt_djlx.Size = new System.Drawing.Size(210, 24);
@@ -969,7 +946,7 @@
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(114, 132);
+ this.txt_itemModel.Location = new System.Drawing.Point(114, 124);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
this.txt_itemModel.Size = new System.Drawing.Size(209, 24);
@@ -996,10 +973,10 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(429, 132);
+ this.txt_itemName.Location = new System.Drawing.Point(114, 96);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(210, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(209, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 457;
//
@@ -1023,7 +1000,7 @@
//
// txt_caa020
//
- this.txt_caa020.Location = new System.Drawing.Point(114, 42);
+ this.txt_caa020.Location = new System.Drawing.Point(114, 40);
this.txt_caa020.Name = "txt_caa020";
this.txt_caa020.Properties.Appearance.Options.UseFont = true;
this.txt_caa020.Size = new System.Drawing.Size(209, 24);
@@ -1032,7 +1009,7 @@
//
// txt_caa024
//
- this.txt_caa024.Location = new System.Drawing.Point(745, 162);
+ this.txt_caa024.Location = new System.Drawing.Point(745, 96);
this.txt_caa024.Name = "txt_caa024";
this.txt_caa024.Properties.Appearance.Options.UseFont = true;
this.txt_caa024.Size = new System.Drawing.Size(210, 24);
@@ -1041,7 +1018,7 @@
//
// txt_gdzt
//
- this.txt_gdzt.Location = new System.Drawing.Point(745, 42);
+ this.txt_gdzt.Location = new System.Drawing.Point(429, 124);
this.txt_gdzt.Name = "txt_gdzt";
this.txt_gdzt.Properties.Appearance.Options.UseFont = true;
this.txt_gdzt.Size = new System.Drawing.Size(210, 24);
@@ -1050,7 +1027,7 @@
//
// txt_caa011
//
- this.txt_caa011.Location = new System.Drawing.Point(1061, 42);
+ this.txt_caa011.Location = new System.Drawing.Point(1061, 40);
this.txt_caa011.Name = "txt_caa011";
this.txt_caa011.Properties.Appearance.Options.UseFont = true;
this.txt_caa011.Size = new System.Drawing.Size(210, 24);
@@ -1059,7 +1036,7 @@
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(114, 102);
+ this.txt_itemNo.Location = new System.Drawing.Point(114, 68);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
this.txt_itemNo.Size = new System.Drawing.Size(209, 24);
@@ -1068,16 +1045,16 @@
//
// txt_saleOrderNo
//
- this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 72);
+ this.txt_saleOrderNo.Location = new System.Drawing.Point(745, 180);
this.txt_saleOrderNo.Name = "txt_saleOrderNo";
this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
- this.txt_saleOrderNo.Size = new System.Drawing.Size(209, 24);
+ this.txt_saleOrderNo.Size = new System.Drawing.Size(210, 24);
this.txt_saleOrderNo.StyleController = this.layoutMx1;
this.txt_saleOrderNo.TabIndex = 450;
//
// txt_dwName
//
- this.txt_dwName.Location = new System.Drawing.Point(429, 102);
+ this.txt_dwName.Location = new System.Drawing.Point(429, 96);
this.txt_dwName.Name = "txt_dwName";
this.txt_dwName.Properties.Appearance.Options.UseFont = true;
this.txt_dwName.Size = new System.Drawing.Size(210, 24);
@@ -1086,7 +1063,7 @@
//
// txt_caa005
//
- this.txt_caa005.Location = new System.Drawing.Point(1061, 72);
+ this.txt_caa005.Location = new System.Drawing.Point(1061, 68);
this.txt_caa005.Name = "txt_caa005";
this.txt_caa005.Properties.Appearance.Options.UseFont = true;
this.txt_caa005.Size = new System.Drawing.Size(210, 24);
@@ -1095,7 +1072,7 @@
//
// txt_srcBillNo
//
- this.txt_srcBillNo.Location = new System.Drawing.Point(745, 132);
+ this.txt_srcBillNo.Location = new System.Drawing.Point(429, 236);
this.txt_srcBillNo.Name = "txt_srcBillNo";
this.txt_srcBillNo.Size = new System.Drawing.Size(210, 24);
this.txt_srcBillNo.StyleController = this.layoutMx1;
@@ -1103,7 +1080,7 @@
//
// txt_typebTxt
//
- this.txt_typebTxt.Location = new System.Drawing.Point(745, 72);
+ this.txt_typebTxt.Location = new System.Drawing.Point(745, 40);
this.txt_typebTxt.Name = "txt_typebTxt";
this.txt_typebTxt.Size = new System.Drawing.Size(210, 24);
this.txt_typebTxt.StyleController = this.layoutMx1;
@@ -1111,7 +1088,7 @@
//
// txt_ypQty
//
- this.txt_ypQty.Location = new System.Drawing.Point(429, 42);
+ this.txt_ypQty.Location = new System.Drawing.Point(429, 40);
this.txt_ypQty.Name = "txt_ypQty";
this.txt_ypQty.Size = new System.Drawing.Size(210, 24);
this.txt_ypQty.StyleController = this.layoutMx1;
@@ -1119,11 +1096,108 @@
//
// txt_kpQty
//
- this.txt_kpQty.Location = new System.Drawing.Point(429, 72);
+ this.txt_kpQty.Location = new System.Drawing.Point(429, 68);
this.txt_kpQty.Name = "txt_kpQty";
this.txt_kpQty.Size = new System.Drawing.Size(210, 24);
this.txt_kpQty.StyleController = this.layoutMx1;
this.txt_kpQty.TabIndex = 470;
+ //
+ // txt_saleOrderEntryseq
+ //
+ this.txt_saleOrderEntryseq.Location = new System.Drawing.Point(1061, 180);
+ this.txt_saleOrderEntryseq.Name = "txt_saleOrderEntryseq";
+ this.txt_saleOrderEntryseq.Size = new System.Drawing.Size(210, 24);
+ this.txt_saleOrderEntryseq.StyleController = this.layoutMx1;
+ this.txt_saleOrderEntryseq.TabIndex = 471;
+ //
+ // txt_ydflxh
+ //
+ this.txt_ydflxh.Location = new System.Drawing.Point(1061, 152);
+ this.txt_ydflxh.Name = "txt_ydflxh";
+ this.txt_ydflxh.Size = new System.Drawing.Size(210, 24);
+ this.txt_ydflxh.StyleController = this.layoutMx1;
+ this.txt_ydflxh.TabIndex = 472;
+ //
+ // textEdit1
+ //
+ this.textEdit1.Location = new System.Drawing.Point(745, 152);
+ this.textEdit1.Name = "textEdit1";
+ this.textEdit1.Size = new System.Drawing.Size(210, 24);
+ this.textEdit1.StyleController = this.layoutMx1;
+ this.textEdit1.TabIndex = 473;
+ //
+ // txt_stockInLimitL
+ //
+ this.txt_stockInLimitL.Location = new System.Drawing.Point(745, 124);
+ this.txt_stockInLimitL.Name = "txt_stockInLimitL";
+ this.txt_stockInLimitL.Size = new System.Drawing.Size(210, 24);
+ this.txt_stockInLimitL.StyleController = this.layoutMx1;
+ this.txt_stockInLimitL.TabIndex = 474;
+ //
+ // txt_jaTime
+ //
+ this.txt_jaTime.Location = new System.Drawing.Point(1061, 208);
+ this.txt_jaTime.Name = "txt_jaTime";
+ this.txt_jaTime.Size = new System.Drawing.Size(210, 24);
+ this.txt_jaTime.StyleController = this.layoutMx1;
+ this.txt_jaTime.TabIndex = 475;
+ //
+ // txt_jaBs
+ //
+ this.txt_jaBs.Location = new System.Drawing.Point(643, 208);
+ this.txt_jaBs.Name = "txt_jaBs";
+ this.txt_jaBs.Properties.Caption = "缁撴鏍囪瘑";
+ this.txt_jaBs.Size = new System.Drawing.Size(312, 24);
+ this.txt_jaBs.StyleController = this.layoutMx1;
+ this.txt_jaBs.TabIndex = 477;
+ //
+ // txt_caa018
+ //
+ this.txt_caa018.Location = new System.Drawing.Point(114, 152);
+ this.txt_caa018.Name = "txt_caa018";
+ this.txt_caa018.Size = new System.Drawing.Size(209, 24);
+ this.txt_caa018.StyleController = this.layoutMx1;
+ this.txt_caa018.TabIndex = 478;
+ //
+ // txt_caa019
+ //
+ this.txt_caa019.Location = new System.Drawing.Point(429, 152);
+ this.txt_caa019.Name = "txt_caa019";
+ this.txt_caa019.Size = new System.Drawing.Size(210, 24);
+ this.txt_caa019.StyleController = this.layoutMx1;
+ this.txt_caa019.TabIndex = 479;
+ //
+ // txt_mtono
+ //
+ this.txt_mtono.Location = new System.Drawing.Point(114, 208);
+ this.txt_mtono.Name = "txt_mtono";
+ this.txt_mtono.Size = new System.Drawing.Size(209, 24);
+ this.txt_mtono.StyleController = this.layoutMx1;
+ this.txt_mtono.TabIndex = 480;
+ //
+ // txt_srcBillType
+ //
+ this.txt_srcBillType.Location = new System.Drawing.Point(429, 208);
+ this.txt_srcBillType.Name = "txt_srcBillType";
+ this.txt_srcBillType.Size = new System.Drawing.Size(210, 24);
+ this.txt_srcBillType.StyleController = this.layoutMx1;
+ this.txt_srcBillType.TabIndex = 481;
+ //
+ // txt_caa013
+ //
+ this.txt_caa013.Location = new System.Drawing.Point(745, 236);
+ this.txt_caa013.Name = "txt_caa013";
+ this.txt_caa013.Size = new System.Drawing.Size(210, 24);
+ this.txt_caa013.StyleController = this.layoutMx1;
+ this.txt_caa013.TabIndex = 483;
+ //
+ // txt_lot
+ //
+ this.txt_lot.Location = new System.Drawing.Point(1061, 236);
+ this.txt_lot.Name = "txt_lot";
+ this.txt_lot.Size = new System.Drawing.Size(210, 24);
+ this.txt_lot.StyleController = this.layoutMx1;
+ this.txt_lot.TabIndex = 484;
//
// layoutControlItem19
//
@@ -1147,23 +1221,35 @@
this.layoutControlItem3,
this.layoutControlItem4,
this.layoutControlItem5,
- this.layoutControlItem7,
this.layoutControlItem8,
- this.layoutControlItem9,
this.layoutControlItem12,
- this.layoutControlItem13,
this.layoutControlItem16,
this.layoutControlItem18,
- this.layoutControlItem17,
this.layoutControlItem15,
- this.layoutControlItem20,
- this.layoutControlItem11,
- this.layoutControlItem21,
- this.layoutControlItem14,
this.layoutControlItem10,
- this.layoutControlItem6,
this.txt_ypQty1111,
- this.layoutControlItem22});
+ this.layoutControlItem22,
+ this.layoutControlItem21,
+ this.layoutControlItem25,
+ this.txt_jaBs1111,
+ this.layoutControlItem27,
+ this.layoutControlItem28,
+ this.layoutControlItem17,
+ this.layoutControlItem29,
+ this.layoutControlItem32,
+ this.layoutControlItem11,
+ this.layoutControlItem20,
+ this.layoutControlItem6,
+ this.layoutControlItem26,
+ this.txt_stockInLimitH,
+ this.layoutControlItem30,
+ this.layoutControlItem31,
+ this.layoutControlItem13,
+ this.layoutControlItem14,
+ this.layoutControlItem7,
+ this.layoutControlItem24,
+ this.layoutControlItem23,
+ this.layoutControlItem9});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1191,14 +1277,23 @@
rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition6.Height = 100D;
rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.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(1283, 201);
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8,
+ rowDefinition9});
+ this.Root.Size = new System.Drawing.Size(1283, 276);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1206,7 +1301,7 @@
this.layoutControlItem1.Control = this.txt_caa001;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(315, 30);
+ this.layoutControlItem1.Size = new System.Drawing.Size(315, 28);
this.layoutControlItem1.Text = "鎶曟枡鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1216,7 +1311,7 @@
this.layoutControlItem2.Location = new System.Drawing.Point(315, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(316, 30);
+ this.layoutControlItem2.Size = new System.Drawing.Size(316, 28);
this.layoutControlItem2.Text = "宸ュ崟鏁伴噺";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1226,7 +1321,7 @@
this.layoutControlItem3.Location = new System.Drawing.Point(631, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(316, 30);
+ this.layoutControlItem3.Size = new System.Drawing.Size(316, 28);
this.layoutControlItem3.Text = "鐢熶骇杞﹂棿";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1236,204 +1331,335 @@
this.layoutControlItem4.Location = new System.Drawing.Point(947, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(316, 30);
+ this.layoutControlItem4.Size = new System.Drawing.Size(316, 28);
this.layoutControlItem4.Text = "棰勮寮�宸ユ椂闂�";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_caa020;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 30);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(315, 30);
+ this.layoutControlItem5.Size = new System.Drawing.Size(315, 28);
this.layoutControlItem5.Text = "浠诲姟鍗曞彿";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_gdzt;
- this.layoutControlItem7.CustomizationFormText = "涓氬姟鐘舵��";
- this.layoutControlItem7.Location = new System.Drawing.Point(631, 30);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(316, 30);
- this.layoutControlItem7.Text = "涓氬姟鐘舵��";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_caa011;
- this.layoutControlItem8.Location = new System.Drawing.Point(947, 30);
+ this.layoutControlItem8.Location = new System.Drawing.Point(947, 28);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(316, 30);
+ this.layoutControlItem8.Size = new System.Drawing.Size(316, 28);
this.layoutControlItem8.Text = "棰勮瀹屽伐鏃堕棿";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_saleOrderNo;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 60);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(315, 30);
- this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_caa005;
- this.layoutControlItem12.Location = new System.Drawing.Point(947, 60);
+ this.layoutControlItem12.Location = new System.Drawing.Point(947, 56);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(316, 30);
+ this.layoutControlItem12.Size = new System.Drawing.Size(316, 28);
this.layoutControlItem12.Text = "璁″垝涓嬭揪鏃堕棿";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_itemNo;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 90);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(315, 30);
- this.layoutControlItem13.Text = "浜у搧缂栫爜";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_scOrg;
- this.layoutControlItem16.Location = new System.Drawing.Point(947, 90);
+ this.layoutControlItem16.Location = new System.Drawing.Point(947, 84);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(316, 30);
+ this.layoutControlItem16.Size = new System.Drawing.Size(316, 28);
this.layoutControlItem16.Text = "鐢熶骇缁勭粐";
this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_wtOrg;
- this.layoutControlItem18.Location = new System.Drawing.Point(947, 120);
+ this.layoutControlItem18.Location = new System.Drawing.Point(947, 112);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(316, 30);
+ this.layoutControlItem18.Size = new System.Drawing.Size(316, 28);
this.layoutControlItem18.Text = "濮旀墭缁勭粐";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem17
- //
- this.layoutControlItem17.Control = this.txt_caa016;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 150);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem17.Size = new System.Drawing.Size(631, 31);
- this.layoutControlItem17.Text = "澶囨敞";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_itemModel;
- this.layoutControlItem15.Location = new System.Drawing.Point(0, 120);
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 112);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem15.Size = new System.Drawing.Size(315, 30);
+ this.layoutControlItem15.Size = new System.Drawing.Size(315, 28);
this.layoutControlItem15.Text = "浜у搧瑙勬牸";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem20
- //
- this.layoutControlItem20.Control = this.txt_srcBillNo;
- this.layoutControlItem20.Location = new System.Drawing.Point(631, 120);
- this.layoutControlItem20.Name = "layoutControlItem20";
- this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem20.Size = new System.Drawing.Size(316, 30);
- this.layoutControlItem20.Text = "婧愬崟绫诲瀷";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_djlx;
- this.layoutControlItem11.Location = new System.Drawing.Point(631, 90);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(316, 30);
- this.layoutControlItem11.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem21
- //
- this.layoutControlItem21.Control = this.txt_typebTxt;
- this.layoutControlItem21.Location = new System.Drawing.Point(631, 60);
- this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem21.Size = new System.Drawing.Size(316, 30);
- this.layoutControlItem21.Text = "鐢ㄦ枡娓呭崟";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_itemName;
- this.layoutControlItem14.Location = new System.Drawing.Point(315, 120);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem14.Size = new System.Drawing.Size(316, 30);
- this.layoutControlItem14.Text = "浜у搧鍚嶇О";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_dwName;
- this.layoutControlItem10.Location = new System.Drawing.Point(315, 90);
+ this.layoutControlItem10.Location = new System.Drawing.Point(315, 84);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(316, 30);
+ this.layoutControlItem10.Size = new System.Drawing.Size(316, 28);
this.layoutControlItem10.Text = "鍗曚綅";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_caa024;
- this.layoutControlItem6.Location = new System.Drawing.Point(631, 150);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem6.Size = new System.Drawing.Size(316, 31);
- this.layoutControlItem6.Text = "鍏ュ簱鏁伴噺";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// txt_ypQty1111
//
this.txt_ypQty1111.Control = this.txt_ypQty;
- this.txt_ypQty1111.Location = new System.Drawing.Point(315, 30);
+ this.txt_ypQty1111.Location = new System.Drawing.Point(315, 28);
this.txt_ypQty1111.Name = "txt_ypQty1111";
this.txt_ypQty1111.OptionsTableLayoutItem.ColumnIndex = 1;
this.txt_ypQty1111.OptionsTableLayoutItem.RowIndex = 1;
- this.txt_ypQty1111.Size = new System.Drawing.Size(316, 30);
+ this.txt_ypQty1111.Size = new System.Drawing.Size(316, 28);
this.txt_ypQty1111.Text = "宸叉帓鏁伴噺";
this.txt_ypQty1111.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_kpQty;
- this.layoutControlItem22.Location = new System.Drawing.Point(315, 60);
+ this.layoutControlItem22.Location = new System.Drawing.Point(315, 56);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(316, 30);
+ this.layoutControlItem22.Size = new System.Drawing.Size(316, 28);
this.layoutControlItem22.Text = "鍙帓鏁伴噺";
this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem21
+ //
+ this.layoutControlItem21.Control = this.txt_typebTxt;
+ this.layoutControlItem21.Location = new System.Drawing.Point(631, 28);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem21.Size = new System.Drawing.Size(316, 28);
+ this.layoutControlItem21.Text = "鐢ㄦ枡娓呭崟";
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem25
+ //
+ this.layoutControlItem25.Control = this.txt_jaTime;
+ this.layoutControlItem25.Location = new System.Drawing.Point(947, 196);
+ this.layoutControlItem25.Name = "layoutControlItem25";
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem25.Size = new System.Drawing.Size(316, 28);
+ this.layoutControlItem25.Text = "缁撴鏃堕棿";
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // txt_jaBs1111
+ //
+ this.txt_jaBs1111.Control = this.txt_jaBs;
+ this.txt_jaBs1111.Location = new System.Drawing.Point(631, 196);
+ this.txt_jaBs1111.Name = "txt_jaBs1111";
+ this.txt_jaBs1111.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.txt_jaBs1111.OptionsTableLayoutItem.RowIndex = 7;
+ this.txt_jaBs1111.Size = new System.Drawing.Size(316, 28);
+ this.txt_jaBs1111.TextSize = new System.Drawing.Size(0, 0);
+ this.txt_jaBs1111.TextVisible = false;
+ //
+ // layoutControlItem27
+ //
+ this.layoutControlItem27.Control = this.txt_caa018;
+ this.layoutControlItem27.Location = new System.Drawing.Point(0, 140);
+ this.layoutControlItem27.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem27.Size = new System.Drawing.Size(315, 28);
+ this.layoutControlItem27.Text = "EerpId";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem28
+ //
+ this.layoutControlItem28.Control = this.txt_caa019;
+ this.layoutControlItem28.Location = new System.Drawing.Point(315, 140);
+ this.layoutControlItem28.Name = "layoutControlItem28";
+ this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem28.Size = new System.Drawing.Size(316, 28);
+ this.layoutControlItem28.Text = "Erp搴忓彿";
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_caa016;
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 168);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem17.Size = new System.Drawing.Size(631, 28);
+ this.layoutControlItem17.Text = "澶囨敞";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem29
+ //
+ this.layoutControlItem29.Control = this.txt_mtono;
+ this.layoutControlItem29.Location = new System.Drawing.Point(0, 196);
+ this.layoutControlItem29.Name = "layoutControlItem29";
+ this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem29.Size = new System.Drawing.Size(315, 28);
+ this.layoutControlItem29.Text = "璁″垝璺熻釜鍙�";
+ this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem32
+ //
+ this.layoutControlItem32.Control = this.txt_caa013;
+ this.layoutControlItem32.Location = new System.Drawing.Point(631, 224);
+ this.layoutControlItem32.Name = "layoutControlItem32";
+ this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem32.Size = new System.Drawing.Size(316, 32);
+ this.layoutControlItem32.Text = "Bom";
+ this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_djlx;
+ this.layoutControlItem11.Location = new System.Drawing.Point(631, 56);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(316, 28);
+ this.layoutControlItem11.Text = "鍗曟嵁绫诲瀷";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.txt_srcBillNo;
+ this.layoutControlItem20.CustomizationFormText = "婧愬崟缂栫爜";
+ this.layoutControlItem20.Location = new System.Drawing.Point(315, 224);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem20.Size = new System.Drawing.Size(316, 32);
+ this.layoutControlItem20.Text = "婧愬崟缂栫爜";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_caa024;
+ this.layoutControlItem6.Location = new System.Drawing.Point(631, 84);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem6.Size = new System.Drawing.Size(316, 28);
+ this.layoutControlItem6.Text = "鍏ュ簱鏁伴噺";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem26
+ //
+ this.layoutControlItem26.Control = this.txt_stockInLimitL;
+ this.layoutControlItem26.Location = new System.Drawing.Point(631, 112);
+ this.layoutControlItem26.Name = "layoutControlItem26";
+ this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem26.Size = new System.Drawing.Size(316, 28);
+ this.layoutControlItem26.Text = "鍏ュ簱涓嬮檺";
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // txt_stockInLimitH
+ //
+ this.txt_stockInLimitH.Control = this.textEdit1;
+ this.txt_stockInLimitH.Location = new System.Drawing.Point(631, 140);
+ this.txt_stockInLimitH.Name = "txt_stockInLimitH";
+ this.txt_stockInLimitH.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.txt_stockInLimitH.OptionsTableLayoutItem.RowIndex = 5;
+ this.txt_stockInLimitH.Size = new System.Drawing.Size(316, 28);
+ this.txt_stockInLimitH.Text = "鍏ュ簱涓婇檺";
+ this.txt_stockInLimitH.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem30
+ //
+ this.layoutControlItem30.Control = this.txt_srcBillType;
+ this.layoutControlItem30.Location = new System.Drawing.Point(315, 196);
+ this.layoutControlItem30.Name = "layoutControlItem30";
+ this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 7;
+ this.layoutControlItem30.Size = new System.Drawing.Size(316, 28);
+ this.layoutControlItem30.Text = "婧愬崟绫诲瀷";
+ this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem31
+ //
+ this.layoutControlItem31.Control = this.txt_lot;
+ this.layoutControlItem31.Location = new System.Drawing.Point(947, 224);
+ this.layoutControlItem31.Name = "layoutControlItem31";
+ this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 8;
+ this.layoutControlItem31.Size = new System.Drawing.Size(316, 32);
+ this.layoutControlItem31.Text = "鎵瑰彿";
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_itemNo;
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem13.Size = new System.Drawing.Size(315, 28);
+ this.layoutControlItem13.Text = "浜у搧缂栫爜";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem14
+ //
+ this.layoutControlItem14.Control = this.txt_itemName;
+ this.layoutControlItem14.Location = new System.Drawing.Point(0, 84);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem14.Size = new System.Drawing.Size(315, 28);
+ this.layoutControlItem14.Text = "浜у搧鍚嶇О";
+ this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_gdzt;
+ this.layoutControlItem7.CustomizationFormText = "涓氬姟鐘舵��";
+ this.layoutControlItem7.Location = new System.Drawing.Point(315, 112);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem7.Size = new System.Drawing.Size(316, 28);
+ this.layoutControlItem7.Text = "涓氬姟鐘舵��";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem24
+ //
+ this.layoutControlItem24.Control = this.txt_ydflxh;
+ this.layoutControlItem24.Location = new System.Drawing.Point(947, 140);
+ this.layoutControlItem24.Name = "layoutControlItem24";
+ this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem24.Size = new System.Drawing.Size(316, 28);
+ this.layoutControlItem24.Text = "婧愬崟鍒嗗綍琛屽彿";
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem23
+ //
+ this.layoutControlItem23.Control = this.txt_saleOrderEntryseq;
+ this.layoutControlItem23.Location = new System.Drawing.Point(947, 168);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem23.Size = new System.Drawing.Size(316, 28);
+ this.layoutControlItem23.Text = "闇�姹傚崟琛屽彿";
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_saleOrderNo;
+ this.layoutControlItem9.Location = new System.Drawing.Point(631, 168);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem9.Size = new System.Drawing.Size(316, 28);
+ this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
// tabMx
//
@@ -1441,7 +1667,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1283, 357);
+ this.tabMx.Size = new System.Drawing.Size(1283, 282);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1450,7 +1676,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1281, 325);
+ this.tabMxPage1.Size = new System.Drawing.Size(1281, 250);
this.tabMxPage1.Text = "鏄庣粏";
//
// gcMx1
@@ -1459,7 +1685,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1281, 325);
+ this.gcMx1.Size = new System.Drawing.Size(1281, 250);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1827,6 +2053,18 @@
((System.ComponentModel.ISupportInitialize)(this.txt_typebTxt.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ypQty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_kpQty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderEntryseq.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_ydflxh.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_stockInLimitL.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_jaTime.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_jaBs.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa018.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa019.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_mtono.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_srcBillType.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_caa013.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lot.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
@@ -1834,23 +2072,35 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_ypQty1111)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_jaBs1111)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_stockInLimitH)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1883,13 +2133,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_saleOrderNo;
private DevExpress.XtraGrid.Columns.GridColumn gv_saleOrderEntryseq;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
- private DevExpress.XtraGrid.Columns.GridColumn gv_forceCloserid;
- private DevExpress.XtraGrid.Columns.GridColumn gv_closeType;
private DevExpress.XtraGrid.Columns.GridColumn gv_caa016;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
@@ -1935,12 +2181,9 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private System.Windows.Forms.Label lbGuid;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
@@ -1977,18 +2220,45 @@
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
private DevExpress.XtraEditors.TextEdit txt_typebTxt;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraEditors.TextEdit txt_ypQty;
private DevExpress.XtraEditors.TextEdit txt_kpQty;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem txt_ypQty1111;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
+ private DevExpress.XtraEditors.TextEdit txt_saleOrderEntryseq;
+ private DevExpress.XtraEditors.TextEdit txt_ydflxh;
+ private DevExpress.XtraEditors.TextEdit textEdit1;
+ private DevExpress.XtraEditors.TextEdit txt_stockInLimitL;
+ private DevExpress.XtraEditors.TextEdit txt_jaTime;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+ private DevExpress.XtraEditors.CheckEdit txt_jaBs;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+ private DevExpress.XtraLayout.LayoutControlItem txt_jaBs1111;
+ private DevExpress.XtraEditors.TextEdit txt_caa018;
+ private DevExpress.XtraEditors.TextEdit txt_caa019;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraEditors.TextEdit txt_mtono;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
+ private DevExpress.XtraEditors.TextEdit txt_srcBillType;
+ private DevExpress.XtraEditors.TextEdit txt_caa013;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+ private DevExpress.XtraLayout.LayoutControlItem txt_stockInLimitH;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
+ private DevExpress.XtraEditors.TextEdit txt_lot;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
index 1d31c71..9f52cfd 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
@@ -187,6 +187,10 @@
}
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 977844f..7c6ceed 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -101,7 +101,6 @@
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -505,8 +504,7 @@
this.gridColumn22,
this.gridColumn23,
this.gridColumn24,
- this.gridColumn25,
- this.gridColumn26});
+ this.gridColumn25});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -540,7 +538,7 @@
//
// gridColumn10
//
- this.gridColumn10.Caption = "鏄惁棣栨";
+ this.gridColumn10.Caption = "棣栨鍚堟牸";
this.gridColumn10.FieldName = "isSj";
this.gridColumn10.MaxWidth = 50;
this.gridColumn10.MinWidth = 50;
@@ -911,16 +909,6 @@
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 31;
this.gridColumn25.Width = 94;
- //
- // gridColumn26
- //
- this.gridColumn26.Caption = "棣栦欢妫�楠岀粨鏋�";
- this.gridColumn26.FieldName = "daa026";
- this.gridColumn26.MinWidth = 25;
- this.gridColumn26.Name = "gridColumn26";
- this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 32;
- this.gridColumn26.Width = 94;
//
// pageBar1
//
@@ -3117,7 +3105,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
private UserControls.Data.UcPageBar pageBar1;
private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 346eae2..4213f55 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -51,7 +51,7 @@
fmLogin.ShowDialog();
if (fmLogin.DialogResult == DialogResult.OK)
{
- Application.Run(new FrmMain());
+ Application.Run(new FrmMain());
// Application.Run(new DevFrm.User.SysMenu());
}
}
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index b968cb5..191fc2c 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -42,28 +42,7 @@
{
private static readonly string WebApiUrl =
ConfigurationManager.AppSettings["WebApiUrl"];
-
- public static async Task<string> UploadFileAsync(string filePath)
- {
- using (var httpClient = new HttpClient())
- using (var form = new MultipartFormDataContent())
- {
- httpClient.DefaultRequestHeaders.Add("token",
- GetBasicAuthTicket());
- using (var fs = File.OpenRead(filePath))
- using (var streamContent = new StreamContent(fs))
- {
- form.Add(streamContent, "file", Path.GetFileName(filePath));
- var response =
- await httpClient.PostAsync(
- WebApiUrl + "Upload/UploadFile", form);
- var responseString =
- await response.Content.ReadAsStringAsync();
- return responseString;
- }
- }
- }
-
+
public static (Size, string, Color, Padding) getLoading()
{
Size _size = new Size(360, 90);
@@ -251,6 +230,8 @@
var array = new JArray();
var d = json["rtnData"];
foreach (var a in d) array.Add(a);
+ //if (array.Count <=0)
+ // return null;
var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
rto.rtnData = dt;
return rto;
@@ -1172,7 +1153,12 @@
}
#endregion
-
+ /// <summary>
+ /// 鍒ゆ柇鎺т欢鍙鐘舵��
+ /// </summary>
+ /// <param name="obj"></param>
+ /// <param name="isEdt"></param>
+ /// <returns></returns>
private static bool _isRead(object obj, bool isEdt = false)
{
///姘歌繙鏄彧璇荤殑
@@ -1286,36 +1272,7 @@
}
}
- /// <summary>
- /// 杞┘宄板懡鍚�
- /// </summary>
- /// <param name="input"></param>
- /// <returns></returns>
- public static string ToCamelCase(string strItem)
- {
- //濡傛灉鍖呭惈灏忓啓锛屼絾涓嶅寘鍚笅鍒掔嚎
- var hasLowercase = Regex.IsMatch(strItem, @"[a-z]");
- if (hasLowercase && !strItem.Contains("_"))
- {
- var chars = strItem.ToCharArray();
- chars[0] = char.ToLower(chars[0]);
- return new string(chars);
- }
-
- var strItems = strItem.ToLower().Split('_');
- var strItemTarget = strItems[0];
- for (var j = 1; j < strItems.Length; j++)
- {
- var temp = strItems[j];
- var temp1 = temp[0].ToString().ToUpper();
- var temp2 = "";
- temp2 = temp1 + temp.Remove(0, 1);
- strItemTarget += temp2;
- }
-
- return strItemTarget;
- }
-
+
/// <summary>
/// 杞珿uid
/// </summary>
@@ -1343,30 +1300,7 @@
if (string.IsNullOrEmpty(s)) return null;
return decimal.Parse(s);
}
- public static int ToInt(string str)
- {
- try
- {
- return int.Parse(str);
- }
- catch (Exception)
- {
-
- return 0;
- }
- }
- public static long ToLong(string str)
- {
- try
- {
- return long.Parse(str);
- }
- catch (Exception)
- {
-
- return 0;
- }
- }
+
public static int ToBit(string str)
{
@@ -1374,12 +1308,7 @@
return 1;
return 0;
}
- public static bool ToBoole(string str)
- {
- if (str.ToUpper() == "true".ToUpper())
- return true;
- return false;
- }
+
public static bool ToCheck(string str)
{
diff --git a/DevApp/Gs.DevApp/UserControl/ShowUp.Designer.cs b/DevApp/Gs.DevApp/UserControl/ShowUp.Designer.cs
index 3c820e5..eea023f 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowUp.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowUp.Designer.cs
@@ -29,22 +29,91 @@
private void InitializeComponent()
{
this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
+ this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.sidePanel1 = new DevExpress.XtraEditors.SidePanel();
+ this.label1 = new System.Windows.Forms.Label();
+ this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
+ this.xtraTabControl1.SuspendLayout();
+ this.xtraTabPage1.SuspendLayout();
+ this.xtraTabPage2.SuspendLayout();
+ this.sidePanel1.SuspendLayout();
this.SuspendLayout();
//
// ucUpFile1
//
- this.ucUpFile1.Location = new System.Drawing.Point(39, 80);
+ this.ucUpFile1.Location = new System.Drawing.Point(10, 55);
this.ucUpFile1.Name = "ucUpFile1";
+ this.ucUpFile1.parentGroup = null;
this.ucUpFile1.parentGuid = null;
this.ucUpFile1.Size = new System.Drawing.Size(613, 59);
this.ucUpFile1.TabIndex = 0;
+ //
+ // xtraTabControl1
+ //
+ 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(724, 318);
+ this.xtraTabControl1.TabIndex = 1;
+ this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage1,
+ this.xtraTabPage2});
+ //
+ // xtraTabPage1
+ //
+ this.xtraTabPage1.Controls.Add(this.ucUpFile1);
+ this.xtraTabPage1.Name = "xtraTabPage1";
+ this.xtraTabPage1.Size = new System.Drawing.Size(722, 286);
+ this.xtraTabPage1.Text = "涓婁紶鏂囦欢";
+ //
+ // xtraTabPage2
+ //
+ this.xtraTabPage2.Controls.Add(this.flowLayoutPanel1);
+ this.xtraTabPage2.Controls.Add(this.sidePanel1);
+ this.xtraTabPage2.Name = "xtraTabPage2";
+ this.xtraTabPage2.Size = new System.Drawing.Size(722, 286);
+ this.xtraTabPage2.Text = "涓嬭浇妯℃澘";
+ //
+ // sidePanel1
+ //
+ this.sidePanel1.Controls.Add(this.label1);
+ this.sidePanel1.Dock = System.Windows.Forms.DockStyle.Top;
+ this.sidePanel1.Location = new System.Drawing.Point(0, 0);
+ this.sidePanel1.Name = "sidePanel1";
+ this.sidePanel1.Size = new System.Drawing.Size(722, 85);
+ this.sidePanel1.TabIndex = 3;
+ this.sidePanel1.Text = "sidePanel1";
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.ForeColor = System.Drawing.Color.Red;
+ this.label1.Location = new System.Drawing.Point(37, 13);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(271, 54);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "鍙嬫儏鎻愰啋锛歕r\n1锛岃涓嶈淇敼琛ㄦ牸鐨勬牱寮忋�俓r\n2锛岄噸澶嶇殑鏁版嵁灏嗕細琚繃婊わ紝涓嶄細瀵煎叆銆�";
+ //
+ // flowLayoutPanel1
+ //
+ this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 85);
+ this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
+ this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+ this.flowLayoutPanel1.Padding = new System.Windows.Forms.Padding(5);
+ this.flowLayoutPanel1.Size = new System.Drawing.Size(722, 201);
+ this.flowLayoutPanel1.TabIndex = 2;
//
// ShowUp
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(724, 247);
- this.Controls.Add(this.ucUpFile1);
+ this.ClientSize = new System.Drawing.Size(724, 318);
+ this.Controls.Add(this.xtraTabControl1);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
this.MaximizeBox = false;
this.MinimizeBox = false;
@@ -52,6 +121,12 @@
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "鏂囦欢涓婁紶";
this.TopMost = true;
+ ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
+ this.xtraTabControl1.ResumeLayout(false);
+ this.xtraTabPage1.ResumeLayout(false);
+ this.xtraTabPage2.ResumeLayout(false);
+ this.sidePanel1.ResumeLayout(false);
+ this.sidePanel1.PerformLayout();
this.ResumeLayout(false);
}
@@ -59,5 +134,11 @@
#endregion
private UCUpFile ucUpFile1;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
+ private DevExpress.XtraEditors.SidePanel sidePanel1;
+ private System.Windows.Forms.Label label1;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/ShowUp.cs b/DevApp/Gs.DevApp/UserControl/ShowUp.cs
index 3f9527e..a6fd13a 100644
--- a/DevApp/Gs.DevApp/UserControl/ShowUp.cs
+++ b/DevApp/Gs.DevApp/UserControl/ShowUp.cs
@@ -1,5 +1,13 @@
-锘縰sing Gs.DevApp.ToolBox;
+锘縰sing CefSharp;
+using DevExpress.XtraEditors;
+using Gs.DevApp.ToolBox;
using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Net;
+using System.Windows.Documents;
+using System.Windows.Forms;
namespace Gs.DevApp.UserControl
{
@@ -12,12 +20,21 @@
public event EventHandler<UpdateParentEventArgs> UpdateParent;
string parentGuid = "";
- public ShowUp(string _parentGuid)
+
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="_parentGuid">鐖朵翰guid</param>
+ /// <param name="isXls">濡傛灉鏄痻ls锛屾樉绀虹浉搴旂殑璇存槑</param>
+ public ShowUp(string _parentGuid, bool isXls = false)
{
InitializeComponent();
this.parentGuid = _parentGuid;
this.ucUpFile1.parentGuid = _parentGuid;
ucUpFile1.UpChanged += UcUpFile1_UpChanged;
+
+ getBtn();
}
/// <summary>
@@ -31,5 +48,64 @@
new UpdateParentEventArgs { FilterList = null });
Close();
}
+
+ private void getBtn()
+ {
+ List<dynamic> lst = new List<dynamic>();
+ lst.Add(new
+ {
+ btnTxt = "妫�楠屽伐鍏穃nXLS妯℃澘",
+ xls = "001妫�楠屽伐鍏�.xls"
+ });
+ lst.Add(new
+ {
+ btnTxt = "妫�楠岄」鐩甛nXLS妯℃澘",
+ xls = "001妫�楠岄」鐩�.xls"//001
+ });
+
+ lst.Add(new
+ {
+ btnTxt = "鐗╂枡妫�楠岄」鐩甛nXLS妯℃澘",
+ xls = "001鐗╂枡妫�楠岄」鐩�.xls"
+ });
+
+ foreach (var obj in lst)
+ {
+ SimpleButton btn = new DevExpress.XtraEditors.SimpleButton();
+ btn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printarea_32x32;
+ btn.ImageOptions.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.TopCenter;
+ btn.Name = Guid.NewGuid().ToString();
+ btn.Size = new System.Drawing.Size(120, 120);
+ btn.TabIndex = 1;
+ btn.Text = obj.btnTxt;
+ btn.Margin = new System.Windows.Forms.Padding(10);
+ btn.Tag = obj.xls;
+ this.flowLayoutPanel1.Controls.Add(btn);
+ btn.Click += Btn_Click;
+ }
+ }
+
+ private void Btn_Click(object sender, EventArgs e)
+ {
+ string _guid = Guid.NewGuid().ToString();
+ SimpleButton btn = (SimpleButton)sender;
+ string urlPath = btn.Tag.ToString();//a697b909-5baa-4e74-8df4-87abb1f96240ico.png
+ using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
+ {
+ folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
+ DialogResult dialogResult = folderBrowserDialog.ShowDialog();
+ if (dialogResult == DialogResult.OK)
+ {
+ string _folder = folderBrowserDialog.SelectedPath;
+ string _folderName = _folder + "\\" + urlPath;
+ string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + "upload/" + urlPath;
+ using (WebClient client = new WebClient())
+ {
+ client.DownloadFile(_url, _folderName);
+ }
+ ToolBox.MsgHelper.ShowInformation("涓嬭浇鎴愬姛锛�");
+ }
+ }
+ }
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/UCUpFile.cs b/DevApp/Gs.DevApp/UserControl/UCUpFile.cs
index e67278a..93cfa75 100644
--- a/DevApp/Gs.DevApp/UserControl/UCUpFile.cs
+++ b/DevApp/Gs.DevApp/UserControl/UCUpFile.cs
@@ -19,7 +19,7 @@
}
/// <summary>
- ///
+ /// 鐖朵翰guid
/// </summary>
public string parentGuid
{
@@ -27,7 +27,7 @@
set;
}
/// <summary>
- ///
+ /// 鍥剧墖鍒嗙粍锛屾瘮濡俵ogin,logo绛夊垎缁�
/// </summary>
public string parentGroup
{
@@ -53,7 +53,7 @@
// 璁剧疆鍒濆鐩綍
openFileDialog.InitialDirectory = "c:\\";
// 璁剧疆鏂囦欢杩囨护閫夐」锛屽锛�"鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*"
- openFileDialog.Filter = "鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*";
+ openFileDialog.Filter = "鎵�鏈夋枃浠� (*.*)|*.*";
// 璁剧疆鏍囬
openFileDialog.Title = "閫夋嫨鏂囦欢";
// 鏄剧ず瀵硅瘽妗�
@@ -113,9 +113,7 @@
catch (Exception ex)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
-
}
-
}
#endregion
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index a872307..873cffb 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -574,7 +574,7 @@
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 276);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 146);
this.barDockControlBottom.Manager = this.barManager1;
this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
//
@@ -584,7 +584,7 @@
this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
this.barDockControlLeft.Location = new System.Drawing.Point(0, 142);
this.barDockControlLeft.Manager = this.barManager1;
- this.barDockControlLeft.Size = new System.Drawing.Size(0, 134);
+ this.barDockControlLeft.Size = new System.Drawing.Size(0, 4);
//
// barDockControlRight
//
@@ -592,7 +592,7 @@
this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
this.barDockControlRight.Location = new System.Drawing.Point(1543, 142);
this.barDockControlRight.Manager = this.barManager1;
- this.barDockControlRight.Size = new System.Drawing.Size(0, 134);
+ this.barDockControlRight.Size = new System.Drawing.Size(0, 4);
//
// UcToolBarMenu
//
@@ -603,7 +603,7 @@
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 276);
+ this.Size = new System.Drawing.Size(1543, 146);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index ad85a95..5429567 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -1,6 +1,7 @@
锘縰sing DevExpress.XtraBars;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid;
+using DevExpress.XtraGrid.Views.Base.ViewInfo;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout;
using Gs.DevApp.DevFrm.Rpt;
@@ -16,7 +17,9 @@
using System.IO;
using System.Linq;
using System.Net;
+using System.Net.Http;
using System.Text;
+using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.UserControl
@@ -264,21 +267,6 @@
btnFjianYanClick(this, e);
else
return;
- //if (string.IsNullOrEmpty(guidKey))
- //{
- // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- // return;
- //}
-
- //if (string.IsNullOrEmpty(chkParameter))
- //{
- // MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- // return;
- //}
-
- //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鎾ゅ洖妫�楠屽悧锛�"))
- // return;
- //_ckService(0.ToString());
}
private void BtnJianYan_ItemClick(object sender, ItemClickEventArgs e)
@@ -289,27 +277,6 @@
btnJianYanClick(this, e);
else
return;
-
- //if (string.IsNullOrEmpty(guidKey))
- //{
- // MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
- // return;
- //}
-
- //if (string.IsNullOrEmpty(chkParameter))
- //{
- // MsgHelper.ShowError("娌℃湁鎸囧畾妫�楠屽弬鏁帮紝璇疯仈绯诲紑鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
- // return;
- //}
-
- //if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鎻愪氦妫�楠屽悧锛�"))
- // return;
- //var _obj = new
- //{
- // guid = guidKey,
- // parameter = chkParameter
- //};
- //_ckService(1.ToString());
}
private void BtnShouJian_ItemClick(object sender, ItemClickEventArgs e)
{
@@ -326,38 +293,36 @@
MsgHelper.ShowError("娌℃湁鎸囧畾瀵煎叆鏈嶅姟锛岃鑱旂郴寮�鍙戜汉鍛樿幏鍙栨敮鎸侊紒");
return;
}
-
- var openFileDialog = new OpenFileDialog();
- //openFileDialog.InitialDirectory = "c:\\";
- openFileDialog.Filter = "鏂囨湰鏂囦欢 (*.txt)|*.txt|鎵�鏈夋枃浠� (*.*)|*.*";
- openFileDialog.Title = "閫夋嫨鏂囦欢";
- var result = openFileDialog.ShowDialog();
- if (result == DialogResult.OK)
+ //鐢ㄤ簬鍒ゆ柇iqc,ipqc棣栨锛宨pqc宸℃锛宖qc
+ string strType = "";
+ if (xlsInService.Contains("&"))
{
- var WebApiUrl = ConfigurationManager.AppSettings["WebApiUrl"] +
- "Upload/UploadFile";
- var strJson =
- await UtilityHelper.UploadFileAsync(openFileDialog
- .FileName);
- var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- string filePath = _rtn.rtnData["filePath"].ToString();
- if (_rtn.rtnCode > 0)
- {
- var _obj = filePath;
- try
- {
- strJson = UtilityHelper.HttpPost("",
- "XlsInOut/" + xlsInService,
- JsonConvert.SerializeObject(_obj));
- _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
- }
- catch (Exception ex)
- {
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- }
- }
+ strType = xlsInService.Split('&')[1];
}
+ //杩欐槸涓�涓殢鏈哄�硷紝灏嗕細琚綋浣滅埗浜瞘uid瀛樺埌file琛ㄤ腑锛屾湇鍔＄鏍规嵁杩欎釜guid璇诲彇鐩稿簲鐨勬枃浠�
+ string upGuid = Guid.NewGuid().ToString();
+ Gs.DevApp.UserControl.ShowUp frm = new Gs.DevApp.UserControl.ShowUp(upGuid);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ var _obj = new
+ {
+ tmpGuid = upGuid,
+ strType = strType,
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("",
+ "XlsInOut/" + xlsInService,
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ };
+ frm.ShowDialog();
}
private void BtnOut_ItemClick(object sender, ItemClickEventArgs e)
--
Gitblit v1.9.3