| DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/UserControl/UcDictionary.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -63,18 +63,17 @@ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); this.txt_remark5 = new Gs.DevApp.UserControl.UcDictionary(); this.lbGuid = new System.Windows.Forms.Label(); this.txt_isFkc = new DevExpress.XtraEditors.TextEdit(); this.txt_isNg = new DevExpress.XtraEditors.TextEdit(); this.txt_depotCode = new DevExpress.XtraEditors.TextEdit(); this.txt_zuid = new DevExpress.XtraEditors.TextEdit(); this.txt_depotName = new DevExpress.XtraEditors.TextEdit(); this.txt_createBy = new DevExpress.XtraEditors.TextEdit(); this.txt_description = new DevExpress.XtraEditors.TextEdit(); this.txt_depottype = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -82,11 +81,11 @@ 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.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -125,7 +124,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); @@ -133,11 +131,11 @@ ((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.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -236,8 +234,7 @@ this.gridColumn3, this.gridColumn8, this.gridColumn9, this.gridColumn10, this.gridColumn12}); this.gridColumn10}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -286,8 +283,8 @@ // gv_depottype // this.gv_depottype.AppearanceCell.Options.UseFont = true; this.gv_depottype.Caption = "仓库属性"; this.gv_depottype.FieldName = "depottype"; this.gv_depottype.Caption = "Mes仓库属性"; this.gv_depottype.FieldName = "remark5"; this.gv_depottype.MinWidth = 50; this.gv_depottype.Name = "gv_depottype"; this.gv_depottype.OptionsColumn.AllowEdit = false; @@ -330,8 +327,6 @@ this.gv_isFkc.Name = "gv_isFkc"; this.gv_isFkc.OptionsColumn.AllowEdit = false; this.gv_isFkc.Tag = "query_a.is_fkc"; this.gv_isFkc.Visible = true; this.gv_isFkc.VisibleIndex = 5; this.gv_isFkc.Width = 60; // // gridColumn2 @@ -343,7 +338,7 @@ this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Tag = "query_a.zuid"; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 6; this.gridColumn2.VisibleIndex = 5; this.gridColumn2.Width = 50; // // gridColumn6 @@ -354,7 +349,7 @@ this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Tag = "query_a.SUPPLIER_ID"; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 7; this.gridColumn6.VisibleIndex = 6; this.gridColumn6.Width = 70; // // gridColumn5 @@ -365,7 +360,7 @@ this.gridColumn5.Name = "gridColumn5"; this.gridColumn5.Tag = "query_a.Client_Id"; this.gridColumn5.Visible = true; this.gridColumn5.VisibleIndex = 8; this.gridColumn5.VisibleIndex = 7; this.gridColumn5.Width = 60; // // gridColumn4 @@ -376,7 +371,7 @@ this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Tag = "query_a.department"; this.gridColumn4.Visible = true; this.gridColumn4.VisibleIndex = 9; this.gridColumn4.VisibleIndex = 8; this.gridColumn4.Width = 60; // // gridColumn7 @@ -387,7 +382,7 @@ this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Tag = "query_a.Phone"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 10; this.gridColumn7.VisibleIndex = 9; this.gridColumn7.Width = 60; // // gridColumn3 @@ -398,7 +393,7 @@ this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Tag = "query_a.lastupdate_date"; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 14; this.gridColumn3.VisibleIndex = 12; this.gridColumn3.Width = 180; // // gridColumn8 @@ -416,7 +411,7 @@ this.gridColumn9.MinWidth = 25; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Visible = true; this.gridColumn9.VisibleIndex = 11; this.gridColumn9.VisibleIndex = 10; this.gridColumn9.Width = 94; // // gridColumn10 @@ -426,18 +421,8 @@ this.gridColumn10.MinWidth = 25; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; this.gridColumn10.VisibleIndex = 13; this.gridColumn10.VisibleIndex = 11; this.gridColumn10.Width = 94; // // gridColumn12 // this.gridColumn12.Caption = "特殊仓"; this.gridColumn12.FieldName = "remark5"; this.gridColumn12.MinWidth = 25; this.gridColumn12.Name = "gridColumn12"; this.gridColumn12.Visible = true; this.gridColumn12.VisibleIndex = 12; this.gridColumn12.Width = 94; // // pageBar1 // @@ -476,17 +461,18 @@ this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1264, 570); this.splitMx1.SplitterPosition = 76; this.splitMx1.TabIndex = 0; // // layoutMx1 // this.layoutMx1.Controls.Add(this.txt_remark5); this.layoutMx1.Controls.Add(this.lbGuid); this.layoutMx1.Controls.Add(this.txt_isFkc); this.layoutMx1.Controls.Add(this.txt_isNg); this.layoutMx1.Controls.Add(this.txt_depotCode); this.layoutMx1.Controls.Add(this.txt_zuid); this.layoutMx1.Controls.Add(this.txt_depotName); this.layoutMx1.Controls.Add(this.txt_createBy); this.layoutMx1.Controls.Add(this.txt_description); this.layoutMx1.Controls.Add(this.txt_depottype); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -497,9 +483,19 @@ this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(460, 453, 812, 500); this.layoutMx1.Root = this.Root; this.layoutMx1.Size = new System.Drawing.Size(1264, 100); this.layoutMx1.Size = new System.Drawing.Size(1264, 76); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // txt_remark5 // this.txt_remark5.BtnTxt = "仓库属性"; this.txt_remark5.Location = new System.Drawing.Point(945, 12); this.txt_remark5.Name = "txt_remark5"; this.txt_remark5.Size = new System.Drawing.Size(307, 52); this.txt_remark5.TabIndex = 292; this.txt_remark5.TextTxt = ""; this.txt_remark5.WhereTxt = " a.s_type=\'仓库属性\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'"; // // lbGuid // @@ -512,7 +508,7 @@ // // txt_isFkc // this.txt_isFkc.Location = new System.Drawing.Point(1032, 12); this.txt_isFkc.Location = new System.Drawing.Point(721, 12); this.txt_isFkc.Name = "txt_isFkc"; this.txt_isFkc.Properties.Appearance.Options.UseFont = true; this.txt_isFkc.Size = new System.Drawing.Size(220, 24); @@ -522,7 +518,7 @@ // // txt_isNg // this.txt_isNg.Location = new System.Drawing.Point(1032, 52); this.txt_isNg.Location = new System.Drawing.Point(721, 40); this.txt_isNg.Name = "txt_isNg"; this.txt_isNg.Properties.Appearance.Options.UseFont = true; this.txt_isNg.Size = new System.Drawing.Size(220, 24); @@ -560,19 +556,9 @@ this.txt_depotName.TabIndex = 216; this.txt_depotName.Tag = "readonly"; // // txt_createBy // this.txt_createBy.Location = new System.Drawing.Point(721, 12); this.txt_createBy.Name = "txt_createBy"; this.txt_createBy.Properties.Appearance.Options.UseFont = true; this.txt_createBy.Size = new System.Drawing.Size(220, 24); this.txt_createBy.StyleController = this.layoutMx1; this.txt_createBy.TabIndex = 219; this.txt_createBy.Tag = "readonly"; // // txt_description // this.txt_description.Location = new System.Drawing.Point(99, 52); this.txt_description.Location = new System.Drawing.Point(99, 40); this.txt_description.Name = "txt_description"; this.txt_description.Properties.Appearance.Options.UseFont = true; this.txt_description.Size = new System.Drawing.Size(220, 24); @@ -582,7 +568,7 @@ // // txt_depottype // this.txt_depottype.Location = new System.Drawing.Point(410, 52); this.txt_depottype.Location = new System.Drawing.Point(410, 40); this.txt_depottype.Name = "txt_depottype"; this.txt_depottype.Properties.Appearance.Options.UseFont = true; this.txt_depottype.Size = new System.Drawing.Size(220, 24); @@ -620,11 +606,11 @@ this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem1, this.layoutControlItem2, this.layoutControlItem3, this.layoutControlItem4, this.layoutControlItem5, this.layoutControlItem7, this.layoutControlItem8}); this.layoutControlItem8, this.layoutControlItem10}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -647,7 +633,7 @@ this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2}); this.Root.Size = new System.Drawing.Size(1264, 100); this.Root.Size = new System.Drawing.Size(1264, 76); this.Root.TextVisible = false; // // layoutControlItem1 @@ -655,7 +641,7 @@ this.layoutControlItem1.Control = this.txt_depotCode; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.Size = new System.Drawing.Size(311, 40); this.layoutControlItem1.Size = new System.Drawing.Size(311, 28); this.layoutControlItem1.Text = "仓库编码"; this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18); // @@ -665,62 +651,64 @@ this.layoutControlItem2.Location = new System.Drawing.Point(311, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem2.Size = new System.Drawing.Size(311, 40); this.layoutControlItem2.Size = new System.Drawing.Size(311, 28); this.layoutControlItem2.Text = "仓库名称"; this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_createBy; this.layoutControlItem3.Location = new System.Drawing.Point(622, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem3.Size = new System.Drawing.Size(311, 40); this.layoutControlItem3.Text = "仓库负责人"; this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem4 // this.layoutControlItem4.Control = this.txt_description; this.layoutControlItem4.CustomizationFormText = "仓库备注"; this.layoutControlItem4.Location = new System.Drawing.Point(0, 40); 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(311, 40); this.layoutControlItem4.Size = new System.Drawing.Size(311, 28); this.layoutControlItem4.Text = "仓库备注"; this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_depottype; this.layoutControlItem5.Location = new System.Drawing.Point(311, 40); this.layoutControlItem5.Location = new System.Drawing.Point(311, 28); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem5.Size = new System.Drawing.Size(311, 40); this.layoutControlItem5.Size = new System.Drawing.Size(311, 28); this.layoutControlItem5.Text = "仓库类型"; this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_isFkc; this.layoutControlItem7.Location = new System.Drawing.Point(933, 0); this.layoutControlItem7.Location = new System.Drawing.Point(622, 0); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem7.Size = new System.Drawing.Size(311, 40); this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem7.Size = new System.Drawing.Size(311, 28); this.layoutControlItem7.Text = "允许负库存"; this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_isNg; this.layoutControlItem8.Location = new System.Drawing.Point(933, 40); this.layoutControlItem8.Location = new System.Drawing.Point(622, 28); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem8.Size = new System.Drawing.Size(311, 40); this.layoutControlItem8.Size = new System.Drawing.Size(311, 28); this.layoutControlItem8.Text = "禁用状态"; this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_remark5; this.layoutControlItem10.Location = new System.Drawing.Point(933, 0); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem10.OptionsTableLayoutItem.RowSpan = 2; this.layoutControlItem10.Size = new System.Drawing.Size(311, 56); this.layoutControlItem10.Text = "仓库属性"; this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem10.TextVisible = false; // // tabMx // @@ -728,7 +716,7 @@ this.tabMx.Location = new System.Drawing.Point(0, 0); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; this.tabMx.Size = new System.Drawing.Size(1264, 458); this.tabMx.Size = new System.Drawing.Size(1264, 482); this.tabMx.TabIndex = 3; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -737,7 +725,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; this.tabMxPage1.Size = new System.Drawing.Size(1262, 426); this.tabMxPage1.Size = new System.Drawing.Size(1262, 450); this.tabMxPage1.Text = "仓位列表"; // // gcMx1 @@ -748,7 +736,7 @@ this.gcMx1.Name = "gcMx1"; this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit1}); this.gcMx1.Size = new System.Drawing.Size(1262, 426); this.gcMx1.Size = new System.Drawing.Size(1262, 450); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -909,7 +897,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_depotCode.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depotName.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); @@ -917,11 +904,11 @@ ((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.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -960,17 +947,14 @@ private DevExpress.XtraEditors.TextEdit txt_isFkc; private DevExpress.XtraEditors.TextEdit txt_zuid; private DevExpress.XtraEditors.TextEdit txt_depottype; private DevExpress.XtraEditors.TextEdit txt_createBy; private DevExpress.XtraEditors.TextEdit txt_description; private DevExpress.XtraEditors.TextEdit txt_depotName; private DevExpress.XtraEditors.TextEdit txt_depotCode; 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 layoutControlItem9; private DevExpress.XtraTab.XtraTabControl tabMx; private DevExpress.XtraTab.XtraTabPage tabMxPage1; @@ -988,9 +972,11 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; private DevExpress.XtraEditors.TextEdit txt_isNg; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; private DevExpress.XtraGrid.Columns.GridColumn gridColumn12; private UserControl.UcDictionary txt_remark5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; } } DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
@@ -203,6 +203,7 @@ DepotCode = txt_depotCode.Text, DepotName = txt_depotName.Text, Description = txt_description.Text, Remark5=txt_remark5.TextTxt.Trim(), list = lst }; try DevApp/Gs.DevApp/DevFrm/BasicData/Frm_SupplierSrm.Designer.cs
@@ -40,6 +40,7 @@ this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_del = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); @@ -65,7 +66,8 @@ this.gv_operationTime, this.gv_userName, this.gv_operationTable, this.gv_del}); this.gv_del, this.gridColumn1}); this.gridView1.GridControl = this.gcMain; this.gridView1.Name = "gridView1"; this.gridView1.OptionsFind.ShowSearchNavButtons = false; @@ -82,7 +84,7 @@ this.gv_operationTime.OptionsColumn.ReadOnly = true; this.gv_operationTime.ToolTip = "query_a.OPERATION_TIME"; this.gv_operationTime.Visible = true; this.gv_operationTime.VisibleIndex = 2; this.gv_operationTime.VisibleIndex = 3; this.gv_operationTime.Width = 390; // // gv_userName @@ -95,7 +97,7 @@ this.gv_userName.OptionsColumn.ReadOnly = true; this.gv_userName.Tag = "query_a.USER_NAME"; this.gv_userName.Visible = true; this.gv_userName.VisibleIndex = 1; this.gv_userName.VisibleIndex = 2; this.gv_userName.Width = 310; // // gv_operationTable @@ -118,7 +120,7 @@ this.gv_del.MinWidth = 25; this.gv_del.Name = "gv_del"; this.gv_del.Visible = true; this.gv_del.VisibleIndex = 3; this.gv_del.VisibleIndex = 4; this.gv_del.Width = 94; // // repositoryItemButtonEdit1 @@ -131,6 +133,16 @@ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); // // gridColumn1 // this.gridColumn1.Caption = "供应商ID"; this.gridColumn1.FieldName = "id"; this.gridColumn1.MinWidth = 25; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 1; this.gridColumn1.Width = 94; // // Frm_SupplierSrm // @@ -161,5 +173,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_userName; private DevExpress.XtraGrid.Columns.GridColumn gv_del; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; } } DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.Designer.cs
@@ -391,7 +391,7 @@ this.gv_reason.OptionsColumn.AllowEdit = false; this.gv_reason.Tag = "query_a.reason"; this.gv_reason.Visible = true; this.gv_reason.VisibleIndex = 11; this.gv_reason.VisibleIndex = 12; this.gv_reason.Width = 94; // // gv_fmrmode @@ -403,7 +403,7 @@ this.gv_fmrmode.OptionsColumn.AllowEdit = false; this.gv_fmrmode.Tag = "query_a.fmrmode"; this.gv_fmrmode.Visible = true; this.gv_fmrmode.VisibleIndex = 12; this.gv_fmrmode.VisibleIndex = 11; this.gv_fmrmode.Width = 94; // // gridColumn19 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesYanTui.cs
@@ -168,7 +168,8 @@ { gcMain1.DataSource = dt; gcMain1.ForceInitialize(); gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1); } else UtilityHelper.SetDefaultTable(gcMain1, gridView1); DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -111,6 +111,7 @@ this.txt_qt033 = new DevExpress.XtraEditors.TextEdit(); this.txt_qt032 = new DevExpress.XtraEditors.CheckEdit(); this.txt_qt035 = new DevExpress.XtraEditors.ButtonEdit(); this.txt_isIqc = new DevExpress.XtraEditors.CheckEdit(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -134,6 +135,7 @@ this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.split99 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -211,8 +213,6 @@ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.txt_isIqc = new DevExpress.XtraEditors.CheckEdit(); this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -247,6 +247,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isIqc.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); @@ -270,6 +271,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -319,8 +321,6 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isIqc.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -707,7 +707,8 @@ this.layoutMx1.Controls.Add(this.txt_isIqc); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem12}); this.layoutControlItem12, this.layoutControlItem36}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(289, 480, 812, 500); @@ -930,6 +931,16 @@ this.txt_qt035.StyleController = this.layoutMx1; this.txt_qt035.TabIndex = 340; // // txt_isIqc // this.txt_isIqc.Location = new System.Drawing.Point(340, 155); this.txt_isIqc.Name = "txt_isIqc"; this.txt_isIqc.Properties.Caption = "是否需要IQC,制单审核后生效"; this.txt_isIqc.Size = new System.Drawing.Size(324, 24); this.txt_isIqc.StyleController = this.layoutMx1; this.txt_isIqc.TabIndex = 341; this.txt_isIqc.Tag = "readonly"; // // layoutControlItem12 // this.layoutControlItem12.Control = this.lbGuid; @@ -967,8 +978,7 @@ this.layoutControlItem35, this.layoutControlItem2, this.layoutControlItem15, this.layoutControlItem14, this.layoutControlItem36}); this.layoutControlItem14}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -1122,6 +1132,7 @@ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5; this.layoutControlItem18.Size = new System.Drawing.Size(328, 29); this.layoutControlItem18.Text = "财务审核标识"; this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem18.TextVisible = false; // @@ -1188,6 +1199,7 @@ this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem21.Size = new System.Drawing.Size(328, 29); this.layoutControlItem21.Text = "采购审核标识"; this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem21.TextVisible = false; // @@ -1233,6 +1245,18 @@ this.layoutControlItem14.Size = new System.Drawing.Size(328, 28); this.layoutControlItem14.Text = "申请人员"; this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18); // // layoutControlItem36 // this.layoutControlItem36.Control = this.txt_isIqc; this.layoutControlItem36.Location = new System.Drawing.Point(328, 143); this.layoutControlItem36.Name = "layoutControlItem36"; this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 5; this.layoutControlItem36.Size = new System.Drawing.Size(328, 29); this.layoutControlItem36.Text = "iqc标识"; this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem36.TextVisible = false; // // tabMx // @@ -2178,27 +2202,6 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // // txt_isIqc // this.txt_isIqc.Location = new System.Drawing.Point(340, 155); this.txt_isIqc.Name = "txt_isIqc"; this.txt_isIqc.Properties.Caption = "是否需要IQC"; this.txt_isIqc.Size = new System.Drawing.Size(324, 24); this.txt_isIqc.StyleController = this.layoutMx1; this.txt_isIqc.TabIndex = 341; this.txt_isIqc.Tag = "readonly"; // // layoutControlItem36 // this.layoutControlItem36.Control = this.txt_isIqc; this.layoutControlItem36.Location = new System.Drawing.Point(328, 143); this.layoutControlItem36.Name = "layoutControlItem36"; this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 5; this.layoutControlItem36.Size = new System.Drawing.Size(328, 29); this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem36.TextVisible = false; // // Frm_MesItemQtrk // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -2243,6 +2246,7 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_qt033.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isIqc.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); @@ -2266,6 +2270,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -2315,8 +2320,6 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isIqc.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit(); this.ResumeLayout(false); } DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -846,7 +846,8 @@ foreach (dynamic dym in lst) { if (stringBuilder.Length > 0) stringBuilder.Append("|"); // stringBuilder.Append("|");//|和~已被占用 stringBuilder.Append("&"); stringBuilder.Append(dym.dicTxt); } gvMx1.SetFocusedRowCellValue("qd012", stringBuilder.ToString()); DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.Designer.cs
@@ -353,8 +353,6 @@ this.gv_depotsCode.Name = "gv_depotsCode"; this.gv_depotsCode.OptionsColumn.AllowEdit = false; this.gv_depotsCode.Tag = "query_a.DEPOTS_CODE"; this.gv_depotsCode.Visible = true; this.gv_depotsCode.VisibleIndex = 3; this.gv_depotsCode.Width = 94; // // gv_depotsId @@ -367,7 +365,7 @@ this.gv_depotsId.OptionsColumn.AllowEdit = false; this.gv_depotsId.Tag = "query_a.DEPOTS_ID"; this.gv_depotsId.Visible = true; this.gv_depotsId.VisibleIndex = 4; this.gv_depotsId.VisibleIndex = 3; this.gv_depotsId.Width = 89; // // bandedGridColumn1 @@ -377,7 +375,7 @@ this.bandedGridColumn1.MinWidth = 25; this.bandedGridColumn1.Name = "bandedGridColumn1"; this.bandedGridColumn1.Visible = true; this.bandedGridColumn1.VisibleIndex = 5; this.bandedGridColumn1.VisibleIndex = 4; this.bandedGridColumn1.Width = 94; // // gv_createBy @@ -390,7 +388,7 @@ this.gv_createBy.OptionsColumn.AllowEdit = false; this.gv_createBy.Tag = "query_a.CREATE_BY"; this.gv_createBy.Visible = true; this.gv_createBy.VisibleIndex = 6; this.gv_createBy.VisibleIndex = 5; this.gv_createBy.Width = 66; // // gv_createDate @@ -403,7 +401,7 @@ this.gv_createDate.OptionsColumn.AllowEdit = false; this.gv_createDate.Tag = "query_a.CREATE_DATE"; this.gv_createDate.Visible = true; this.gv_createDate.VisibleIndex = 7; this.gv_createDate.VisibleIndex = 6; this.gv_createDate.Width = 146; // // gv_lastupdateBy @@ -416,7 +414,7 @@ this.gv_lastupdateBy.OptionsColumn.AllowEdit = false; this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY"; this.gv_lastupdateBy.Visible = true; this.gv_lastupdateBy.VisibleIndex = 8; this.gv_lastupdateBy.VisibleIndex = 7; this.gv_lastupdateBy.Width = 94; // // gv_lastupdateDate @@ -429,7 +427,7 @@ this.gv_lastupdateDate.OptionsColumn.AllowEdit = false; this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE"; this.gv_lastupdateDate.Visible = true; this.gv_lastupdateDate.VisibleIndex = 9; this.gv_lastupdateDate.VisibleIndex = 8; this.gv_lastupdateDate.Width = 94; // // gv_remark @@ -442,7 +440,7 @@ this.gv_remark.OptionsColumn.AllowEdit = false; this.gv_remark.Tag = "query_a.REMARK"; this.gv_remark.Visible = true; this.gv_remark.VisibleIndex = 10; this.gv_remark.VisibleIndex = 9; this.gv_remark.Width = 119; // // bandedGridColumn4 @@ -452,7 +450,7 @@ this.bandedGridColumn4.MinWidth = 25; this.bandedGridColumn4.Name = "bandedGridColumn4"; this.bandedGridColumn4.Visible = true; this.bandedGridColumn4.VisibleIndex = 11; this.bandedGridColumn4.VisibleIndex = 10; this.bandedGridColumn4.Width = 94; // // gv_checkUser @@ -465,7 +463,7 @@ this.gv_checkUser.OptionsColumn.AllowEdit = false; this.gv_checkUser.Tag = "query_a.CHECK_USER"; this.gv_checkUser.Visible = true; this.gv_checkUser.VisibleIndex = 12; this.gv_checkUser.VisibleIndex = 11; this.gv_checkUser.Width = 94; // // gv_checkDate @@ -478,7 +476,7 @@ this.gv_checkDate.OptionsColumn.AllowEdit = false; this.gv_checkDate.Tag = "query_a.CHECK_DATE"; this.gv_checkDate.Visible = true; this.gv_checkDate.VisibleIndex = 13; this.gv_checkDate.VisibleIndex = 12; this.gv_checkDate.Width = 94; // // bandedGridColumn3 @@ -488,7 +486,7 @@ this.bandedGridColumn3.MinWidth = 25; this.bandedGridColumn3.Name = "bandedGridColumn3"; this.bandedGridColumn3.Visible = true; this.bandedGridColumn3.VisibleIndex = 14; this.bandedGridColumn3.VisibleIndex = 13; this.bandedGridColumn3.Width = 94; // // bandedGridColumn5 @@ -498,7 +496,7 @@ this.bandedGridColumn5.MinWidth = 25; this.bandedGridColumn5.Name = "bandedGridColumn5"; this.bandedGridColumn5.Visible = true; this.bandedGridColumn5.VisibleIndex = 15; this.bandedGridColumn5.VisibleIndex = 14; this.bandedGridColumn5.Width = 94; // // gv_guid @@ -519,7 +517,7 @@ this.gridColumn7.MinWidth = 25; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 16; this.gridColumn7.VisibleIndex = 15; this.gridColumn7.Width = 94; // // gridColumn8 @@ -529,7 +527,7 @@ this.gridColumn8.MinWidth = 25; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.Visible = true; this.gridColumn8.VisibleIndex = 17; this.gridColumn8.VisibleIndex = 16; this.gridColumn8.Width = 94; // // gridColumn9 @@ -539,7 +537,7 @@ this.gridColumn9.MinWidth = 25; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Visible = true; this.gridColumn9.VisibleIndex = 18; this.gridColumn9.VisibleIndex = 17; this.gridColumn9.Width = 94; // // gridColumn10 @@ -549,7 +547,7 @@ this.gridColumn10.MinWidth = 25; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; this.gridColumn10.VisibleIndex = 19; this.gridColumn10.VisibleIndex = 18; this.gridColumn10.Width = 94; // // pageBar1 @@ -634,136 +632,136 @@ // // txt_ckName // this.txt_ckName.Location = new System.Drawing.Point(445, 105); this.txt_ckName.Location = new System.Drawing.Point(415, 105); this.txt_ckName.Name = "txt_ckName"; this.txt_ckName.Properties.Appearance.Options.UseFont = true; this.txt_ckName.Size = new System.Drawing.Size(225, 24); this.txt_ckName.Size = new System.Drawing.Size(255, 24); this.txt_ckName.StyleController = this.layoutMx1; this.txt_ckName.TabIndex = 609; // // txt_sqRemark // this.txt_sqRemark.Location = new System.Drawing.Point(114, 136); this.txt_sqRemark.Location = new System.Drawing.Point(84, 136); this.txt_sqRemark.Name = "txt_sqRemark"; this.txt_sqRemark.Properties.Appearance.Options.UseFont = true; this.txt_sqRemark.Size = new System.Drawing.Size(556, 24); this.txt_sqRemark.Size = new System.Drawing.Size(586, 24); this.txt_sqRemark.StyleController = this.layoutMx1; this.txt_sqRemark.TabIndex = 240; // // txt_hz // this.txt_hz.Location = new System.Drawing.Point(114, 105); this.txt_hz.Location = new System.Drawing.Point(84, 105); this.txt_hz.Name = "txt_hz"; this.txt_hz.Properties.Appearance.Options.UseFont = true; this.txt_hz.Size = new System.Drawing.Size(225, 24); this.txt_hz.Size = new System.Drawing.Size(255, 24); this.txt_hz.StyleController = this.layoutMx1; this.txt_hz.TabIndex = 602; // // txt_checkUser // this.txt_checkUser.Location = new System.Drawing.Point(1107, 12); this.txt_checkUser.Location = new System.Drawing.Point(1077, 12); this.txt_checkUser.Name = "txt_checkUser"; this.txt_checkUser.Properties.Appearance.Options.UseFont = true; this.txt_checkUser.Size = new System.Drawing.Size(227, 24); this.txt_checkUser.Size = new System.Drawing.Size(257, 24); this.txt_checkUser.StyleController = this.layoutMx1; this.txt_checkUser.TabIndex = 608; // // txt_createDate // this.txt_createDate.Location = new System.Drawing.Point(776, 105); this.txt_createDate.Location = new System.Drawing.Point(746, 105); this.txt_createDate.Name = "txt_createDate"; this.txt_createDate.Properties.Appearance.Options.UseFont = true; this.txt_createDate.Size = new System.Drawing.Size(225, 24); this.txt_createDate.Size = new System.Drawing.Size(255, 24); this.txt_createDate.StyleController = this.layoutMx1; this.txt_createDate.TabIndex = 222; // // txt_lyfx // this.txt_lyfx.Location = new System.Drawing.Point(776, 43); this.txt_lyfx.Location = new System.Drawing.Point(746, 43); this.txt_lyfx.Name = "txt_lyfx"; this.txt_lyfx.Properties.Appearance.Options.UseFont = true; this.txt_lyfx.Size = new System.Drawing.Size(225, 24); this.txt_lyfx.Size = new System.Drawing.Size(255, 24); this.txt_lyfx.StyleController = this.layoutMx1; this.txt_lyfx.TabIndex = 604; // // txt_hzlx // this.txt_hzlx.Location = new System.Drawing.Point(114, 74); this.txt_hzlx.Location = new System.Drawing.Point(84, 74); this.txt_hzlx.Name = "txt_hzlx"; this.txt_hzlx.Properties.Appearance.Options.UseFont = true; this.txt_hzlx.Size = new System.Drawing.Size(225, 24); this.txt_hzlx.Size = new System.Drawing.Size(255, 24); this.txt_hzlx.StyleController = this.layoutMx1; this.txt_hzlx.TabIndex = 600; // // txt_gysName // this.txt_gysName.Location = new System.Drawing.Point(445, 74); this.txt_gysName.Location = new System.Drawing.Point(415, 74); this.txt_gysName.Name = "txt_gysName"; this.txt_gysName.Properties.Appearance.Options.UseFont = true; this.txt_gysName.Size = new System.Drawing.Size(225, 24); this.txt_gysName.Size = new System.Drawing.Size(255, 24); this.txt_gysName.StyleController = this.layoutMx1; this.txt_gysName.TabIndex = 595; // // txt_billNo // this.txt_billNo.Location = new System.Drawing.Point(114, 12); this.txt_billNo.Location = new System.Drawing.Point(84, 12); this.txt_billNo.Name = "txt_billNo"; this.txt_billNo.Properties.Appearance.Options.UseFont = true; this.txt_billNo.Size = new System.Drawing.Size(225, 24); this.txt_billNo.Size = new System.Drawing.Size(255, 24); this.txt_billNo.StyleController = this.layoutMx1; this.txt_billNo.TabIndex = 211; // // txt_abtNo // this.txt_abtNo.Location = new System.Drawing.Point(445, 12); this.txt_abtNo.Location = new System.Drawing.Point(415, 12); this.txt_abtNo.Name = "txt_abtNo"; this.txt_abtNo.Properties.Appearance.Options.UseFont = true; this.txt_abtNo.Size = new System.Drawing.Size(225, 24); this.txt_abtNo.Size = new System.Drawing.Size(255, 24); this.txt_abtNo.StyleController = this.layoutMx1; this.txt_abtNo.TabIndex = 507; // // txt_djlx // this.txt_djlx.Location = new System.Drawing.Point(776, 12); this.txt_djlx.Location = new System.Drawing.Point(746, 12); this.txt_djlx.Name = "txt_djlx"; this.txt_djlx.Properties.Appearance.Options.UseFont = true; this.txt_djlx.Size = new System.Drawing.Size(225, 24); this.txt_djlx.Size = new System.Drawing.Size(255, 24); this.txt_djlx.StyleController = this.layoutMx1; this.txt_djlx.TabIndex = 598; // // txt_createBy // this.txt_createBy.Location = new System.Drawing.Point(776, 74); this.txt_createBy.Location = new System.Drawing.Point(746, 74); this.txt_createBy.Name = "txt_createBy"; this.txt_createBy.Properties.Appearance.Options.UseFont = true; this.txt_createBy.Size = new System.Drawing.Size(225, 24); this.txt_createBy.Size = new System.Drawing.Size(255, 24); this.txt_createBy.StyleController = this.layoutMx1; this.txt_createBy.TabIndex = 219; // // txt_dptName // this.txt_dptName.Location = new System.Drawing.Point(445, 43); this.txt_dptName.Location = new System.Drawing.Point(415, 43); this.txt_dptName.Name = "txt_dptName"; this.txt_dptName.Properties.Appearance.Options.UseFont = true; this.txt_dptName.Size = new System.Drawing.Size(225, 24); this.txt_dptName.Size = new System.Drawing.Size(255, 24); this.txt_dptName.StyleController = this.layoutMx1; this.txt_dptName.TabIndex = 596; // // txt_kcOrg // this.txt_kcOrg.Location = new System.Drawing.Point(114, 43); this.txt_kcOrg.Location = new System.Drawing.Point(84, 43); this.txt_kcOrg.Name = "txt_kcOrg"; this.txt_kcOrg.Properties.Appearance.Options.UseFont = true; this.txt_kcOrg.Size = new System.Drawing.Size(225, 24); this.txt_kcOrg.Size = new System.Drawing.Size(255, 24); this.txt_kcOrg.StyleController = this.layoutMx1; this.txt_kcOrg.TabIndex = 593; // // txt_checkDate // this.txt_checkDate.Location = new System.Drawing.Point(1107, 43); this.txt_checkDate.Location = new System.Drawing.Point(1077, 43); this.txt_checkDate.Name = "txt_checkDate"; this.txt_checkDate.Properties.Appearance.Options.UseFont = true; this.txt_checkDate.Size = new System.Drawing.Size(227, 24); this.txt_checkDate.Size = new System.Drawing.Size(257, 24); this.txt_checkDate.StyleController = this.layoutMx1; this.txt_checkDate.TabIndex = 587; // @@ -778,19 +776,19 @@ // // txt_lastupdateBy // this.txt_lastupdateBy.Location = new System.Drawing.Point(1107, 105); this.txt_lastupdateBy.Location = new System.Drawing.Point(1077, 105); this.txt_lastupdateBy.Name = "txt_lastupdateBy"; this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true; this.txt_lastupdateBy.Size = new System.Drawing.Size(227, 24); this.txt_lastupdateBy.Size = new System.Drawing.Size(257, 24); this.txt_lastupdateBy.StyleController = this.layoutMx1; this.txt_lastupdateBy.TabIndex = 610; // // txt_lastupdateDate // this.txt_lastupdateDate.Location = new System.Drawing.Point(1107, 136); this.txt_lastupdateDate.Location = new System.Drawing.Point(1077, 136); this.txt_lastupdateDate.Name = "txt_lastupdateDate"; this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true; this.txt_lastupdateDate.Size = new System.Drawing.Size(227, 24); this.txt_lastupdateDate.Size = new System.Drawing.Size(257, 24); this.txt_lastupdateDate.StyleController = this.layoutMx1; this.txt_lastupdateDate.TabIndex = 611; // @@ -870,7 +868,7 @@ this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.Size = new System.Drawing.Size(331, 31); this.layoutControlItem1.Text = "入库单号"; this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18); this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem2 // @@ -880,7 +878,7 @@ this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem2.Size = new System.Drawing.Size(331, 31); this.layoutControlItem2.Text = "申请单号"; this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18); this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem3 // @@ -890,7 +888,7 @@ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem3.Size = new System.Drawing.Size(331, 31); this.layoutControlItem3.Text = "单据类型"; this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18); this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem4 // @@ -900,7 +898,7 @@ this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem4.Size = new System.Drawing.Size(333, 31); this.layoutControlItem4.Text = "审核人员"; this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18); this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem5 // @@ -910,7 +908,7 @@ this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem5.Size = new System.Drawing.Size(331, 31); this.layoutControlItem5.Text = "库存组织"; this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18); this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem6 // @@ -921,7 +919,7 @@ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem6.Size = new System.Drawing.Size(331, 31); this.layoutControlItem6.Text = "部门"; this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18); this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem7 // @@ -932,7 +930,7 @@ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem7.Size = new System.Drawing.Size(331, 31); this.layoutControlItem7.Text = "库存方向"; this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18); this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem8 // @@ -943,7 +941,7 @@ this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem8.Size = new System.Drawing.Size(333, 31); this.layoutControlItem8.Text = "审核日期"; this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18); this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem9 // @@ -953,7 +951,7 @@ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem9.Size = new System.Drawing.Size(331, 31); this.layoutControlItem9.Text = "货主类型"; this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18); this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem10 // @@ -964,7 +962,7 @@ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem10.Size = new System.Drawing.Size(331, 31); this.layoutControlItem10.Text = "供应商"; this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18); this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem11 // @@ -975,7 +973,7 @@ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem11.Size = new System.Drawing.Size(331, 31); this.layoutControlItem11.Text = "创建人员"; this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18); this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem12 // @@ -997,7 +995,7 @@ this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem13.Size = new System.Drawing.Size(331, 31); this.layoutControlItem13.Text = "货主"; this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18); this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem14 // @@ -1008,7 +1006,7 @@ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem14.Size = new System.Drawing.Size(331, 31); this.layoutControlItem14.Text = "仓库名称"; this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18); this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem15 // @@ -1019,7 +1017,7 @@ this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem15.Size = new System.Drawing.Size(331, 31); this.layoutControlItem15.Text = "创建时间"; this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18); this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem16 // @@ -1030,7 +1028,7 @@ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem16.Size = new System.Drawing.Size(662, 32); this.layoutControlItem16.Text = "申请备注"; this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18); this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem17 // @@ -1040,8 +1038,8 @@ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem17.Size = new System.Drawing.Size(333, 31); this.layoutControlItem17.Text = "最后更新人"; this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18); this.layoutControlItem17.Text = "更新人员"; this.layoutControlItem17.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem18 // @@ -1051,8 +1049,8 @@ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem18.Size = new System.Drawing.Size(333, 32); this.layoutControlItem18.Text = "最后更新时间"; this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18); this.layoutControlItem18.Text = "更新时间"; this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18); // // tabMx // DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
@@ -175,7 +175,7 @@ } catch (Exception ex) { ToolBox.MsgHelper.Warning("提示：" + ex.Message); ToolBox.MsgHelper.ShowError("提示：" + ex.Message); } } @@ -244,11 +244,11 @@ } } else ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg); ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg); } catch (Exception ex) { ToolBox.MsgHelper.Warning("提示：" + ex.Message); ToolBox.MsgHelper.ShowError("提示：" + ex.Message); } } @@ -274,7 +274,7 @@ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo"); if (string.IsNullOrEmpty(rowGuid)) { MsgHelper.Warning("请先选择你要操作的行！"); MsgHelper.ShowError("请先选择你要操作的行！"); return; } if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？")) @@ -291,9 +291,9 @@ _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); MsgHelper.Warning(_rtn.rtnData.outMsg.ToString()); if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString()); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); @@ -302,10 +302,12 @@ gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkUser", "checkUser", picCheckBox, this, _inFieldValue.ToString()); } else MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString()); } catch (Exception ex) { MsgHelper.Warning("提示：" + ex.Message); MsgHelper.ShowError("提示：" + ex.Message); } } } DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs
@@ -67,7 +67,12 @@ rptName = "rpt_SCTL"; else if (strType == QcSeason.其它入库检.ToString()) { rptName = "rpt_Qtrk"; layoutControlItem25.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never; layoutControlItem27.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never; } else if (strType == QcSeason.销售退货入库检.ToString()) rptName = "rpt_Xsth"; @@ -130,7 +135,8 @@ frm.ShowDialog(); if (string.IsNullOrEmpty(strCodeList)) return; if (strAction == "print") { if (strAction == "print") { try { string rptParameter = rptName + "{" @@ -432,7 +438,12 @@ { toolBarMenu1.isSetBtn = false; string rkckid = txt_rkCkId.GetId(); if (strType != QcSeason.超期检.ToString()) if (strType == QcSeason.超期检.ToString() || strType == QcSeason.其它入库检.ToString()) { } else { if (string.IsNullOrEmpty(rkckid)) { @@ -484,7 +495,13 @@ /// <param name="pageSize">每页几条</param> private void getPageList(int curPage) { gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); gcMain1.DataSource = null; System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder(); _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList)); if (strType == QcSeason.其它入库检.ToString()) { _sbSqlWhere.Append(" and isnull(qtrk.qt028,0)=1 and isnull(qtrk.qt032,0)=1 and isnull(qtrk.qt015,0)=1 "); } PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", " and a.order_type='" + strType + "' " + _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try @@ -518,7 +535,6 @@ { ToolBox.MsgHelper.ShowError("提示：" + ex.Message); } } /// <summary> /// 读取实体 DevApp/Gs.DevApp/UserControl/UcDictionary.cs
@@ -62,7 +62,8 @@ foreach (dynamic dym in lst) { if (stringBuilder.Length > 0) stringBuilder.Append("|"); // stringBuilder.Append("|");//|和~已被占用 stringBuilder.Append("&"); stringBuilder.Append(dym.dicTxt); } this.TextTxt = stringBuilder.ToString();
