From 46ceb9bfdcde71d1075d5a3c717e59a646dd607d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 12 五月 2025 07:54:21 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs | 53 +
DevApp/Gs.DevApp/UserControl/UcLookItems.cs | 7
DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs | 3
DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs | 7
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs | 551 +++++++++------------
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs | 71 +-
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs | 217 +++-----
DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/User/User.cs | 7
DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs | 2
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 5
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs | 1
DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs | 15
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs | 417 +++++----------
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs | 14
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs | 52 +-
DevApp/Gs.DevApp/DevFrm/User/Role.cs | 5
DevApp/Gs.DevApp/Program.cs | 11
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs | 6
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs | 20
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs | 6
23 files changed, 642 insertions(+), 835 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index c2dd903..4a5b59e 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
</assemblyBinding>
</runtime>
<appSettings>
- <add key="WebApiUrl" value="http://localhost:5263/" />
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
index 58b00c4..18ecff6 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItems.Designer.cs
@@ -39,7 +39,6 @@
DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -65,6 +64,11 @@
this.gv_depotNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_isStatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -82,12 +86,8 @@
this.txt_ffinishreceiptoverrate = new DevExpress.XtraEditors.TextEdit();
this.txt_itemName = new DevExpress.XtraEditors.MemoEdit();
this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit();
- this.txt_itemSname = new DevExpress.XtraEditors.TextEdit();
this.txt_itemDescription = new DevExpress.XtraEditors.TextEdit();
this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
- this.txt_itemType = new DevExpress.XtraEditors.TextEdit();
- this.txt_itemVersion = new DevExpress.XtraEditors.TextEdit();
- this.txt_ppbom00019124 = new DevExpress.XtraEditors.TextEdit();
this.txt_materialProperti = new DevExpress.XtraEditors.TextEdit();
this.txt_productionWorkshop = new DevExpress.XtraEditors.TextEdit();
this.txt_highlimit = new DevExpress.XtraEditors.TextEdit();
@@ -96,30 +96,25 @@
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -150,12 +145,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_ffinishreceiptoverrate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemSname.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemDescription.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemType.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemVersion.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_ppbom00019124.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_highlimit.Properties)).BeginInit();
@@ -164,28 +155,24 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -284,7 +271,11 @@
this.gv_depotNo,
this.gv_isStatus,
this.gridColumn1,
- this.gridColumn3});
+ this.gridColumn3,
+ this.gridColumn6,
+ this.gridColumn7,
+ this.gridColumn8,
+ this.gridColumn9});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.HorzScrollVisibility = DevExpress.XtraGrid.Views.Base.ScrollVisibility.Always;
this.gridView1.IndicatorWidth = 50;
@@ -360,7 +351,7 @@
// gv_lowLimt
//
this.gv_lowLimt.AppearanceCell.Options.UseFont = true;
- this.gv_lowLimt.Caption = "鏈�浣庡簱瀛�";
+ this.gv_lowLimt.Caption = "瀹夊叏搴撳瓨";
this.gv_lowLimt.FieldName = "lowlimit";
this.gv_lowLimt.MaxWidth = 50;
this.gv_lowLimt.MinWidth = 50;
@@ -544,8 +535,56 @@
this.gridColumn1.OptionsFilter.FilterPopupMode = DevExpress.XtraGrid.Columns.FilterPopupMode.Date;
this.gridColumn1.Tag = "query_a.lastupdate_date";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 16;
+ this.gridColumn1.VisibleIndex = 20;
this.gridColumn1.Width = 180;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "涓婚敭Guid";
+ this.gridColumn3.FieldName = "guid";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Width = 94;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "鍏ュ簱瓒呮敹姣斾緥(%)";
+ this.gridColumn6.FieldName = "ffinishreceiptoverrate";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 16;
+ this.gridColumn6.Width = 94;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "鍙戞枡鏂瑰紡";
+ this.gridColumn7.FieldName = "fissuetype";
+ this.gridColumn7.MinWidth = 25;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 17;
+ this.gridColumn7.Width = 94;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鍚敤鎵瑰彿";
+ this.gridColumn8.FieldName = "fisbatchmanage";
+ this.gridColumn8.MinWidth = 25;
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 18;
+ this.gridColumn8.Width = 94;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "鍗曟嵁鐘舵��";
+ this.gridColumn9.FieldName = "dataType";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 19;
+ this.gridColumn9.Width = 94;
//
// pageBar1
//
@@ -583,7 +622,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1158, 570);
- this.splitMx1.SplitterPosition = 214;
+ this.splitMx1.SplitterPosition = 164;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -601,12 +640,8 @@
this.layoutMx1.Controls.Add(this.txt_ffinishreceiptoverrate);
this.layoutMx1.Controls.Add(this.txt_itemName);
this.layoutMx1.Controls.Add(this.txt_itemModel);
- this.layoutMx1.Controls.Add(this.txt_itemSname);
this.layoutMx1.Controls.Add(this.txt_itemDescription);
this.layoutMx1.Controls.Add(this.txt_itemNo);
- this.layoutMx1.Controls.Add(this.txt_itemType);
- this.layoutMx1.Controls.Add(this.txt_itemVersion);
- this.layoutMx1.Controls.Add(this.txt_ppbom00019124);
this.layoutMx1.Controls.Add(this.txt_materialProperti);
this.layoutMx1.Controls.Add(this.txt_productionWorkshop);
this.layoutMx1.Controls.Add(this.txt_highlimit);
@@ -619,13 +654,13 @@
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(1158, 214);
+ this.layoutMx1.Size = new System.Drawing.Size(1158, 164);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// txt_cgName
//
- this.txt_cgName.Location = new System.Drawing.Point(951, 172);
+ this.txt_cgName.Location = new System.Drawing.Point(951, 127);
this.txt_cgName.Name = "txt_cgName";
this.txt_cgName.Properties.Appearance.Options.UseFont = true;
this.txt_cgName.Size = new System.Drawing.Size(195, 24);
@@ -644,17 +679,17 @@
//
// txt_scName
//
- this.txt_scName.Location = new System.Drawing.Point(951, 140);
+ this.txt_scName.Location = new System.Drawing.Point(667, 127);
this.txt_scName.Name = "txt_scName";
this.txt_scName.Properties.Appearance.Options.UseFont = true;
- this.txt_scName.Size = new System.Drawing.Size(195, 24);
+ this.txt_scName.Size = new System.Drawing.Size(193, 24);
this.txt_scName.StyleController = this.layoutMx1;
this.txt_scName.TabIndex = 408;
this.txt_scName.Tag = "isStatus";
//
// txt_fforbidstatusTxt
//
- this.txt_fforbidstatusTxt.Location = new System.Drawing.Point(383, 172);
+ this.txt_fforbidstatusTxt.Location = new System.Drawing.Point(383, 98);
this.txt_fforbidstatusTxt.Name = "txt_fforbidstatusTxt";
this.txt_fforbidstatusTxt.Properties.Appearance.Options.UseFont = true;
this.txt_fforbidstatusTxt.Size = new System.Drawing.Size(193, 24);
@@ -664,7 +699,7 @@
//
// txt_xxName
//
- this.txt_xxName.Location = new System.Drawing.Point(951, 108);
+ this.txt_xxName.Location = new System.Drawing.Point(951, 98);
this.txt_xxName.Name = "txt_xxName";
this.txt_xxName.Properties.Appearance.Options.UseFont = true;
this.txt_xxName.Size = new System.Drawing.Size(195, 24);
@@ -674,7 +709,7 @@
//
// txt_dptName
//
- this.txt_dptName.Location = new System.Drawing.Point(99, 172);
+ this.txt_dptName.Location = new System.Drawing.Point(99, 69);
this.txt_dptName.Name = "txt_dptName";
this.txt_dptName.Properties.Appearance.Options.UseFont = true;
this.txt_dptName.Size = new System.Drawing.Size(193, 24);
@@ -684,7 +719,7 @@
//
// txt_wlName
//
- this.txt_wlName.Location = new System.Drawing.Point(951, 76);
+ this.txt_wlName.Location = new System.Drawing.Point(951, 69);
this.txt_wlName.Name = "txt_wlName";
this.txt_wlName.Properties.Appearance.Options.UseFont = true;
this.txt_wlName.Size = new System.Drawing.Size(195, 24);
@@ -694,7 +729,7 @@
//
// txt_wwName
//
- this.txt_wwName.Location = new System.Drawing.Point(951, 44);
+ this.txt_wwName.Location = new System.Drawing.Point(951, 40);
this.txt_wwName.Name = "txt_wwName";
this.txt_wwName.Properties.Appearance.Options.UseFont = true;
this.txt_wwName.Size = new System.Drawing.Size(195, 24);
@@ -714,7 +749,7 @@
//
// txt_fissueType
//
- this.txt_fissueType.Location = new System.Drawing.Point(383, 140);
+ this.txt_fissueType.Location = new System.Drawing.Point(383, 69);
this.txt_fissueType.Name = "txt_fissueType";
this.txt_fissueType.Properties.Appearance.Options.UseFont = true;
this.txt_fissueType.Size = new System.Drawing.Size(193, 24);
@@ -724,7 +759,7 @@
//
// txt_ffinishreceiptoverrate
//
- this.txt_ffinishreceiptoverrate.Location = new System.Drawing.Point(667, 140);
+ this.txt_ffinishreceiptoverrate.Location = new System.Drawing.Point(667, 98);
this.txt_ffinishreceiptoverrate.Name = "txt_ffinishreceiptoverrate";
this.txt_ffinishreceiptoverrate.Properties.Appearance.Options.UseFont = true;
this.txt_ffinishreceiptoverrate.Size = new System.Drawing.Size(193, 24);
@@ -737,34 +772,24 @@
this.txt_itemName.Location = new System.Drawing.Point(99, 12);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(193, 28);
+ this.txt_itemName.Size = new System.Drawing.Size(193, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 216;
this.txt_itemName.Tag = "itemName";
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(99, 44);
+ this.txt_itemModel.Location = new System.Drawing.Point(99, 127);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(193, 28);
+ this.txt_itemModel.Size = new System.Drawing.Size(477, 25);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 219;
this.txt_itemModel.Tag = "itemModel";
//
- // txt_itemSname
- //
- this.txt_itemSname.Location = new System.Drawing.Point(99, 76);
- this.txt_itemSname.Name = "txt_itemSname";
- this.txt_itemSname.Properties.Appearance.Options.UseFont = true;
- this.txt_itemSname.Size = new System.Drawing.Size(193, 24);
- this.txt_itemSname.StyleController = this.layoutMx1;
- this.txt_itemSname.TabIndex = 217;
- this.txt_itemSname.Tag = "itemSname";
- //
// txt_itemDescription
//
- this.txt_itemDescription.Location = new System.Drawing.Point(99, 108);
+ this.txt_itemDescription.Location = new System.Drawing.Point(99, 40);
this.txt_itemDescription.Name = "txt_itemDescription";
this.txt_itemDescription.Properties.Appearance.Options.UseFont = true;
this.txt_itemDescription.Size = new System.Drawing.Size(193, 24);
@@ -782,39 +807,9 @@
this.txt_itemNo.TabIndex = 213;
this.txt_itemNo.Tag = "itemNo";
//
- // txt_itemType
- //
- this.txt_itemType.Location = new System.Drawing.Point(383, 44);
- this.txt_itemType.Name = "txt_itemType";
- this.txt_itemType.Properties.Appearance.Options.UseFont = true;
- this.txt_itemType.Size = new System.Drawing.Size(193, 24);
- this.txt_itemType.StyleController = this.layoutMx1;
- this.txt_itemType.TabIndex = 228;
- this.txt_itemType.Tag = "itemType";
- //
- // txt_itemVersion
- //
- this.txt_itemVersion.Location = new System.Drawing.Point(383, 76);
- this.txt_itemVersion.Name = "txt_itemVersion";
- this.txt_itemVersion.Properties.Appearance.Options.UseFont = true;
- this.txt_itemVersion.Size = new System.Drawing.Size(193, 24);
- this.txt_itemVersion.StyleController = this.layoutMx1;
- this.txt_itemVersion.TabIndex = 231;
- this.txt_itemVersion.Tag = "itemVersion";
- //
- // txt_ppbom00019124
- //
- this.txt_ppbom00019124.Location = new System.Drawing.Point(383, 108);
- this.txt_ppbom00019124.Name = "txt_ppbom00019124";
- this.txt_ppbom00019124.Properties.Appearance.Options.UseFont = true;
- this.txt_ppbom00019124.Size = new System.Drawing.Size(193, 24);
- this.txt_ppbom00019124.StyleController = this.layoutMx1;
- this.txt_ppbom00019124.TabIndex = 319;
- this.txt_ppbom00019124.Tag = "bomNo";
- //
// txt_materialProperti
//
- this.txt_materialProperti.Location = new System.Drawing.Point(667, 12);
+ this.txt_materialProperti.Location = new System.Drawing.Point(383, 40);
this.txt_materialProperti.Name = "txt_materialProperti";
this.txt_materialProperti.Properties.Appearance.Options.UseFont = true;
this.txt_materialProperti.Size = new System.Drawing.Size(193, 24);
@@ -824,7 +819,7 @@
//
// txt_productionWorkshop
//
- this.txt_productionWorkshop.Location = new System.Drawing.Point(667, 44);
+ this.txt_productionWorkshop.Location = new System.Drawing.Point(667, 12);
this.txt_productionWorkshop.Name = "txt_productionWorkshop";
this.txt_productionWorkshop.Properties.Appearance.Options.UseFont = true;
this.txt_productionWorkshop.Size = new System.Drawing.Size(193, 24);
@@ -834,7 +829,7 @@
//
// txt_highlimit
//
- this.txt_highlimit.Location = new System.Drawing.Point(667, 76);
+ this.txt_highlimit.Location = new System.Drawing.Point(667, 40);
this.txt_highlimit.Name = "txt_highlimit";
this.txt_highlimit.Properties.Appearance.Options.UseFont = true;
this.txt_highlimit.Size = new System.Drawing.Size(193, 24);
@@ -844,7 +839,7 @@
//
// txt_lowlimit
//
- this.txt_lowlimit.Location = new System.Drawing.Point(667, 108);
+ this.txt_lowlimit.Location = new System.Drawing.Point(667, 69);
this.txt_lowlimit.Name = "txt_lowlimit";
this.txt_lowlimit.Properties.Appearance.Options.UseFont = true;
this.txt_lowlimit.Size = new System.Drawing.Size(193, 24);
@@ -854,7 +849,7 @@
//
// txt_prdPack
//
- this.txt_prdPack.Location = new System.Drawing.Point(99, 140);
+ this.txt_prdPack.Location = new System.Drawing.Point(99, 98);
this.txt_prdPack.Name = "txt_prdPack";
this.txt_prdPack.Properties.Appearance.Options.UseFont = true;
this.txt_prdPack.Size = new System.Drawing.Size(193, 24);
@@ -880,28 +875,24 @@
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
- this.layoutControlItem2,
- this.layoutControlItem3,
- this.layoutControlItem4,
this.layoutControlItem5,
- this.layoutControlItem6,
- this.layoutControlItem7,
- this.layoutControlItem8,
- this.layoutControlItem9,
- this.layoutControlItem10,
- this.layoutControlItem11,
- this.layoutControlItem12,
this.layoutControlItem13,
this.layoutControlItem14,
this.layoutControlItem15,
this.layoutControlItem16,
this.layoutControlItem17,
this.layoutControlItem18,
+ this.layoutControlItem23,
+ this.layoutControlItem9,
+ this.layoutControlItem10,
+ this.layoutControlItem11,
+ this.layoutControlItem12,
this.layoutControlItem19,
- this.layoutControlItem20,
this.layoutControlItem21,
this.layoutControlItem22,
- this.layoutControlItem23});
+ this.layoutControlItem2,
+ this.layoutControlItem4,
+ this.layoutControlItem20});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -927,16 +918,13 @@
rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition5.Height = 100D;
rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
rowDefinition3,
rowDefinition4,
- rowDefinition5,
- rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1158, 214);
+ rowDefinition5});
+ this.Root.Size = new System.Drawing.Size(1158, 164);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -944,39 +932,9 @@
this.layoutControlItem1.Control = this.txt_itemName;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(284, 32);
+ this.layoutControlItem1.Size = new System.Drawing.Size(284, 28);
this.layoutControlItem1.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.txt_itemModel;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 32);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(284, 32);
- this.layoutControlItem2.Text = "瑙勬牸鍨嬪彿";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_itemSname;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 64);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(284, 32);
- this.layoutControlItem3.Text = "鐗╂枡绠�绉�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem4
- //
- this.layoutControlItem4.Control = this.txt_itemDescription;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 96);
- this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(284, 32);
- this.layoutControlItem4.Text = "鐗╂枡鎻忚堪";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem5
//
@@ -984,85 +942,9 @@
this.layoutControlItem5.Location = new System.Drawing.Point(284, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(284, 32);
+ this.layoutControlItem5.Size = new System.Drawing.Size(284, 28);
this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_itemType;
- this.layoutControlItem6.Location = new System.Drawing.Point(284, 32);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(284, 32);
- this.layoutControlItem6.Text = "鐗╂枡绫诲瀷";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_itemVersion;
- this.layoutControlItem7.Location = new System.Drawing.Point(284, 64);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(284, 32);
- this.layoutControlItem7.Text = "浜у搧鐗堟湰";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_ppbom00019124;
- this.layoutControlItem8.Location = new System.Drawing.Point(284, 96);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(284, 32);
- this.layoutControlItem8.Text = "鍒嗙被缂栧彿";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_materialProperti;
- this.layoutControlItem9.Location = new System.Drawing.Point(568, 0);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(284, 32);
- this.layoutControlItem9.Text = "鐗╂枡灞炴��";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_productionWorkshop;
- this.layoutControlItem10.Location = new System.Drawing.Point(568, 32);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(284, 32);
- this.layoutControlItem10.Text = "鐢熶骇杞﹂棿";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_highlimit;
- this.layoutControlItem11.Location = new System.Drawing.Point(568, 64);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(284, 32);
- this.layoutControlItem11.Text = "鏈�澶у簱瀛�";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_lowlimit;
- this.layoutControlItem12.Location = new System.Drawing.Point(568, 96);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(284, 32);
- this.layoutControlItem12.Text = "鏈�浣庡簱瀛�";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem13
//
@@ -1070,125 +952,182 @@
this.layoutControlItem13.Location = new System.Drawing.Point(852, 0);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(286, 32);
+ this.layoutControlItem13.Size = new System.Drawing.Size(286, 28);
this.layoutControlItem13.Text = "搴撴埧鍗曚綅";
this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_wwName;
- this.layoutControlItem14.Location = new System.Drawing.Point(852, 32);
+ this.layoutControlItem14.Location = new System.Drawing.Point(852, 28);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(286, 32);
+ this.layoutControlItem14.Size = new System.Drawing.Size(286, 29);
this.layoutControlItem14.Text = "濮斿鍗曚綅";
this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_wlName;
- this.layoutControlItem15.Location = new System.Drawing.Point(852, 64);
+ this.layoutControlItem15.Location = new System.Drawing.Point(852, 57);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(286, 32);
+ this.layoutControlItem15.Size = new System.Drawing.Size(286, 29);
this.layoutControlItem15.Text = "鐗╂枡鍗曚綅";
this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_xxName;
- this.layoutControlItem16.Location = new System.Drawing.Point(852, 96);
+ this.layoutControlItem16.Location = new System.Drawing.Point(852, 86);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(286, 32);
+ this.layoutControlItem16.Size = new System.Drawing.Size(286, 29);
this.layoutControlItem16.Text = "閿�鍞崟浣�";
this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_prdPack;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 128);
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 86);
this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(284, 32);
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem17.Size = new System.Drawing.Size(284, 29);
this.layoutControlItem17.Text = "鏈�灏忓寘瑁呮暟";
this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_fissueType;
- this.layoutControlItem18.Location = new System.Drawing.Point(284, 128);
+ this.layoutControlItem18.Location = new System.Drawing.Point(284, 57);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(284, 32);
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem18.Size = new System.Drawing.Size(284, 29);
this.layoutControlItem18.Text = "鍙戞枡鏂瑰紡";
this.layoutControlItem18.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem23
+ //
+ this.layoutControlItem23.Control = this.txt_fforbidstatusTxt;
+ this.layoutControlItem23.Location = new System.Drawing.Point(284, 86);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem23.Size = new System.Drawing.Size(284, 29);
+ this.layoutControlItem23.Text = "绂佺敤鐘舵��";
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_materialProperti;
+ this.layoutControlItem9.Location = new System.Drawing.Point(284, 28);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem9.Size = new System.Drawing.Size(284, 29);
+ this.layoutControlItem9.Text = "鐗╂枡灞炴��";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem10
+ //
+ this.layoutControlItem10.Control = this.txt_productionWorkshop;
+ this.layoutControlItem10.Location = new System.Drawing.Point(568, 0);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem10.Size = new System.Drawing.Size(284, 28);
+ this.layoutControlItem10.Text = "鐢熶骇杞﹂棿";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_highlimit;
+ this.layoutControlItem11.Location = new System.Drawing.Point(568, 28);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem11.Size = new System.Drawing.Size(284, 29);
+ this.layoutControlItem11.Text = "鏈�澶у簱瀛�";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_lowlimit;
+ this.layoutControlItem12.Location = new System.Drawing.Point(568, 57);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem12.Size = new System.Drawing.Size(284, 29);
+ this.layoutControlItem12.Text = "瀹夊叏搴撳瓨";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_ffinishreceiptoverrate;
- this.layoutControlItem19.Location = new System.Drawing.Point(568, 128);
+ this.layoutControlItem19.CustomizationFormText = "鍏ュ簱瓒呮敹姣斾緥(%)";
+ this.layoutControlItem19.Location = new System.Drawing.Point(568, 86);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem19.Size = new System.Drawing.Size(284, 32);
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem19.Size = new System.Drawing.Size(284, 29);
this.layoutControlItem19.Text = "瓒呮敹姣斾緥";
this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
- //
- // layoutControlItem20
- //
- this.layoutControlItem20.Control = this.txt_dptName;
- this.layoutControlItem20.Location = new System.Drawing.Point(0, 160);
- this.layoutControlItem20.Name = "layoutControlItem20";
- this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem20.Size = new System.Drawing.Size(284, 34);
- this.layoutControlItem20.Text = "榛樿浠撳簱";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_scName;
- this.layoutControlItem21.Location = new System.Drawing.Point(852, 128);
+ this.layoutControlItem21.Location = new System.Drawing.Point(568, 115);
this.layoutControlItem21.Name = "layoutControlItem21";
- this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem21.Size = new System.Drawing.Size(286, 32);
+ this.layoutControlItem21.Size = new System.Drawing.Size(284, 29);
this.layoutControlItem21.Text = "鐢熶骇鍗曚綅";
this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_cgName;
- this.layoutControlItem22.Location = new System.Drawing.Point(852, 160);
+ this.layoutControlItem22.Location = new System.Drawing.Point(852, 115);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem22.Size = new System.Drawing.Size(286, 34);
+ this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem22.Size = new System.Drawing.Size(286, 29);
this.layoutControlItem22.Text = "閲囪喘鍗曚綅";
this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
//
- // layoutControlItem23
+ // layoutControlItem2
//
- this.layoutControlItem23.Control = this.txt_fforbidstatusTxt;
- this.layoutControlItem23.Location = new System.Drawing.Point(284, 160);
- this.layoutControlItem23.Name = "layoutControlItem23";
- this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem23.Size = new System.Drawing.Size(284, 34);
- this.layoutControlItem23.Text = "绂佺敤鐘舵��";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
+ this.layoutControlItem2.Control = this.txt_itemModel;
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 115);
+ this.layoutControlItem2.Name = "layoutControlItem2";
+ this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem2.Size = new System.Drawing.Size(568, 29);
+ this.layoutControlItem2.Text = "瑙勬牸鍨嬪彿";
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
//
- // gridColumn3
+ // layoutControlItem4
//
- this.gridColumn3.Caption = "涓婚敭Guid";
- this.gridColumn3.FieldName = "guid";
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Width = 94;
+ this.layoutControlItem4.Control = this.txt_itemDescription;
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem4.Name = "layoutControlItem4";
+ this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem4.Size = new System.Drawing.Size(284, 29);
+ this.layoutControlItem4.Text = "鐗╂枡鎻忚堪";
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
+ //
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.txt_dptName;
+ this.layoutControlItem20.Location = new System.Drawing.Point(0, 57);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem20.Size = new System.Drawing.Size(284, 29);
+ this.layoutControlItem20.Text = "榛樿浠撳簱";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18);
//
// Frm_MesItems
//
@@ -1229,12 +1168,8 @@
((System.ComponentModel.ISupportInitialize)(this.txt_ffinishreceiptoverrate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemSname.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemDescription.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemType.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_itemVersion.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_ppbom00019124.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_highlimit.Properties)).EndInit();
@@ -1243,28 +1178,24 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
this.ResumeLayout(false);
}
@@ -1310,44 +1241,40 @@
private DevExpress.XtraEditors.TextEdit txt_materialProperti;
private DevExpress.XtraEditors.TextEdit txt_fforbidstatusTxt;
private DevExpress.XtraEditors.TextEdit txt_productionWorkshop;
- private DevExpress.XtraEditors.TextEdit txt_ppbom00019124;
private DevExpress.XtraEditors.TextEdit txt_prdPack;
private DevExpress.XtraEditors.TextEdit txt_highlimit;
private DevExpress.XtraEditors.TextEdit txt_lowlimit;
- private DevExpress.XtraEditors.TextEdit txt_itemVersion;
- private DevExpress.XtraEditors.TextEdit txt_itemType;
private DevExpress.XtraEditors.TextEdit txt_itemDescription;
- private DevExpress.XtraEditors.TextEdit txt_itemSname;
private DevExpress.XtraEditors.TextEdit txt_itemNo;
private DevExpress.XtraEditors.MemoEdit txt_itemName;
private DevExpress.XtraEditors.MemoEdit txt_itemModel;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
index 8a538df..0a9d048 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
@@ -30,14 +30,13 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -54,22 +53,21 @@
this.gv_fdescription = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fforbidstatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
this.lbGuid = new System.Windows.Forms.Label();
- this.txt_newunit = new Gs.DevApp.UserControl.UcLookUnit();
- this.txt_fcurrentunitid = new Gs.DevApp.UserControl.UcLookUnit();
this.txt_fdescription = new DevExpress.XtraEditors.TextEdit();
- this.txt_fbaseunit = new Gs.DevApp.UserControl.UcLookUnit();
- this.txt_newqty = new DevExpress.XtraEditors.TextEdit();
- this.txt_oldunit = new Gs.DevApp.UserControl.UcLookUnit();
this.txt_fforbidstatus = new DevExpress.XtraEditors.TextEdit();
this.txt_id = new DevExpress.XtraEditors.TextEdit();
this.txt_fnumber = new DevExpress.XtraEditors.TextEdit();
this.txt_fname = new DevExpress.XtraEditors.TextEdit();
- this.txt_oldqty = new DevExpress.XtraEditors.TextEdit();
this.txt_fprecision = new DevExpress.XtraEditors.TextEdit();
this.txt_funitgroupid = new DevExpress.XtraEditors.TextEdit();
this.txt_froundtype = new DevExpress.XtraEditors.TextEdit();
@@ -79,23 +77,15 @@
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -115,12 +105,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.txt_fdescription.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_newqty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fnumber.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fname.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_oldqty.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fprecision.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_funitgroupid.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_froundtype.Properties)).BeginInit();
@@ -130,19 +118,13 @@
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
this.SuspendLayout();
//
@@ -229,7 +211,10 @@
this.gv_fforbidstatus,
this.gridColumn1,
this.gridColumn2,
- this.gridColumn3});
+ this.gridColumn3,
+ this.gridColumn4,
+ this.gridColumn5,
+ this.gridColumn6});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -357,8 +342,56 @@
this.gridColumn1.Name = "gridColumn1";
this.gridColumn1.Tag = "query_a.lastupdate_date";
this.gridColumn1.Visible = true;
- this.gridColumn1.VisibleIndex = 10;
+ this.gridColumn1.VisibleIndex = 13;
this.gridColumn1.Width = 180;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "涓婚敭Guid";
+ this.gridColumn2.FieldName = "guid";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "鍗曚綅ID";
+ this.gridColumn3.FieldName = "id";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Visible = true;
+ this.gridColumn3.VisibleIndex = 12;
+ this.gridColumn3.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鍩哄噯鍗曚綅";
+ this.gridColumn4.FieldName = "fbaseunit";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 9;
+ this.gridColumn4.Width = 94;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鍗曟嵁鐘舵��";
+ this.gridColumn5.FieldName = "dataType";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 10;
+ this.gridColumn5.Width = 94;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "褰撳墠鍗曚綅";
+ this.gridColumn6.FieldName = "fcurrentunitid";
+ this.gridColumn6.MinWidth = 25;
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 11;
+ this.gridColumn6.Width = 94;
//
// pageBar1
//
@@ -396,23 +429,17 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(970, 570);
- this.splitMx1.SplitterPosition = 155;
+ this.splitMx1.SplitterPosition = 114;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
this.layoutMx1.Controls.Add(this.lbGuid);
- this.layoutMx1.Controls.Add(this.txt_newunit);
- this.layoutMx1.Controls.Add(this.txt_fcurrentunitid);
this.layoutMx1.Controls.Add(this.txt_fdescription);
- this.layoutMx1.Controls.Add(this.txt_fbaseunit);
- this.layoutMx1.Controls.Add(this.txt_newqty);
- this.layoutMx1.Controls.Add(this.txt_oldunit);
this.layoutMx1.Controls.Add(this.txt_fforbidstatus);
this.layoutMx1.Controls.Add(this.txt_id);
this.layoutMx1.Controls.Add(this.txt_fnumber);
this.layoutMx1.Controls.Add(this.txt_fname);
- this.layoutMx1.Controls.Add(this.txt_oldqty);
this.layoutMx1.Controls.Add(this.txt_fprecision);
this.layoutMx1.Controls.Add(this.txt_funitgroupid);
this.layoutMx1.Controls.Add(this.txt_froundtype);
@@ -423,9 +450,9 @@
this.layoutControlItem17});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(645, 250, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(970, 155);
+ this.layoutMx1.Size = new System.Drawing.Size(970, 114);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -438,143 +465,93 @@
this.lbGuid.Text = "lbGuid";
this.lbGuid.Visible = false;
//
- // txt_newunit
- //
- this.txt_newunit.IsReadly = false;
- this.txt_newunit.Location = new System.Drawing.Point(351, 113);
- this.txt_newunit.Name = "txt_newunit";
- this.txt_newunit.Size = new System.Drawing.Size(131, 24);
- this.txt_newunit.TabIndex = 300;
- //
- // txt_fcurrentunitid
- //
- this.txt_fcurrentunitid.IsReadly = false;
- this.txt_fcurrentunitid.Location = new System.Drawing.Point(114, 113);
- this.txt_fcurrentunitid.Name = "txt_fcurrentunitid";
- this.txt_fcurrentunitid.Size = new System.Drawing.Size(131, 24);
- this.txt_fcurrentunitid.TabIndex = 302;
- //
// txt_fdescription
//
- this.txt_fdescription.Location = new System.Drawing.Point(825, 113);
+ this.txt_fdescription.Location = new System.Drawing.Point(84, 74);
this.txt_fdescription.Name = "txt_fdescription";
this.txt_fdescription.Properties.Appearance.Options.UseFont = true;
- this.txt_fdescription.Size = new System.Drawing.Size(133, 24);
+ this.txt_fdescription.Size = new System.Drawing.Size(398, 24);
this.txt_fdescription.StyleController = this.layoutMx1;
this.txt_fdescription.TabIndex = 291;
//
- // txt_fbaseunit
- //
- this.txt_fbaseunit.IsReadly = false;
- this.txt_fbaseunit.Location = new System.Drawing.Point(351, 79);
- this.txt_fbaseunit.Name = "txt_fbaseunit";
- this.txt_fbaseunit.Size = new System.Drawing.Size(131, 24);
- this.txt_fbaseunit.TabIndex = 301;
- //
- // txt_newqty
- //
- this.txt_newqty.Location = new System.Drawing.Point(588, 113);
- this.txt_newqty.Name = "txt_newqty";
- this.txt_newqty.Properties.Appearance.Options.UseFont = true;
- this.txt_newqty.Size = new System.Drawing.Size(131, 24);
- this.txt_newqty.StyleController = this.layoutMx1;
- this.txt_newqty.TabIndex = 219;
- //
- // txt_oldunit
- //
- this.txt_oldunit.IsReadly = false;
- this.txt_oldunit.Location = new System.Drawing.Point(114, 79);
- this.txt_oldunit.Name = "txt_oldunit";
- this.txt_oldunit.Size = new System.Drawing.Size(131, 24);
- this.txt_oldunit.TabIndex = 299;
- //
// txt_fforbidstatus
//
- this.txt_fforbidstatus.Location = new System.Drawing.Point(825, 45);
+ this.txt_fforbidstatus.Location = new System.Drawing.Point(795, 43);
this.txt_fforbidstatus.Name = "txt_fforbidstatus";
this.txt_fforbidstatus.Properties.Appearance.Options.UseFont = true;
- this.txt_fforbidstatus.Size = new System.Drawing.Size(133, 24);
+ this.txt_fforbidstatus.Size = new System.Drawing.Size(163, 24);
this.txt_fforbidstatus.StyleController = this.layoutMx1;
this.txt_fforbidstatus.TabIndex = 298;
//
// txt_id
//
- this.txt_id.Location = new System.Drawing.Point(114, 12);
+ this.txt_id.Location = new System.Drawing.Point(84, 12);
this.txt_id.Name = "txt_id";
this.txt_id.Properties.Appearance.Options.UseFont = true;
- this.txt_id.Size = new System.Drawing.Size(131, 24);
+ this.txt_id.Size = new System.Drawing.Size(161, 24);
this.txt_id.StyleController = this.layoutMx1;
this.txt_id.TabIndex = 211;
//
// txt_fnumber
//
- this.txt_fnumber.Location = new System.Drawing.Point(114, 45);
+ this.txt_fnumber.Location = new System.Drawing.Point(84, 43);
this.txt_fnumber.Name = "txt_fnumber";
this.txt_fnumber.Properties.Appearance.Options.UseFont = true;
- this.txt_fnumber.Size = new System.Drawing.Size(131, 24);
+ this.txt_fnumber.Size = new System.Drawing.Size(161, 24);
this.txt_fnumber.StyleController = this.layoutMx1;
this.txt_fnumber.TabIndex = 243;
//
// txt_fname
//
- this.txt_fname.Location = new System.Drawing.Point(351, 12);
+ this.txt_fname.Location = new System.Drawing.Point(321, 12);
this.txt_fname.Name = "txt_fname";
this.txt_fname.Properties.Appearance.Options.UseFont = true;
- this.txt_fname.Size = new System.Drawing.Size(131, 24);
+ this.txt_fname.Size = new System.Drawing.Size(161, 24);
this.txt_fname.StyleController = this.layoutMx1;
this.txt_fname.TabIndex = 247;
//
- // txt_oldqty
- //
- this.txt_oldqty.Location = new System.Drawing.Point(825, 79);
- this.txt_oldqty.Name = "txt_oldqty";
- this.txt_oldqty.Properties.Appearance.Options.UseFont = true;
- this.txt_oldqty.Size = new System.Drawing.Size(133, 24);
- this.txt_oldqty.StyleController = this.layoutMx1;
- this.txt_oldqty.TabIndex = 217;
- //
// txt_fprecision
//
- this.txt_fprecision.Location = new System.Drawing.Point(351, 45);
+ this.txt_fprecision.Location = new System.Drawing.Point(321, 43);
this.txt_fprecision.Name = "txt_fprecision";
this.txt_fprecision.Properties.Appearance.Options.UseFont = true;
- this.txt_fprecision.Size = new System.Drawing.Size(131, 24);
+ this.txt_fprecision.Size = new System.Drawing.Size(161, 24);
this.txt_fprecision.StyleController = this.layoutMx1;
this.txt_fprecision.TabIndex = 285;
//
// txt_funitgroupid
//
- this.txt_funitgroupid.Location = new System.Drawing.Point(825, 12);
+ this.txt_funitgroupid.Location = new System.Drawing.Point(795, 12);
this.txt_funitgroupid.Name = "txt_funitgroupid";
this.txt_funitgroupid.Properties.Appearance.Options.UseFont = true;
- this.txt_funitgroupid.Size = new System.Drawing.Size(133, 24);
+ this.txt_funitgroupid.Size = new System.Drawing.Size(163, 24);
this.txt_funitgroupid.StyleController = this.layoutMx1;
this.txt_funitgroupid.TabIndex = 252;
//
// txt_froundtype
//
- this.txt_froundtype.Location = new System.Drawing.Point(588, 12);
+ this.txt_froundtype.Location = new System.Drawing.Point(558, 12);
this.txt_froundtype.Name = "txt_froundtype";
this.txt_froundtype.Properties.Appearance.Options.UseFont = true;
- this.txt_froundtype.Size = new System.Drawing.Size(131, 24);
+ this.txt_froundtype.Size = new System.Drawing.Size(161, 24);
this.txt_froundtype.StyleController = this.layoutMx1;
this.txt_froundtype.TabIndex = 280;
//
// txt_fconvertnumerator
//
- this.txt_fconvertnumerator.Location = new System.Drawing.Point(588, 45);
+ this.txt_fconvertnumerator.Location = new System.Drawing.Point(558, 43);
this.txt_fconvertnumerator.Name = "txt_fconvertnumerator";
this.txt_fconvertnumerator.Properties.Appearance.Options.UseFont = true;
- this.txt_fconvertnumerator.Size = new System.Drawing.Size(131, 24);
+ this.txt_fconvertnumerator.Size = new System.Drawing.Size(161, 24);
this.txt_fconvertnumerator.StyleController = this.layoutMx1;
this.txt_fconvertnumerator.TabIndex = 267;
//
// txt_fconvertdenominator
//
- this.txt_fconvertdenominator.Location = new System.Drawing.Point(588, 79);
+ this.txt_fconvertdenominator.Location = new System.Drawing.Point(558, 74);
this.txt_fconvertdenominator.Name = "txt_fconvertdenominator";
this.txt_fconvertdenominator.Properties.Appearance.Options.UseFont = true;
- this.txt_fconvertdenominator.Size = new System.Drawing.Size(131, 24);
+ this.txt_fconvertdenominator.Size = new System.Drawing.Size(161, 24);
this.txt_fconvertdenominator.StyleController = this.layoutMx1;
this.txt_fconvertdenominator.TabIndex = 258;
//
@@ -597,49 +574,40 @@
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem1,
this.layoutControlItem2,
- this.layoutControlItem3,
this.layoutControlItem4,
this.layoutControlItem5,
- this.layoutControlItem6,
this.layoutControlItem7,
this.layoutControlItem8,
this.layoutControlItem9,
this.layoutControlItem10,
this.layoutControlItem11,
- this.layoutControlItem12,
- this.layoutControlItem13,
- this.layoutControlItem14,
- this.layoutControlItem15,
this.layoutControlItem16});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition7.Height = 100D;
- rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition8.Height = 100D;
- rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5,
- rowDefinition6,
- rowDefinition7,
- rowDefinition8});
- this.Root.Size = new System.Drawing.Size(970, 155);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3});
+ this.Root.Size = new System.Drawing.Size(970, 114);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -647,29 +615,19 @@
this.layoutControlItem1.Control = this.txt_id;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(237, 33);
+ this.layoutControlItem1.Size = new System.Drawing.Size(237, 31);
this.layoutControlItem1.Text = "鍗曚綅ID";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_fnumber;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 33);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(237, 34);
+ this.layoutControlItem2.Size = new System.Drawing.Size(237, 31);
this.layoutControlItem2.Text = "鍗曚綅缂栫爜";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_oldunit;
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 67);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(237, 34);
- this.layoutControlItem3.Text = "鍘熷崟浣�";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem4
//
@@ -677,31 +635,20 @@
this.layoutControlItem4.Location = new System.Drawing.Point(237, 0);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(237, 33);
+ this.layoutControlItem4.Size = new System.Drawing.Size(237, 31);
this.layoutControlItem4.Text = "鍗曚綅鍚嶇О";
- this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_fprecision;
- this.layoutControlItem5.Location = new System.Drawing.Point(237, 33);
+ this.layoutControlItem5.Location = new System.Drawing.Point(237, 31);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(237, 34);
+ this.layoutControlItem5.Size = new System.Drawing.Size(237, 31);
this.layoutControlItem5.Text = "鍗曚綅绮惧害";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_fbaseunit;
- this.layoutControlItem6.Location = new System.Drawing.Point(237, 67);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(237, 34);
- this.layoutControlItem6.Text = "鍩哄噯鍗曚綅";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem7
//
@@ -709,31 +656,31 @@
this.layoutControlItem7.Location = new System.Drawing.Point(474, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(237, 33);
+ this.layoutControlItem7.Size = new System.Drawing.Size(237, 31);
this.layoutControlItem7.Text = "鑸嶅叆绫诲瀷";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_fconvertnumerator;
- this.layoutControlItem8.Location = new System.Drawing.Point(474, 33);
+ this.layoutControlItem8.Location = new System.Drawing.Point(474, 31);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(237, 34);
+ this.layoutControlItem8.Size = new System.Drawing.Size(237, 31);
this.layoutControlItem8.Text = "鎹㈢畻鍒嗗瓙";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_fconvertdenominator;
- this.layoutControlItem9.Location = new System.Drawing.Point(474, 67);
+ this.layoutControlItem9.Location = new System.Drawing.Point(474, 62);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(237, 34);
+ this.layoutControlItem9.Size = new System.Drawing.Size(237, 32);
this.layoutControlItem9.Text = "鎹㈢畻鍒嗘瘝";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
@@ -741,92 +688,31 @@
this.layoutControlItem10.Location = new System.Drawing.Point(711, 0);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(239, 33);
+ this.layoutControlItem10.Size = new System.Drawing.Size(239, 31);
this.layoutControlItem10.Text = "鎵�灞炵粍鍒�";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_fforbidstatus;
- this.layoutControlItem11.Location = new System.Drawing.Point(711, 33);
+ this.layoutControlItem11.Location = new System.Drawing.Point(711, 31);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem11.Size = new System.Drawing.Size(239, 34);
+ this.layoutControlItem11.Size = new System.Drawing.Size(239, 31);
this.layoutControlItem11.Text = "绂佺敤鐘舵��";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_oldqty;
- this.layoutControlItem12.Location = new System.Drawing.Point(711, 67);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(239, 34);
- this.layoutControlItem12.Text = "鍘熷崟浣嶆暟閲�";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_fcurrentunitid;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 101);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(237, 34);
- this.layoutControlItem13.Text = "褰撳墠鍗曚綅";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem14
- //
- this.layoutControlItem14.Control = this.txt_newunit;
- this.layoutControlItem14.Location = new System.Drawing.Point(237, 101);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem14.Size = new System.Drawing.Size(237, 34);
- this.layoutControlItem14.Text = "鐩殑鍗曚綅";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem15
- //
- this.layoutControlItem15.Control = this.txt_newqty;
- this.layoutControlItem15.Location = new System.Drawing.Point(474, 101);
- this.layoutControlItem15.Name = "layoutControlItem15";
- this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(237, 34);
- this.layoutControlItem15.Text = "鐩殑鍗曚綅鏁伴噺";
- this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_fdescription;
- this.layoutControlItem16.Location = new System.Drawing.Point(711, 101);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(239, 34);
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem16.Size = new System.Drawing.Size(474, 32);
this.layoutControlItem16.Text = "鍗曚綅鎻忚堪";
- this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
- //
- // gridColumn2
- //
- this.gridColumn2.Caption = "涓婚敭Guid";
- this.gridColumn2.FieldName = "guid";
- this.gridColumn2.MinWidth = 25;
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Width = 94;
- //
- // gridColumn3
- //
- this.gridColumn3.Caption = "鍗曚綅ID";
- this.gridColumn3.FieldName = "id";
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 9;
- this.gridColumn3.Width = 94;
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
//
// Frm_MesUnit
//
@@ -856,12 +742,10 @@
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_fdescription.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_newqty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fnumber.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fname.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_oldqty.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_fprecision.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_funitgroupid.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_froundtype.Properties)).EndInit();
@@ -871,19 +755,13 @@
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
this.ResumeLayout(false);
@@ -910,10 +788,6 @@
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private UserControl.UcLookUnit txt_fcurrentunitid;
- private UserControl.UcLookUnit txt_fbaseunit;
- private UserControl.UcLookUnit txt_newunit;
- private UserControl.UcLookUnit txt_oldunit;
private System.Windows.Forms.Label lbGuid;
private DevExpress.XtraEditors.TextEdit txt_fforbidstatus;
private DevExpress.XtraEditors.TextEdit txt_fdescription;
@@ -924,28 +798,23 @@
private DevExpress.XtraEditors.TextEdit txt_funitgroupid;
private DevExpress.XtraEditors.TextEdit txt_fname;
private DevExpress.XtraEditors.TextEdit txt_fnumber;
- private DevExpress.XtraEditors.TextEdit txt_newqty;
- private DevExpress.XtraEditors.TextEdit txt_oldqty;
private DevExpress.XtraEditors.TextEdit txt_id;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
index 7ee83d7..63f19b0 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.Designer.cs
@@ -52,10 +52,11 @@
this.gv_positionCode = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_positionName = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_phoneNumber = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_startDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_fforbidStatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -84,8 +85,7 @@
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -211,12 +211,12 @@
this.gv_positionCode,
this.gv_positionName,
this.gv_phoneNumber,
- this.gv_startDate,
this.gv_remark,
this.gv_fforbidStatus,
this.gridColumn2,
this.gridColumn3,
- this.gridColumn4});
+ this.gridColumn4,
+ this.gridColumn5});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -323,19 +323,6 @@
this.gv_phoneNumber.VisibleIndex = 5;
this.gv_phoneNumber.Width = 94;
//
- // gv_startDate
- //
- this.gv_startDate.AppearanceCell.Options.UseFont = true;
- this.gv_startDate.Caption = "浠诲矖寮�濮嬫棩鏈�";
- this.gv_startDate.FieldName = "startDate";
- this.gv_startDate.MinWidth = 50;
- this.gv_startDate.Name = "gv_startDate";
- this.gv_startDate.OptionsColumn.AllowEdit = false;
- this.gv_startDate.Tag = "query_a.start_date";
- this.gv_startDate.Visible = true;
- this.gv_startDate.VisibleIndex = 6;
- this.gv_startDate.Width = 180;
- //
// gv_remark
//
this.gv_remark.AppearanceCell.Options.UseFont = true;
@@ -346,7 +333,7 @@
this.gv_remark.OptionsColumn.AllowEdit = false;
this.gv_remark.Tag = "query_a.remark";
this.gv_remark.Visible = true;
- this.gv_remark.VisibleIndex = 7;
+ this.gv_remark.VisibleIndex = 6;
this.gv_remark.Width = 94;
//
// gv_fforbidStatus
@@ -360,7 +347,7 @@
this.gv_fforbidStatus.OptionsColumn.AllowEdit = false;
this.gv_fforbidStatus.Tag = "query_a.fforbid_status";
this.gv_fforbidStatus.Visible = true;
- this.gv_fforbidStatus.VisibleIndex = 8;
+ this.gv_fforbidStatus.VisibleIndex = 7;
this.gv_fforbidStatus.Width = 50;
//
// gridColumn2
@@ -373,6 +360,24 @@
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 10;
this.gridColumn2.Width = 180;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "涓婚敭Guid";
+ this.gridColumn3.FieldName = "guid";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "鍛樺伐ID";
+ this.gridColumn4.FieldName = "id";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 8;
+ this.gridColumn4.Width = 94;
//
// pageBar1
//
@@ -694,23 +699,15 @@
this.layoutControlItem10.Text = "澶囨敞";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
- // gridColumn3
+ // gridColumn5
//
- this.gridColumn3.Caption = "涓婚敭Guid";
- this.gridColumn3.FieldName = "guid";
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Width = 94;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "鍛樺伐ID";
- this.gridColumn4.FieldName = "id";
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 9;
- this.gridColumn4.Width = 94;
+ this.gridColumn5.Caption = "鍗曟嵁鐘舵��";
+ this.gridColumn5.FieldName = "dataType";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 9;
+ this.gridColumn5.Width = 94;
//
// Frm_Staff
//
@@ -779,7 +776,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_positionCode;
private DevExpress.XtraGrid.Columns.GridColumn gv_positionName;
private DevExpress.XtraGrid.Columns.GridColumn gv_phoneNumber;
- private DevExpress.XtraGrid.Columns.GridColumn gv_startDate;
private DevExpress.XtraGrid.Columns.GridColumn gv_remark;
private DevExpress.XtraGrid.Columns.GridColumn gv_fforbidStatus;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
@@ -813,5 +809,6 @@
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
index 59f9e4f..6b5fabf 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Supplier.Designer.cs
@@ -57,6 +57,8 @@
this.gv_fforbidstatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -89,8 +91,7 @@
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -223,7 +224,8 @@
this.gv_remark,
this.gv_createDate,
this.gridColumn3,
- this.gridColumn4});
+ this.gridColumn4,
+ this.gridColumn5});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -356,8 +358,26 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.create_date";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 10;
+ this.gv_createDate.VisibleIndex = 11;
this.gv_createDate.Width = 180;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "涓婚敭Guid";
+ this.gridColumn3.FieldName = "guid";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Width = 94;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "渚涘簲鍟咺D";
+ this.gridColumn4.FieldName = "id";
+ this.gridColumn4.MinWidth = 25;
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 9;
+ this.gridColumn4.Width = 94;
//
// pageBar1
//
@@ -727,23 +747,15 @@
this.layoutControlItem12.Text = "澶囨敞";
this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
//
- // gridColumn3
+ // gridColumn5
//
- this.gridColumn3.Caption = "涓婚敭Guid";
- this.gridColumn3.FieldName = "guid";
- this.gridColumn3.MinWidth = 25;
- this.gridColumn3.Name = "gridColumn3";
- this.gridColumn3.Width = 94;
- //
- // gridColumn4
- //
- this.gridColumn4.Caption = "渚涘簲鍟咺D";
- this.gridColumn4.FieldName = "id";
- this.gridColumn4.MinWidth = 25;
- this.gridColumn4.Name = "gridColumn4";
- this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 9;
- this.gridColumn4.Width = 94;
+ this.gridColumn5.Caption = "鏁版嵁鐘舵��";
+ this.gridColumn5.FieldName = "dataType";
+ this.gridColumn5.MinWidth = 25;
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 10;
+ this.gridColumn5.Width = 94;
//
// Frm_Supplier
//
@@ -852,5 +864,6 @@
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
index b4edcb3..92a4c65 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -48,8 +48,8 @@
string _orgId = txt_fSubsidiary.GetId();
if (string.IsNullOrEmpty(_orgId))
return;
- txt_suppId.getSuppler(_orgId,_ucGys);
- txt_itemId.getSuppler(_orgId,_ucItem);
+ txt_suppId.getSuppler(_orgId, _ucGys);
+ txt_itemId.getSuppler(_orgId, _ucItem);
};
txt_itemId.EditChanged += (s, e) =>
{
@@ -274,7 +274,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
_sbSqlWhere += " and b.guid is not null";
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,b.ITEM_NO", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
@@ -312,11 +312,9 @@
}
/// <summary>
- ///
+ /// 璇诲彇瀹炰綋
/// </summary>
- /// <param name="strGuid">涓婚敭</param>
- /// <param name="isEdit">鏄惁鍙紪杈�</param>
- /// <param name="tabIdx">閫夐」鍗″簭鍙�</param>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
@@ -342,7 +340,7 @@
_ucGys = dy.suppId;
lbGuid.Text = strGuid;
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
- _ucItem ="";
+ _ucItem = "";
_ucGys = "";
}
else
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
index ad36e89..155a95d 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
@@ -89,6 +89,7 @@
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -205,7 +206,6 @@
this.bandedGridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -246,6 +246,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -266,7 +267,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.advBandedGridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -556,7 +556,7 @@
//
// txt_sampleSizeNo
//
- this.txt_sampleSizeNo.Location = new System.Drawing.Point(84, 8);
+ this.txt_sampleSizeNo.Location = new System.Drawing.Point(84, 12);
this.txt_sampleSizeNo.Name = "txt_sampleSizeNo";
this.txt_sampleSizeNo.Properties.Appearance.Options.UseFont = true;
this.txt_sampleSizeNo.Size = new System.Drawing.Size(350, 24);
@@ -565,7 +565,7 @@
//
// txt_sampleSizeName
//
- this.txt_sampleSizeName.Location = new System.Drawing.Point(84, 36);
+ this.txt_sampleSizeName.Location = new System.Drawing.Point(84, 40);
this.txt_sampleSizeName.Name = "txt_sampleSizeName";
this.txt_sampleSizeName.Properties.Appearance.Options.UseFont = true;
this.txt_sampleSizeName.Size = new System.Drawing.Size(350, 24);
@@ -583,7 +583,7 @@
//
// txt_memo
//
- this.txt_memo.Location = new System.Drawing.Point(84, 64);
+ this.txt_memo.Location = new System.Drawing.Point(84, 68);
this.txt_memo.Name = "txt_memo";
this.txt_memo.Properties.Appearance.Options.UseFont = true;
this.txt_memo.Size = new System.Drawing.Size(350, 24);
@@ -592,7 +592,7 @@
//
// txt_createBy
//
- this.txt_createBy.Location = new System.Drawing.Point(510, 8);
+ this.txt_createBy.Location = new System.Drawing.Point(510, 12);
this.txt_createBy.Name = "txt_createBy";
this.txt_createBy.Properties.Appearance.Options.UseFont = true;
this.txt_createBy.Size = new System.Drawing.Size(350, 24);
@@ -602,7 +602,7 @@
//
// txt_foneCheckdate
//
- this.txt_foneCheckdate.Location = new System.Drawing.Point(936, 36);
+ this.txt_foneCheckdate.Location = new System.Drawing.Point(936, 40);
this.txt_foneCheckdate.Name = "txt_foneCheckdate";
this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
this.txt_foneCheckdate.Size = new System.Drawing.Size(350, 24);
@@ -612,7 +612,7 @@
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(510, 36);
+ this.txt_createDate.Location = new System.Drawing.Point(510, 40);
this.txt_createDate.Name = "txt_createDate";
this.txt_createDate.Properties.Appearance.Options.UseFont = true;
this.txt_createDate.Size = new System.Drawing.Size(350, 24);
@@ -622,7 +622,7 @@
//
// txt_foneCheckor
//
- this.txt_foneCheckor.Location = new System.Drawing.Point(936, 8);
+ this.txt_foneCheckor.Location = new System.Drawing.Point(936, 12);
this.txt_foneCheckor.Name = "txt_foneCheckor";
this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
this.txt_foneCheckor.Size = new System.Drawing.Size(350, 24);
@@ -632,21 +632,23 @@
//
// txt_foneChecked
//
- this.txt_foneChecked.Location = new System.Drawing.Point(864, 64);
+ this.txt_foneChecked.Location = new System.Drawing.Point(864, 68);
this.txt_foneChecked.Name = "txt_foneChecked";
- this.txt_foneChecked.Properties.Caption = "瀹℃牳鏃堕棿";
+ this.txt_foneChecked.Properties.Caption = "瀹℃牳鏍囪瘑";
this.txt_foneChecked.Size = new System.Drawing.Size(422, 24);
this.txt_foneChecked.StyleController = this.layoutMx1;
this.txt_foneChecked.TabIndex = 274;
+ this.txt_foneChecked.Tag = "readOnly";
//
// txt_isenabled
//
- this.txt_isenabled.Location = new System.Drawing.Point(438, 64);
+ this.txt_isenabled.Location = new System.Drawing.Point(438, 68);
this.txt_isenabled.Name = "txt_isenabled";
this.txt_isenabled.Properties.Caption = "鍙敤鏍囪瘑";
this.txt_isenabled.Size = new System.Drawing.Size(422, 24);
this.txt_isenabled.StyleController = this.layoutMx1;
this.txt_isenabled.TabIndex = 276;
+ this.txt_isenabled.Tag = "readOnly";
//
// layoutControlItem14
//
@@ -795,6 +797,18 @@
this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
+ //
+ // layoutControlItem13
+ //
+ this.layoutControlItem13.Control = this.txt_isenabled;
+ this.layoutControlItem13.Location = new System.Drawing.Point(426, 56);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem13.Size = new System.Drawing.Size(426, 28);
+ this.layoutControlItem13.Text = "鍙敤鏍囪瘑";
+ this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem13.TextVisible = false;
//
// tabMx
//
@@ -2051,18 +2065,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_isenabled;
- this.layoutControlItem13.Location = new System.Drawing.Point(426, 56);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(426, 28);
- this.layoutControlItem13.Text = "鍙敤鏍囪瘑";
- this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem13.TextVisible = false;
- //
// Frm_MesQmAql1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2113,6 +2115,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -2133,7 +2136,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.advBandedGridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index bd881d6..d30aee1 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -417,6 +417,11 @@
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
index 627a8a2..8cc3099 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
@@ -297,7 +297,11 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+ /// <summary>
+ /// 绉诲嚭鏄庣粏
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit1_ButtonClick(object sender,
ButtonPressedEventArgs e)
{
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
index 094d876..ab48392 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
@@ -620,6 +620,7 @@
this.txt_isenabled.Size = new System.Drawing.Size(267, 24);
this.txt_isenabled.StyleController = this.layoutMx1;
this.txt_isenabled.TabIndex = 390;
+ this.txt_isenabled.Tag = "readOnly";
//
// layoutControlItem13
//
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
index 3ffbf41..7e15eca 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -40,13 +40,16 @@
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+ //绫诲瀷锛宨qc,ipqc宸℃锛宨pqc棣栨鏌�,fqc锛宨qc鐨勬牱鍝佸�奸粯璁や负5锛屽叾瀹冧负1
txt_ftype.Text = strType;
if (strType == "iqc")
dfValue = 5;
+ //濡傛灉鏄痠pqc宸℃锛屾樉绀哄伐浣�
if (strType != "ipqc宸℃")
{
gvMx1.Columns["stationName"].Visible = false;
}
+ //鏂拌鍒濆鍊�
this.gvMx1.InitNewRow += (s, e) =>
{
this.gvMx1.SetRowCellValue(e.RowHandle, "ypsl", dfValue);
@@ -439,7 +442,10 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
@@ -639,8 +645,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
-
}
/// <summary>
/// 璇诲彇妫�楠屽伐鍏�
@@ -748,6 +752,11 @@
gvMx1.SetRowCellValue(dataIndex, "sampleSizeName", _txt);
}
}
+ /// <summary>
+ /// 绉诲嚭鏄庣粏
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
gvMx1.CloseEditor();
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs
index f4b0ee1..203f654 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs
@@ -196,7 +196,6 @@
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
this.gvMx1.OptionsView.ShowGroupPanel = false;
//
// gvMx1guid
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs
index 57a80c4..37d21ee 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs
@@ -154,7 +154,7 @@
{
gcMain.DataSource = null;
var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
- _sbSqlWhere += " and q.guid is null";
+ //_sbSqlWhere += " and q.guid is null";
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), strType);
var json = JsonConvert.SerializeObject(pgq);
try
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
index 67e19b8..bb1a008 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.Designer.cs
@@ -47,6 +47,7 @@
this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.panel1 = new System.Windows.Forms.Panel();
@@ -77,7 +78,6 @@
this.lbGuid = new System.Windows.Forms.Label();
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();
@@ -335,6 +335,14 @@
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 10;
this.gridColumn2.Width = 94;
+ //
+ // gridColumn3
+ //
+ this.gridColumn3.Caption = "涓婚敭GUID";
+ this.gridColumn3.FieldName = "guid";
+ this.gridColumn3.MinWidth = 25;
+ this.gridColumn3.Name = "gridColumn3";
+ this.gridColumn3.Width = 94;
//
// pageBar1
//
@@ -705,16 +713,6 @@
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.Visible = true;
- this.gridColumn3.VisibleIndex = 11;
- this.gridColumn3.Width = 94;
//
// DocNoRule
//
diff --git a/DevApp/Gs.DevApp/DevFrm/User/Role.cs b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
index 415221a..ec3ff79 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/Role.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/Role.cs
@@ -286,7 +286,10 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
diff --git a/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs b/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs
index 0d4d9c7..c757f27 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/RoleSelectAction.cs
@@ -11,6 +11,13 @@
{
private StringBuilder _actionLst = new StringBuilder();
private readonly string _rightGuid;
+
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="rightGuid">涓汉guid锛屾垨瑙掕壊guid</param>
+ /// <param name="formTxt"></param>
public RoleSelectAction(string rightGuid,string formTxt)
{
InitializeComponent();
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
index 559dd17..ce761ca 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.Designer.cs
@@ -751,7 +751,7 @@
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem2.Size = new System.Drawing.Size(245, 40);
- this.layoutControlItem2.Text = "鍒濆瀵嗙爜";
+ this.layoutControlItem2.Text = "鐢ㄦ埛瀵嗙爜";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
diff --git a/DevApp/Gs.DevApp/DevFrm/User/User.cs b/DevApp/Gs.DevApp/DevFrm/User/User.cs
index 8e0156d..c382656 100644
--- a/DevApp/Gs.DevApp/DevFrm/User/User.cs
+++ b/DevApp/Gs.DevApp/DevFrm/User/User.cs
@@ -304,7 +304,10 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
-
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
@@ -376,7 +379,7 @@
}
}
/// <summary>
- /// 涓汉鏉冮檺
+ /// 寮瑰嚭閰嶇疆鏉冮檺涓汉鏉冮檺
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 99ecb67..56832a2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -54,12 +54,10 @@
this.gv_closeStatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.bandedGridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_purchaseDept = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_qtyAcceptance = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_purchaser = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_qualityReq = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_settlementParty = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_paymentParty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_transportMethod = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_cancellationStatus = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_cancellationPerson = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -75,6 +73,7 @@
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvcol6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -114,7 +113,6 @@
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_erpid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx1salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -149,7 +147,7 @@
this.gvMx1demandDocumentLineId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.picCheckBox = new System.Windows.Forms.PictureBox();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -203,7 +201,6 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -293,12 +290,10 @@
this.gv_closeStatus,
this.bandedGridColumn2,
this.gv_purchaseDept,
- this.gv_qtyAcceptance,
this.gv_purchaser,
this.gv_qualityReq,
this.gv_settlementParty,
this.gv_paymentParty,
- this.gv_transportMethod,
this.gv_remarks,
this.gv_cancellationStatus,
this.gv_cancellationPerson,
@@ -313,7 +308,8 @@
this.gridColumn4,
this.gridColumn5,
this.gridColumn7,
- this.gvcol6});
+ this.gvcol6,
+ this.gridColumn11});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -462,19 +458,6 @@
this.gv_purchaseDept.VisibleIndex = 10;
this.gv_purchaseDept.Width = 50;
//
- // gv_qtyAcceptance
- //
- this.gv_qtyAcceptance.AppearanceCell.Options.UseFont = true;
- this.gv_qtyAcceptance.Caption = "鏁伴噺楠屾敹";
- this.gv_qtyAcceptance.FieldName = "qtyAcceptance";
- this.gv_qtyAcceptance.MinWidth = 25;
- this.gv_qtyAcceptance.Name = "gv_qtyAcceptance";
- this.gv_qtyAcceptance.OptionsColumn.AllowEdit = false;
- this.gv_qtyAcceptance.Tag = "query_a.QTY_ACCEPTANCE";
- this.gv_qtyAcceptance.Visible = true;
- this.gv_qtyAcceptance.VisibleIndex = 11;
- this.gv_qtyAcceptance.Width = 50;
- //
// gv_purchaser
//
this.gv_purchaser.AppearanceCell.Options.UseFont = true;
@@ -485,20 +468,20 @@
this.gv_purchaser.OptionsColumn.AllowEdit = false;
this.gv_purchaser.Tag = "query_a.PURCHASER";
this.gv_purchaser.Visible = true;
- this.gv_purchaser.VisibleIndex = 12;
+ this.gv_purchaser.VisibleIndex = 11;
this.gv_purchaser.Width = 60;
//
// gv_qualityReq
//
this.gv_qualityReq.AppearanceCell.Options.UseFont = true;
- this.gv_qualityReq.Caption = "璐ㄩ噺瑕佹眰";
- this.gv_qualityReq.FieldName = "qualityReq";
+ this.gv_qualityReq.Caption = "楠屾敹鏂瑰紡";
+ this.gv_qualityReq.FieldName = "acctype";
this.gv_qualityReq.MinWidth = 25;
this.gv_qualityReq.Name = "gv_qualityReq";
this.gv_qualityReq.OptionsColumn.AllowEdit = false;
this.gv_qualityReq.Tag = "query_a.QUALITY_REQ";
this.gv_qualityReq.Visible = true;
- this.gv_qualityReq.VisibleIndex = 13;
+ this.gv_qualityReq.VisibleIndex = 12;
this.gv_qualityReq.Width = 80;
//
// gv_settlementParty
@@ -511,7 +494,7 @@
this.gv_settlementParty.OptionsColumn.AllowEdit = false;
this.gv_settlementParty.Tag = "query_a.SETTLEMENT_PARTY";
this.gv_settlementParty.Visible = true;
- this.gv_settlementParty.VisibleIndex = 14;
+ this.gv_settlementParty.VisibleIndex = 13;
this.gv_settlementParty.Width = 100;
//
// gv_paymentParty
@@ -524,21 +507,8 @@
this.gv_paymentParty.OptionsColumn.AllowEdit = false;
this.gv_paymentParty.Tag = "query_a.PAYMENT_PARTY";
this.gv_paymentParty.Visible = true;
- this.gv_paymentParty.VisibleIndex = 15;
+ this.gv_paymentParty.VisibleIndex = 14;
this.gv_paymentParty.Width = 100;
- //
- // gv_transportMethod
- //
- this.gv_transportMethod.AppearanceCell.Options.UseFont = true;
- this.gv_transportMethod.Caption = "杩愯緭鏂瑰紡";
- this.gv_transportMethod.FieldName = "transportMethod";
- this.gv_transportMethod.MinWidth = 25;
- this.gv_transportMethod.Name = "gv_transportMethod";
- this.gv_transportMethod.OptionsColumn.AllowEdit = false;
- this.gv_transportMethod.Tag = "query_a.TRANSPORT_METHOD";
- this.gv_transportMethod.Visible = true;
- this.gv_transportMethod.VisibleIndex = 16;
- this.gv_transportMethod.Width = 100;
//
// gv_remarks
//
@@ -550,7 +520,7 @@
this.gv_remarks.OptionsColumn.AllowEdit = false;
this.gv_remarks.Tag = "query_a.REMARKS";
this.gv_remarks.Visible = true;
- this.gv_remarks.VisibleIndex = 17;
+ this.gv_remarks.VisibleIndex = 15;
this.gv_remarks.Width = 100;
//
// gv_cancellationStatus
@@ -563,7 +533,7 @@
this.gv_cancellationStatus.OptionsColumn.AllowEdit = false;
this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS";
this.gv_cancellationStatus.Visible = true;
- this.gv_cancellationStatus.VisibleIndex = 18;
+ this.gv_cancellationStatus.VisibleIndex = 16;
this.gv_cancellationStatus.Width = 60;
//
// gv_cancellationPerson
@@ -576,7 +546,7 @@
this.gv_cancellationPerson.OptionsColumn.AllowEdit = false;
this.gv_cancellationPerson.Tag = "query_a.CANCELLATION_PERSON";
this.gv_cancellationPerson.Visible = true;
- this.gv_cancellationPerson.VisibleIndex = 19;
+ this.gv_cancellationPerson.VisibleIndex = 17;
this.gv_cancellationPerson.Width = 60;
//
// gv_cancellationDate
@@ -589,7 +559,7 @@
this.gv_cancellationDate.OptionsColumn.AllowEdit = false;
this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE";
this.gv_cancellationDate.Visible = true;
- this.gv_cancellationDate.VisibleIndex = 20;
+ this.gv_cancellationDate.VisibleIndex = 18;
this.gv_cancellationDate.Width = 180;
//
// gv_createBy
@@ -602,7 +572,7 @@
this.gv_createBy.OptionsColumn.AllowEdit = false;
this.gv_createBy.Tag = "query_a.CREATE_BY";
this.gv_createBy.Visible = true;
- this.gv_createBy.VisibleIndex = 21;
+ this.gv_createBy.VisibleIndex = 19;
this.gv_createBy.Width = 80;
//
// gv_createDate
@@ -615,7 +585,7 @@
this.gv_createDate.OptionsColumn.AllowEdit = false;
this.gv_createDate.Tag = "query_a.CREATE_DATE";
this.gv_createDate.Visible = true;
- this.gv_createDate.VisibleIndex = 22;
+ this.gv_createDate.VisibleIndex = 20;
this.gv_createDate.Width = 180;
//
// gv_lastupdateDate
@@ -628,7 +598,7 @@
this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
this.gv_lastupdateDate.Visible = true;
- this.gv_lastupdateDate.VisibleIndex = 23;
+ this.gv_lastupdateDate.VisibleIndex = 21;
this.gv_lastupdateDate.Width = 200;
//
// gv_lastupdateBy
@@ -641,7 +611,7 @@
this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
this.gv_lastupdateBy.Visible = true;
- this.gv_lastupdateBy.VisibleIndex = 24;
+ this.gv_lastupdateBy.VisibleIndex = 22;
this.gv_lastupdateBy.Width = 100;
//
// gv_erpCheckBy
@@ -654,7 +624,7 @@
this.gv_erpCheckBy.OptionsColumn.AllowEdit = false;
this.gv_erpCheckBy.Tag = "query_a.ERP_CHECK_BY";
this.gv_erpCheckBy.Visible = true;
- this.gv_erpCheckBy.VisibleIndex = 25;
+ this.gv_erpCheckBy.VisibleIndex = 23;
this.gv_erpCheckBy.Width = 80;
//
// gv_erpCheckDate
@@ -667,7 +637,7 @@
this.gv_erpCheckDate.OptionsColumn.AllowEdit = false;
this.gv_erpCheckDate.Tag = "query_a.ERP_CHECK_DATE";
this.gv_erpCheckDate.Visible = true;
- this.gv_erpCheckDate.VisibleIndex = 26;
+ this.gv_erpCheckDate.VisibleIndex = 24;
this.gv_erpCheckDate.Width = 180;
//
// gv_changereason
@@ -680,7 +650,7 @@
this.gv_changereason.OptionsColumn.AllowEdit = false;
this.gv_changereason.Tag = "query_a.CHANGEREASON";
this.gv_changereason.Visible = true;
- this.gv_changereason.VisibleIndex = 27;
+ this.gv_changereason.VisibleIndex = 25;
this.gv_changereason.Width = 100;
//
// gridColumn4
@@ -690,7 +660,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 28;
+ this.gridColumn4.VisibleIndex = 26;
this.gridColumn4.Width = 94;
//
// gridColumn5
@@ -700,7 +670,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 29;
+ this.gridColumn5.VisibleIndex = 27;
this.gridColumn5.Width = 94;
//
// gridColumn7
@@ -710,7 +680,7 @@
this.gridColumn7.MinWidth = 25;
this.gridColumn7.Name = "gridColumn7";
this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 30;
+ this.gridColumn7.VisibleIndex = 28;
this.gridColumn7.Width = 94;
//
// gvcol6
@@ -720,6 +690,16 @@
this.gvcol6.MinWidth = 25;
this.gvcol6.Name = "gvcol6";
this.gvcol6.Width = 94;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "鍚屾鏃堕棿";
+ this.gridColumn11.FieldName = "synchronousDate";
+ this.gridColumn11.MinWidth = 25;
+ this.gridColumn11.Name = "gridColumn11";
+ this.gridColumn11.Visible = true;
+ this.gridColumn11.VisibleIndex = 29;
+ this.gridColumn11.Width = 94;
//
// pageBar1
//
@@ -801,7 +781,7 @@
this.txt_billNo.Location = new System.Drawing.Point(109, 12);
this.txt_billNo.Name = "txt_billNo";
this.txt_billNo.Properties.Appearance.Options.UseFont = true;
- this.txt_billNo.Size = new System.Drawing.Size(229, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(234, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
//
@@ -815,41 +795,41 @@
//
// txt_suppName
//
- this.txt_suppName.Location = new System.Drawing.Point(769, 12);
+ this.txt_suppName.Location = new System.Drawing.Point(780, 12);
this.txt_suppName.Name = "txt_suppName";
- this.txt_suppName.Size = new System.Drawing.Size(229, 24);
+ this.txt_suppName.Size = new System.Drawing.Size(235, 24);
this.txt_suppName.StyleController = this.layoutMx1;
this.txt_suppName.TabIndex = 231;
//
// txt_documentTypeTxt
//
- this.txt_documentTypeTxt.Location = new System.Drawing.Point(439, 12);
+ this.txt_documentTypeTxt.Location = new System.Drawing.Point(444, 12);
this.txt_documentTypeTxt.Name = "txt_documentTypeTxt";
- this.txt_documentTypeTxt.Size = new System.Drawing.Size(229, 24);
+ this.txt_documentTypeTxt.Size = new System.Drawing.Size(235, 24);
this.txt_documentTypeTxt.StyleController = this.layoutMx1;
this.txt_documentTypeTxt.TabIndex = 232;
//
// txt_suppNo
//
- this.txt_suppNo.Location = new System.Drawing.Point(769, 40);
+ this.txt_suppNo.Location = new System.Drawing.Point(780, 40);
this.txt_suppNo.Name = "txt_suppNo";
- this.txt_suppNo.Size = new System.Drawing.Size(229, 24);
+ this.txt_suppNo.Size = new System.Drawing.Size(235, 24);
this.txt_suppNo.StyleController = this.layoutMx1;
this.txt_suppNo.TabIndex = 233;
//
// txt_closeStatusTxt
//
- this.txt_closeStatusTxt.Location = new System.Drawing.Point(1099, 40);
+ this.txt_closeStatusTxt.Location = new System.Drawing.Point(1116, 40);
this.txt_closeStatusTxt.Name = "txt_closeStatusTxt";
- this.txt_closeStatusTxt.Size = new System.Drawing.Size(231, 24);
+ this.txt_closeStatusTxt.Size = new System.Drawing.Size(235, 24);
this.txt_closeStatusTxt.StyleController = this.layoutMx1;
this.txt_closeStatusTxt.TabIndex = 234;
//
// txt_cancellationStatusTxt
//
- this.txt_cancellationStatusTxt.Location = new System.Drawing.Point(1099, 68);
+ this.txt_cancellationStatusTxt.Location = new System.Drawing.Point(1116, 68);
this.txt_cancellationStatusTxt.Name = "txt_cancellationStatusTxt";
- this.txt_cancellationStatusTxt.Size = new System.Drawing.Size(231, 24);
+ this.txt_cancellationStatusTxt.Size = new System.Drawing.Size(235, 24);
this.txt_cancellationStatusTxt.StyleController = this.layoutMx1;
this.txt_cancellationStatusTxt.TabIndex = 235;
//
@@ -857,39 +837,39 @@
//
this.txt_dptName.Location = new System.Drawing.Point(109, 40);
this.txt_dptName.Name = "txt_dptName";
- this.txt_dptName.Size = new System.Drawing.Size(229, 24);
+ this.txt_dptName.Size = new System.Drawing.Size(234, 24);
this.txt_dptName.StyleController = this.layoutMx1;
this.txt_dptName.TabIndex = 236;
//
// txt_purchaseDate
//
- this.txt_purchaseDate.Location = new System.Drawing.Point(439, 40);
+ this.txt_purchaseDate.Location = new System.Drawing.Point(444, 40);
this.txt_purchaseDate.Name = "txt_purchaseDate";
- this.txt_purchaseDate.Size = new System.Drawing.Size(229, 24);
+ this.txt_purchaseDate.Size = new System.Drawing.Size(235, 24);
this.txt_purchaseDate.StyleController = this.layoutMx1;
this.txt_purchaseDate.TabIndex = 237;
//
// txt_docStusTxt
//
- this.txt_docStusTxt.Location = new System.Drawing.Point(1099, 12);
+ this.txt_docStusTxt.Location = new System.Drawing.Point(1116, 12);
this.txt_docStusTxt.Name = "txt_docStusTxt";
- this.txt_docStusTxt.Size = new System.Drawing.Size(231, 24);
+ this.txt_docStusTxt.Size = new System.Drawing.Size(235, 24);
this.txt_docStusTxt.StyleController = this.layoutMx1;
this.txt_docStusTxt.TabIndex = 238;
//
// txt_createDate
//
- this.txt_createDate.Location = new System.Drawing.Point(769, 68);
+ this.txt_createDate.Location = new System.Drawing.Point(780, 68);
this.txt_createDate.Name = "txt_createDate";
- this.txt_createDate.Size = new System.Drawing.Size(229, 24);
+ this.txt_createDate.Size = new System.Drawing.Size(235, 24);
this.txt_createDate.StyleController = this.layoutMx1;
this.txt_createDate.TabIndex = 239;
//
// txt_erpCheckDate
//
- this.txt_erpCheckDate.Location = new System.Drawing.Point(439, 68);
+ this.txt_erpCheckDate.Location = new System.Drawing.Point(444, 68);
this.txt_erpCheckDate.Name = "txt_erpCheckDate";
- this.txt_erpCheckDate.Size = new System.Drawing.Size(229, 24);
+ this.txt_erpCheckDate.Size = new System.Drawing.Size(235, 24);
this.txt_erpCheckDate.StyleController = this.layoutMx1;
this.txt_erpCheckDate.TabIndex = 240;
//
@@ -897,7 +877,7 @@
//
this.txt_erpCheckBy.Location = new System.Drawing.Point(109, 68);
this.txt_erpCheckBy.Name = "txt_erpCheckBy";
- this.txt_erpCheckBy.Size = new System.Drawing.Size(229, 24);
+ this.txt_erpCheckBy.Size = new System.Drawing.Size(234, 24);
this.txt_erpCheckBy.StyleController = this.layoutMx1;
this.txt_erpCheckBy.TabIndex = 241;
//
@@ -964,7 +944,7 @@
rowDefinition1,
rowDefinition2,
rowDefinition3});
- this.Root.Size = new System.Drawing.Size(1342, 104);
+ this.Root.Size = new System.Drawing.Size(1363, 104);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -972,38 +952,38 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(335, 28);
this.layoutControlItem1.Text = "閲囪喘鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_documentTypeTxt;
- this.layoutControlItem5.Location = new System.Drawing.Point(330, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(336, 28);
this.layoutControlItem5.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem5.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_suppName;
- this.layoutControlItem2.Location = new System.Drawing.Point(660, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(671, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(336, 28);
this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_suppNo;
- this.layoutControlItem6.Location = new System.Drawing.Point(660, 28);
+ this.layoutControlItem6.Location = new System.Drawing.Point(671, 28);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(336, 28);
this.layoutControlItem6.Text = "渚涘簲鍟嗙紪鍙�";
this.layoutControlItem6.TextSize = new System.Drawing.Size(85, 18);
//
@@ -1013,72 +993,72 @@
this.layoutControlItem9.Location = new System.Drawing.Point(0, 28);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem9.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem9.Size = new System.Drawing.Size(335, 28);
this.layoutControlItem9.Text = "閲囪喘閮ㄩ棬";
this.layoutControlItem9.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_purchaseDate;
- this.layoutControlItem10.Location = new System.Drawing.Point(330, 28);
+ this.layoutControlItem10.Location = new System.Drawing.Point(335, 28);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem10.Size = new System.Drawing.Size(336, 28);
this.layoutControlItem10.Text = "閲囪喘鏃ユ湡";
this.layoutControlItem10.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_cancellationStatusTxt;
- this.layoutControlItem8.Location = new System.Drawing.Point(990, 56);
+ this.layoutControlItem8.Location = new System.Drawing.Point(1007, 56);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem8.Size = new System.Drawing.Size(336, 28);
this.layoutControlItem8.Text = "浣滃簾鐘舵��";
this.layoutControlItem8.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_closeStatusTxt;
- this.layoutControlItem7.Location = new System.Drawing.Point(990, 28);
+ this.layoutControlItem7.Location = new System.Drawing.Point(1007, 28);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem7.Size = new System.Drawing.Size(336, 28);
this.layoutControlItem7.Text = "鍏抽棴鐘舵��";
this.layoutControlItem7.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_docStusTxt;
- this.layoutControlItem11.Location = new System.Drawing.Point(990, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(1007, 0);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem11.Size = new System.Drawing.Size(332, 28);
+ this.layoutControlItem11.Size = new System.Drawing.Size(336, 28);
this.layoutControlItem11.Text = "鍗曟嵁鐘舵��";
this.layoutControlItem11.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_createDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(660, 56);
+ this.layoutControlItem12.Location = new System.Drawing.Point(671, 56);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem12.Size = new System.Drawing.Size(336, 28);
this.layoutControlItem12.Text = "鍚屾鏃堕棿";
this.layoutControlItem12.TextSize = new System.Drawing.Size(85, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_erpCheckDate;
- this.layoutControlItem13.Location = new System.Drawing.Point(330, 56);
+ this.layoutControlItem13.Location = new System.Drawing.Point(335, 56);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem13.Size = new System.Drawing.Size(336, 28);
this.layoutControlItem13.Text = "ERP瀹℃牳鏃堕棿";
this.layoutControlItem13.TextSize = new System.Drawing.Size(85, 18);
//
@@ -1088,7 +1068,7 @@
this.layoutControlItem14.Location = new System.Drawing.Point(0, 56);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem14.Size = new System.Drawing.Size(330, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(335, 28);
this.layoutControlItem14.Text = "ERP瀹℃牳浜�";
this.layoutControlItem14.TextSize = new System.Drawing.Size(85, 18);
//
@@ -1129,7 +1109,6 @@
this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn3,
this.gv_erpid,
- this.gvMx1salesOrderId,
this.gvMx1itemId,
this.gridColumn2,
this.gridColumn1,
@@ -1163,7 +1142,8 @@
this.gvMx1changeFlag,
this.gvMx1demandDocumentLineId,
this.gridColumn6,
- this.gridColumn8});
+ this.gridColumn8,
+ this.gridColumn9});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1189,18 +1169,6 @@
this.gv_erpid.Visible = true;
this.gv_erpid.VisibleIndex = 1;
this.gv_erpid.Width = 46;
- //
- // gvMx1salesOrderId
- //
- this.gvMx1salesOrderId.AppearanceCell.Options.UseFont = true;
- this.gvMx1salesOrderId.Caption = "閿�鍞鍗曞彿";
- this.gvMx1salesOrderId.FieldName = "salesOrderId";
- this.gvMx1salesOrderId.MinWidth = 25;
- this.gvMx1salesOrderId.Name = "gvMx1salesOrderId";
- this.gvMx1salesOrderId.Tag = "query_a.SALES_ORDER_ID";
- this.gvMx1salesOrderId.Visible = true;
- this.gvMx1salesOrderId.VisibleIndex = 28;
- this.gvMx1salesOrderId.Width = 69;
//
// gvMx1itemId
//
@@ -1583,26 +1551,24 @@
this.gridColumn8.MinWidth = 25;
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 29;
+ this.gridColumn8.VisibleIndex = 28;
this.gridColumn8.Width = 43;
//
- // picCheckBox
+ // gridColumn9
//
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(844, 55);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(100, 50);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 229;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
+ this.gridColumn9.Caption = "濮斿璁㈠崟缂栧彿";
+ this.gridColumn9.FieldName = "outsourcingOrderId";
+ this.gridColumn9.MinWidth = 25;
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 29;
+ this.gridColumn9.Width = 94;
//
// Frm_MesRohIn
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1365, 682);
- this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_MesRohIn";
@@ -1659,14 +1625,12 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
this.ResumeLayout(false);
}
#endregion
private UserControl.UcToolBarMenu toolBarMenu1;
private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
- private System.Windows.Forms.PictureBox picCheckBox;
private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
private DevExpress.XtraEditors.SplitContainerControl split1;
private DevExpress.XtraGrid.GridControl gcMain1;
@@ -1682,12 +1646,10 @@
private DevExpress.XtraGrid.Columns.GridColumn gv_closeStatus;
private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseDept;
- private DevExpress.XtraGrid.Columns.GridColumn gv_qtyAcceptance;
private DevExpress.XtraGrid.Columns.GridColumn gv_purchaser;
private DevExpress.XtraGrid.Columns.GridColumn gv_qualityReq;
private DevExpress.XtraGrid.Columns.GridColumn gv_settlementParty;
private DevExpress.XtraGrid.Columns.GridColumn gv_paymentParty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_transportMethod;
private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
private DevExpress.XtraGrid.Columns.GridColumn gv_cancellationStatus;
private DevExpress.XtraGrid.Columns.GridColumn gv_cancellationPerson;
@@ -1715,7 +1677,6 @@
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
private DevExpress.XtraGrid.Columns.GridColumn gv_erpid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1salesOrderId;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
@@ -1778,5 +1739,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
index bca94b6..1b8d435 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.cs
@@ -24,7 +24,7 @@
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
- Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "docStusTxt", "", (value) =>
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "docStusTxt", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
}, tips);
@@ -147,6 +147,10 @@
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
}
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index e41d69f..346eae2 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -41,11 +41,7 @@
{
//Application.Run(new XtraForm1());
//return;
- //barMenu.ItemClick += (s, e) =>
- //{
- // Gs.DevApp.DevFrm.User.SysMenu frm = new SysMenu();
- // frm.ShowDialog();
- //};
+
CefSettings settings = new CefSettings();
settings.Locale = "zh-CN";
Cef.Initialize(settings);
@@ -54,7 +50,10 @@
{
fmLogin.ShowDialog();
if (fmLogin.DialogResult == DialogResult.OK)
- Application.Run(new FrmMain());
+ {
+ Application.Run(new FrmMain());
+ // Application.Run(new DevFrm.User.SysMenu());
+ }
}
else
{
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs
index ab0219c..99b8a68 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookItems.Designer.cs
@@ -46,12 +46,11 @@
this.lookSearchSupplier.EditValue = "璇烽�夋嫨";
this.lookSearchSupplier.Location = new System.Drawing.Point(0, 0);
this.lookSearchSupplier.Name = "lookSearchSupplier";
-
this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true;
this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View;
- this.lookSearchSupplier.Size = new System.Drawing.Size(266, 28);
+ this.lookSearchSupplier.Size = new System.Drawing.Size(266, 24);
this.lookSearchSupplier.TabIndex = 9;
//
// searchLookUpEdit1View
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
index 1e09a65..dc44ba6 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookItems.cs
@@ -28,6 +28,13 @@
if (EditChanged != null) EditChanged(this, e);
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="orgId">缁勭粐</param>
+ /// <param name="_dftVale">榛樿閫変腑鍊�</param>
+ /// <param name="strWhere">鏌ヨ鏉′欢</param>
+ /// <param name="strType">闄勫姞绫诲瀷锛氬綋涓猴細iqc,ipqc,fqc鏃讹紝鍏嶆锛岀壒鍒姞涓婅繃婊ゆ潯浠�</param>
public void getSuppler(string orgId, string _dftVale = "",string strWhere="",string strType="")
{
string _keyWhere = "";
--
Gitblit v1.9.3