| DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.resx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.resx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.resx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
@@ -6,6 +6,7 @@ using DevExpress.XtraEditors; using DevExpress.XtraEditors.Controls; using DevExpress.XtraGrid.Views.Grid; using FastReport.Dialog; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; @@ -22,6 +23,7 @@ { InitializeComponent(); getTree(); toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick; toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; @@ -36,6 +38,7 @@ getPageList(1, UtilityHelper.GetPageSize()); pageBar1.PagerEvent += PageBar1_PagerEvent; } private void GridView1_CustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e) @@ -128,7 +131,25 @@ { UtilityHelper.JumpToTab(xtraTabControl1, 0); } /// <summary> /// 修改事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e) { string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_name, gridView1); if (string.IsNullOrEmpty(rowGuid)) { MsgHelper.Warning("请先选择你要操作的行！"); return; } getModel(rowGuid, true, 1); } /// <summary> /// 删除事件 /// </summary> DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.Designer.cs
@@ -46,7 +46,6 @@ this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_company = new DevExpress.XtraEditors.LabelControl(); this.txt_company = new DevExpress.XtraEditors.TextEdit(); this.gv_company = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl(); this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit(); this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -134,7 +133,7 @@ this.gv_description.OptionsColumn.AllowEdit = false; this.gv_description.Tag = "query_a.description"; this.gv_description.Visible = true; this.gv_description.VisibleIndex = 13; this.gv_description.VisibleIndex = 12; this.gv_description.Width = 94; // // lb_pgroup @@ -167,7 +166,7 @@ this.gv_pgroup.OptionsColumn.AllowEdit = false; this.gv_pgroup.Tag = "query_a.pgroup"; this.gv_pgroup.Visible = true; this.gv_pgroup.VisibleIndex = 12; this.gv_pgroup.VisibleIndex = 11; this.gv_pgroup.Width = 94; // // lb_iqcTypeName @@ -200,7 +199,7 @@ this.gv_iqcTypeName.OptionsColumn.AllowEdit = false; this.gv_iqcTypeName.Tag = "query_a.iqc_type_name"; this.gv_iqcTypeName.Visible = true; this.gv_iqcTypeName.VisibleIndex = 11; this.gv_iqcTypeName.VisibleIndex = 10; this.gv_iqcTypeName.Width = 94; // // lb_iqcType @@ -233,7 +232,7 @@ this.gv_iqcType.OptionsColumn.AllowEdit = false; this.gv_iqcType.Tag = "query_a.iqc_type"; this.gv_iqcType.Visible = true; this.gv_iqcType.VisibleIndex = 10; this.gv_iqcType.VisibleIndex = 9; this.gv_iqcType.Width = 94; // // lb_factory @@ -259,14 +258,14 @@ // this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_factory.AppearanceCell.Options.UseFont = true; this.gv_factory.Caption = "factory "; this.gv_factory.Caption = "工厂"; this.gv_factory.FieldName = "factory"; this.gv_factory.MinWidth = 50; this.gv_factory.Name = "gv_factory"; this.gv_factory.OptionsColumn.AllowEdit = false; this.gv_factory.Tag = "query_a.factory"; this.gv_factory.Visible = true; this.gv_factory.VisibleIndex = 9; this.gv_factory.VisibleIndex = 1; this.gv_factory.Width = 94; // // lb_company @@ -287,20 +286,6 @@ this.txt_company.Properties.Appearance.Options.UseFont = true; this.txt_company.Size = new System.Drawing.Size(150, 28); this.txt_company.TabIndex = 231; // // gv_company // this.gv_company.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_company.AppearanceCell.Options.UseFont = true; this.gv_company.Caption = "company "; this.gv_company.FieldName = "company"; this.gv_company.MinWidth = 50; this.gv_company.Name = "gv_company"; this.gv_company.OptionsColumn.AllowEdit = false; this.gv_company.Tag = "query_a.company"; this.gv_company.Visible = true; this.gv_company.VisibleIndex = 8; this.gv_company.Width = 94; // // lb_lastupdateDate // @@ -332,7 +317,7 @@ this.gv_lastupdateDate.OptionsColumn.AllowEdit = false; this.gv_lastupdateDate.Tag = "query_a.lastupdate_date"; this.gv_lastupdateDate.Visible = true; this.gv_lastupdateDate.VisibleIndex = 7; this.gv_lastupdateDate.VisibleIndex = 8; this.gv_lastupdateDate.Width = 94; // // lb_lastupdateBy @@ -365,7 +350,7 @@ this.gv_lastupdateBy.OptionsColumn.AllowEdit = false; this.gv_lastupdateBy.Tag = "query_a.lastupdate_by"; this.gv_lastupdateBy.Visible = true; this.gv_lastupdateBy.VisibleIndex = 6; this.gv_lastupdateBy.VisibleIndex = 7; this.gv_lastupdateBy.Width = 94; // // lb_createDate @@ -398,7 +383,7 @@ this.gv_createDate.OptionsColumn.AllowEdit = false; this.gv_createDate.Tag = "query_a.create_date"; this.gv_createDate.Visible = true; this.gv_createDate.VisibleIndex = 5; this.gv_createDate.VisibleIndex = 6; this.gv_createDate.Width = 94; // // lb_createBy @@ -431,7 +416,7 @@ this.gv_createBy.OptionsColumn.AllowEdit = false; this.gv_createBy.Tag = "query_a.create_by"; this.gv_createBy.Visible = true; this.gv_createBy.VisibleIndex = 4; this.gv_createBy.VisibleIndex = 5; this.gv_createBy.Width = 94; // // lb_remark @@ -464,7 +449,7 @@ this.gv_remark.OptionsColumn.AllowEdit = false; this.gv_remark.Tag = "query_a.remark"; this.gv_remark.Visible = true; this.gv_remark.VisibleIndex = 3; this.gv_remark.VisibleIndex = 4; this.gv_remark.Width = 94; // // lb_tname @@ -497,7 +482,7 @@ this.gv_tname.OptionsColumn.AllowEdit = false; this.gv_tname.Tag = "query_a.tname"; this.gv_tname.Visible = true; this.gv_tname.VisibleIndex = 2; this.gv_tname.VisibleIndex = 3; this.gv_tname.Width = 94; // // lb_tcode @@ -530,7 +515,7 @@ this.gv_tcode.OptionsColumn.AllowEdit = false; this.gv_tcode.Tag = "query_a.tcode"; this.gv_tcode.Visible = true; this.gv_tcode.VisibleIndex = 1; this.gv_tcode.VisibleIndex = 2; this.gv_tcode.Width = 94; // // lb_id @@ -574,11 +559,11 @@ this.toolBarMenu1.isSetBtn = false; this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); this.toolBarMenu1.Name = "toolBarMenu1"; this.toolBarMenu1.rptParameter = null; this.toolBarMenu1.Size = new System.Drawing.Size(938, 80); this.toolBarMenu1.TabIndex = 0; this.toolBarMenu1.xlsInService = null; this.toolBarMenu1.xlsOutParameter = null; // // gcMain // @@ -598,6 +583,7 @@ this.gridView1.Appearance.Row.Options.UseFont = true; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gv_id, this.gv_factory, this.gv_tcode, this.gv_tname, this.gv_remark, @@ -605,8 +591,6 @@ this.gv_createDate, this.gv_lastupdateBy, this.gv_lastupdateDate, this.gv_company, this.gv_factory, this.gv_iqcType, this.gv_iqcTypeName, this.gv_pgroup, @@ -782,7 +766,6 @@ private DevExpress.XtraEditors.LabelControl lb_company; private DevExpress.XtraEditors.TextEdit txt_company; private DevExpress.XtraGrid.Columns.GridColumn gv_company; private DevExpress.XtraEditors.LabelControl lb_lastupdateDate; private DevExpress.XtraEditors.TextEdit txt_lastupdateDate; DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.resx
@@ -59,8 +59,7 @@ : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns=""> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> @@ -68,11 +67,9 @@ <xsd:element name="metadata"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0"/> <xsd:element name="value" type="xsd:string" minOccurs="0" /> </xsd:sequence> <xsd:attribute name="name" use="required" type="xsd:string"/> <xsd:attribute name="name" use="required" type="xsd:string" /> <xsd:attribute name="type" type="xsd:string"/> <xsd:attribute name="mimetype" type="xsd:string"/> <xsd:attribute ref="xml:space"/> @@ -87,28 +84,21 @@ <xsd:element name="data"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> <xsd:attribute ref="xml:space"/> </xsd:complexType> </xsd:element> <xsd:element name="resheader"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="name" type="xsd:string" use="required" /> </xsd:complexType> </xsd:element> </xsd:choice> @@ -122,13 +112,9 @@ <value>2.0</value> </resheader> <resheader name="reader"> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 </value> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 </value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> </root> DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.Designer.cs
@@ -32,16 +32,6 @@ this.lb_fforbidstatus = new DevExpress.XtraEditors.LabelControl(); this.txt_fforbidstatus = new DevExpress.XtraEditors.TextEdit(); this.gv_fforbidstatus = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_remark5 = new DevExpress.XtraEditors.LabelControl(); this.txt_remark5 = new DevExpress.XtraEditors.TextEdit(); this.lb_remark4 = new DevExpress.XtraEditors.LabelControl(); this.txt_remark4 = new DevExpress.XtraEditors.TextEdit(); this.lb_remark3 = new DevExpress.XtraEditors.LabelControl(); this.txt_remark3 = new DevExpress.XtraEditors.TextEdit(); this.lb_remark2 = new DevExpress.XtraEditors.LabelControl(); this.txt_remark2 = new DevExpress.XtraEditors.TextEdit(); this.lb_remark1 = new DevExpress.XtraEditors.LabelControl(); this.txt_remark1 = new DevExpress.XtraEditors.TextEdit(); this.lb_disabledDate = new DevExpress.XtraEditors.LabelControl(); this.txt_disabledDate = new DevExpress.XtraEditors.TextEdit(); this.gv_disabledDate = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -63,8 +53,6 @@ this.lb_positionId = new DevExpress.XtraEditors.LabelControl(); this.txt_positionId = new DevExpress.XtraEditors.TextEdit(); this.gv_positionId = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_id = new DevExpress.XtraEditors.LabelControl(); this.txt_id = new DevExpress.XtraEditors.TextEdit(); this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.gcMain = new DevExpress.XtraGrid.GridControl(); @@ -77,11 +65,6 @@ this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); this.lbGuid = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark5.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark4.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark3.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark2.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark1.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_disabledDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_disabledBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_creationDate.Properties)).BeginInit(); @@ -89,7 +72,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_positionDescription.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_positionName.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_positionId.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); @@ -103,7 +85,7 @@ // this.lb_fforbidstatus.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_fforbidstatus.Appearance.Options.UseFont = true; this.lb_fforbidstatus.Location = new System.Drawing.Point(520, 123); this.lb_fforbidstatus.Location = new System.Drawing.Point(276, 92); this.lb_fforbidstatus.Name = "lb_fforbidstatus"; this.lb_fforbidstatus.Size = new System.Drawing.Size(73, 21); this.lb_fforbidstatus.TabIndex = 252; @@ -111,7 +93,7 @@ // // txt_fforbidstatus // this.txt_fforbidstatus.Location = new System.Drawing.Point(595, 119); this.txt_fforbidstatus.Location = new System.Drawing.Point(351, 88); this.txt_fforbidstatus.Name = "txt_fforbidstatus"; this.txt_fforbidstatus.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_fforbidstatus.Properties.Appearance.Options.UseFont = true; @@ -132,106 +114,11 @@ this.gv_fforbidstatus.VisibleIndex = 8; this.gv_fforbidstatus.Width = 94; // // lb_remark5 // this.lb_remark5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_remark5.Appearance.Options.UseFont = true; this.lb_remark5.Location = new System.Drawing.Point(11, 165); this.lb_remark5.Name = "lb_remark5"; this.lb_remark5.Size = new System.Drawing.Size(66, 21); this.lb_remark5.TabIndex = 247; this.lb_remark5.Text = "remark5 "; // // txt_remark5 // this.txt_remark5.Location = new System.Drawing.Point(85, 161); this.txt_remark5.Name = "txt_remark5"; this.txt_remark5.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_remark5.Properties.Appearance.Options.UseFont = true; this.txt_remark5.Size = new System.Drawing.Size(150, 28); this.txt_remark5.TabIndex = 247; // // lb_remark4 // this.lb_remark4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_remark4.Appearance.Options.UseFont = true; this.lb_remark4.Location = new System.Drawing.Point(270, 123); this.lb_remark4.Name = "lb_remark4"; this.lb_remark4.Size = new System.Drawing.Size(66, 21); this.lb_remark4.TabIndex = 243; this.lb_remark4.Text = "remark4 "; // // txt_remark4 // this.txt_remark4.Location = new System.Drawing.Point(346, 119); this.txt_remark4.Name = "txt_remark4"; this.txt_remark4.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_remark4.Properties.Appearance.Options.UseFont = true; this.txt_remark4.Size = new System.Drawing.Size(150, 28); this.txt_remark4.TabIndex = 243; // // lb_remark3 // this.lb_remark3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_remark3.Appearance.Options.UseFont = true; this.lb_remark3.Location = new System.Drawing.Point(11, 123); this.lb_remark3.Name = "lb_remark3"; this.lb_remark3.Size = new System.Drawing.Size(66, 21); this.lb_remark3.TabIndex = 240; this.lb_remark3.Text = "remark3 "; // // txt_remark3 // this.txt_remark3.Location = new System.Drawing.Point(85, 119); this.txt_remark3.Name = "txt_remark3"; this.txt_remark3.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_remark3.Properties.Appearance.Options.UseFont = true; this.txt_remark3.Size = new System.Drawing.Size(150, 28); this.txt_remark3.TabIndex = 240; // // lb_remark2 // this.lb_remark2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_remark2.Appearance.Options.UseFont = true; this.lb_remark2.Location = new System.Drawing.Point(270, 86); this.lb_remark2.Name = "lb_remark2"; this.lb_remark2.Size = new System.Drawing.Size(66, 21); this.lb_remark2.TabIndex = 235; this.lb_remark2.Text = "remark2 "; // // txt_remark2 // this.txt_remark2.Location = new System.Drawing.Point(346, 82); this.txt_remark2.Name = "txt_remark2"; this.txt_remark2.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_remark2.Properties.Appearance.Options.UseFont = true; this.txt_remark2.Size = new System.Drawing.Size(150, 28); this.txt_remark2.TabIndex = 235; // // lb_remark1 // this.lb_remark1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_remark1.Appearance.Options.UseFont = true; this.lb_remark1.Location = new System.Drawing.Point(11, 86); this.lb_remark1.Name = "lb_remark1"; this.lb_remark1.Size = new System.Drawing.Size(66, 21); this.lb_remark1.TabIndex = 231; this.lb_remark1.Text = "remark1 "; // // txt_remark1 // this.txt_remark1.Location = new System.Drawing.Point(85, 82); this.txt_remark1.Name = "txt_remark1"; this.txt_remark1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_remark1.Properties.Appearance.Options.UseFont = true; this.txt_remark1.Size = new System.Drawing.Size(150, 28); this.txt_remark1.TabIndex = 231; // // lb_disabledDate // this.lb_disabledDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_disabledDate.Appearance.Options.UseFont = true; this.lb_disabledDate.Location = new System.Drawing.Point(520, 86); this.lb_disabledDate.Location = new System.Drawing.Point(276, 54); this.lb_disabledDate.Name = "lb_disabledDate"; this.lb_disabledDate.Size = new System.Drawing.Size(73, 21); this.lb_disabledDate.TabIndex = 228; @@ -239,7 +126,7 @@ // // txt_disabledDate // this.txt_disabledDate.Location = new System.Drawing.Point(595, 82); this.txt_disabledDate.Location = new System.Drawing.Point(351, 50); this.txt_disabledDate.Name = "txt_disabledDate"; this.txt_disabledDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_disabledDate.Properties.Appearance.Options.UseFont = true; @@ -264,7 +151,7 @@ // this.lb_disabledBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_disabledBy.Appearance.Options.UseFont = true; this.lb_disabledBy.Location = new System.Drawing.Point(520, 165); this.lb_disabledBy.Location = new System.Drawing.Point(276, 129); this.lb_disabledBy.Name = "lb_disabledBy"; this.lb_disabledBy.Size = new System.Drawing.Size(56, 21); this.lb_disabledBy.TabIndex = 226; @@ -272,7 +159,7 @@ // // txt_disabledBy // this.txt_disabledBy.Location = new System.Drawing.Point(595, 161); this.txt_disabledBy.Location = new System.Drawing.Point(351, 125); this.txt_disabledBy.Name = "txt_disabledBy"; this.txt_disabledBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_disabledBy.Properties.Appearance.Options.UseFont = true; @@ -297,7 +184,7 @@ // this.lb_creationDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_creationDate.Appearance.Options.UseFont = true; this.lb_creationDate.Location = new System.Drawing.Point(520, 52); this.lb_creationDate.Location = new System.Drawing.Point(276, 14); this.lb_creationDate.Name = "lb_creationDate"; this.lb_creationDate.Size = new System.Drawing.Size(73, 21); this.lb_creationDate.TabIndex = 222; @@ -305,7 +192,7 @@ // // txt_creationDate // this.txt_creationDate.Location = new System.Drawing.Point(595, 48); this.txt_creationDate.Location = new System.Drawing.Point(351, 10); this.txt_creationDate.Name = "txt_creationDate"; this.txt_creationDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_creationDate.Properties.Appearance.Options.UseFont = true; @@ -330,7 +217,7 @@ // this.lb_department.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_department.Appearance.Options.UseFont = true; this.lb_department.Location = new System.Drawing.Point(270, 52); this.lb_department.Location = new System.Drawing.Point(4, 129); this.lb_department.Name = "lb_department"; this.lb_department.Size = new System.Drawing.Size(73, 21); this.lb_department.TabIndex = 219; @@ -338,7 +225,7 @@ // // txt_department // this.txt_department.Location = new System.Drawing.Point(346, 48); this.txt_department.Location = new System.Drawing.Point(86, 125); this.txt_department.Name = "txt_department"; this.txt_department.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_department.Properties.Appearance.Options.UseFont = true; @@ -363,7 +250,7 @@ // this.lb_positionDescription.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_positionDescription.Appearance.Options.UseFont = true; this.lb_positionDescription.Location = new System.Drawing.Point(4, 52); this.lb_positionDescription.Location = new System.Drawing.Point(4, 92); this.lb_positionDescription.Name = "lb_positionDescription"; this.lb_positionDescription.Size = new System.Drawing.Size(73, 21); this.lb_positionDescription.TabIndex = 217; @@ -371,7 +258,7 @@ // // txt_positionDescription // this.txt_positionDescription.Location = new System.Drawing.Point(85, 48); this.txt_positionDescription.Location = new System.Drawing.Point(86, 88); this.txt_positionDescription.Name = "txt_positionDescription"; this.txt_positionDescription.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_positionDescription.Properties.Appearance.Options.UseFont = true; @@ -396,7 +283,7 @@ // this.lb_positionName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_positionName.Appearance.Options.UseFont = true; this.lb_positionName.Location = new System.Drawing.Point(520, 14); this.lb_positionName.Location = new System.Drawing.Point(4, 54); this.lb_positionName.Name = "lb_positionName"; this.lb_positionName.Size = new System.Drawing.Size(73, 21); this.lb_positionName.TabIndex = 216; @@ -404,7 +291,7 @@ // // txt_positionName // this.txt_positionName.Location = new System.Drawing.Point(595, 10); this.txt_positionName.Location = new System.Drawing.Point(86, 50); this.txt_positionName.Name = "txt_positionName"; this.txt_positionName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_positionName.Properties.Appearance.Options.UseFont = true; @@ -429,7 +316,7 @@ // this.lb_positionId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_positionId.Appearance.Options.UseFont = true; this.lb_positionId.Location = new System.Drawing.Point(270, 14); this.lb_positionId.Location = new System.Drawing.Point(4, 14); this.lb_positionId.Name = "lb_positionId"; this.lb_positionId.Size = new System.Drawing.Size(73, 21); this.lb_positionId.TabIndex = 213; @@ -437,7 +324,7 @@ // // txt_positionId // this.txt_positionId.Location = new System.Drawing.Point(346, 10); this.txt_positionId.Location = new System.Drawing.Point(86, 10); this.txt_positionId.Name = "txt_positionId"; this.txt_positionId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_positionId.Properties.Appearance.Options.UseFont = true; @@ -457,25 +344,6 @@ this.gv_positionId.Visible = true; this.gv_positionId.VisibleIndex = 1; this.gv_positionId.Width = 94; // // lb_id // this.lb_id.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_id.Appearance.Options.UseFont = true; this.lb_id.Location = new System.Drawing.Point(59, 14); this.lb_id.Name = "lb_id"; this.lb_id.Size = new System.Drawing.Size(18, 21); this.lb_id.TabIndex = 211; this.lb_id.Text = "id "; // // txt_id // this.txt_id.Location = new System.Drawing.Point(85, 10); this.txt_id.Name = "txt_id"; this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_id.Properties.Appearance.Options.UseFont = true; this.txt_id.Size = new System.Drawing.Size(150, 28); this.txt_id.TabIndex = 211; // // gv_id // @@ -499,11 +367,11 @@ this.toolBarMenu1.isSetBtn = false; this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); this.toolBarMenu1.Name = "toolBarMenu1"; this.toolBarMenu1.rptParameter = null; this.toolBarMenu1.Size = new System.Drawing.Size(914, 80); this.toolBarMenu1.TabIndex = 0; this.toolBarMenu1.xlsInService = null; this.toolBarMenu1.xlsOutParameter = "xlsOut_position{}"; // // gcMain // @@ -512,7 +380,7 @@ this.gcMain.Location = new System.Drawing.Point(0, 0); this.gcMain.MainView = this.gridView1; this.gcMain.Name = "gcMain"; this.gcMain.Size = new System.Drawing.Size(1126, 531); this.gcMain.Size = new System.Drawing.Size(912, 318); this.gcMain.TabIndex = 1; this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -555,19 +423,19 @@ this.xtraTabPage1.Controls.Add(this.gcMain); this.xtraTabPage1.Controls.Add(this.pageBar1); this.xtraTabPage1.Name = "xtraTabPage1"; this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570); this.xtraTabPage1.Size = new System.Drawing.Size(912, 357); this.xtraTabPage1.Text = "数据查询"; // // pageBar1 // this.pageBar1.CurrentPage = 1; this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom; this.pageBar1.Location = new System.Drawing.Point(0, 531); this.pageBar1.Location = new System.Drawing.Point(0, 318); this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5); this.pageBar1.Name = "pageBar1"; this.pageBar1.RecordCount = 0; this.pageBar1.RowsCount = 50; this.pageBar1.Size = new System.Drawing.Size(1126, 39); this.pageBar1.Size = new System.Drawing.Size(912, 39); this.pageBar1.TabIndex = 3; this.pageBar1.TotalPages = 0; // @@ -586,16 +454,6 @@ this.panel1.Controls.Add(this.lbGuid); this.panel1.Controls.Add(this.lb_fforbidstatus); this.panel1.Controls.Add(this.txt_fforbidstatus); this.panel1.Controls.Add(this.lb_remark5); this.panel1.Controls.Add(this.txt_remark5); this.panel1.Controls.Add(this.lb_remark4); this.panel1.Controls.Add(this.txt_remark4); this.panel1.Controls.Add(this.lb_remark3); this.panel1.Controls.Add(this.txt_remark3); this.panel1.Controls.Add(this.lb_remark2); this.panel1.Controls.Add(this.txt_remark2); this.panel1.Controls.Add(this.lb_remark1); this.panel1.Controls.Add(this.txt_remark1); this.panel1.Controls.Add(this.lb_disabledDate); this.panel1.Controls.Add(this.txt_disabledDate); this.panel1.Controls.Add(this.lb_disabledBy); @@ -610,30 +468,30 @@ this.panel1.Controls.Add(this.txt_positionName); this.panel1.Controls.Add(this.lb_positionId); this.panel1.Controls.Add(this.txt_positionId); this.panel1.Controls.Add(this.lb_id); this.panel1.Controls.Add(this.txt_id); this.panel1.Font = new System.Drawing.Font("Tahoma", 10F); this.panel1.Location = new System.Drawing.Point(76, 20); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(791, 305); this.panel1.Size = new System.Drawing.Size(566, 215); this.panel1.TabIndex = 1; // // labelControl11 // this.labelControl11.Location = new System.Drawing.Point(32, 231); this.labelControl11.Location = new System.Drawing.Point(45, 181); this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.labelControl11.Name = "labelControl11"; this.labelControl11.Size = new System.Drawing.Size(45, 18); this.labelControl11.TabIndex = 130; this.labelControl11.Text = "主键："; this.labelControl11.Visible = false; // // lbGuid // this.lbGuid.AutoSize = true; this.lbGuid.Location = new System.Drawing.Point(83, 231); this.lbGuid.Location = new System.Drawing.Point(96, 181); this.lbGuid.Name = "lbGuid"; this.lbGuid.Size = new System.Drawing.Size(0, 21); this.lbGuid.TabIndex = 1; this.lbGuid.Visible = false; // // Frm_MesPosition // @@ -644,11 +502,6 @@ this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_MesPosition"; ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark5.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark4.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark3.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark2.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark1.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_disabledDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_disabledBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_creationDate.Properties)).EndInit(); @@ -656,7 +509,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_positionDescription.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_positionName.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_positionId.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit(); @@ -683,21 +535,6 @@ private DevExpress.XtraEditors.LabelControl lb_fforbidstatus; private DevExpress.XtraEditors.TextEdit txt_fforbidstatus; private DevExpress.XtraGrid.Columns.GridColumn gv_fforbidstatus; private DevExpress.XtraEditors.LabelControl lb_remark5; private DevExpress.XtraEditors.TextEdit txt_remark5; private DevExpress.XtraEditors.LabelControl lb_remark4; private DevExpress.XtraEditors.TextEdit txt_remark4; private DevExpress.XtraEditors.LabelControl lb_remark3; private DevExpress.XtraEditors.TextEdit txt_remark3; private DevExpress.XtraEditors.LabelControl lb_remark2; private DevExpress.XtraEditors.TextEdit txt_remark2; private DevExpress.XtraEditors.LabelControl lb_remark1; private DevExpress.XtraEditors.TextEdit txt_remark1; private DevExpress.XtraEditors.LabelControl lb_disabledDate; private DevExpress.XtraEditors.TextEdit txt_disabledDate; @@ -726,9 +563,6 @@ private DevExpress.XtraEditors.LabelControl lb_positionId; private DevExpress.XtraEditors.TextEdit txt_positionId; private DevExpress.XtraGrid.Columns.GridColumn gv_positionId; private DevExpress.XtraEditors.LabelControl lb_id; private DevExpress.XtraEditors.TextEdit txt_id; private DevExpress.XtraGrid.Columns.GridColumn gv_id; } DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.resx
@@ -59,8 +59,7 @@ : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns=""> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> @@ -68,11 +67,9 @@ <xsd:element name="metadata"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0"/> <xsd:element name="value" type="xsd:string" minOccurs="0" /> </xsd:sequence> <xsd:attribute name="name" use="required" type="xsd:string"/> <xsd:attribute name="name" use="required" type="xsd:string" /> <xsd:attribute name="type" type="xsd:string"/> <xsd:attribute name="mimetype" type="xsd:string"/> <xsd:attribute ref="xml:space"/> @@ -87,28 +84,21 @@ <xsd:element name="data"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> <xsd:attribute ref="xml:space"/> </xsd:complexType> </xsd:element> <xsd:element name="resheader"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="name" type="xsd:string" use="required" /> </xsd:complexType> </xsd:element> </xsd:choice> @@ -122,13 +112,9 @@ <value>2.0</value> </resheader> <resheader name="reader"> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 </value> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 </value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> </root> DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.Designer.cs
@@ -29,11 +29,11 @@ /// </summary> private void InitializeComponent() { DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject(); DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject(); this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1createDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -70,8 +70,6 @@ this.lb_name = new DevExpress.XtraEditors.LabelControl(); this.txt_name = new DevExpress.XtraEditors.TextEdit(); this.gv_name = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_factory = new DevExpress.XtraEditors.LabelControl(); this.txt_factory = new DevExpress.XtraEditors.TextEdit(); this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_workshopNo = new DevExpress.XtraEditors.LabelControl(); this.txt_workshopNo = new DevExpress.XtraEditors.TextEdit(); @@ -100,7 +98,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_workshopNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit(); @@ -260,10 +257,10 @@ // repositoryItemButtonEdit1 // this.repositoryItemButtonEdit1.AutoHeight = false; editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16; editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter; this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)}); this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1"; this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); @@ -305,7 +302,7 @@ // this.lb_checkBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_checkBy.Appearance.Options.UseFont = true; this.lb_checkBy.Location = new System.Drawing.Point(992, 53); this.lb_checkBy.Location = new System.Drawing.Point(750, 59); this.lb_checkBy.Name = "lb_checkBy"; this.lb_checkBy.Size = new System.Drawing.Size(51, 21); this.lb_checkBy.TabIndex = 240; @@ -313,7 +310,7 @@ // // txt_checkBy // this.txt_checkBy.Location = new System.Drawing.Point(1050, 49); this.txt_checkBy.Location = new System.Drawing.Point(819, 55); this.txt_checkBy.Name = "txt_checkBy"; this.txt_checkBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_checkBy.Properties.Appearance.Options.UseFont = true; @@ -428,7 +425,7 @@ // this.lb_createBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_createBy.Appearance.Options.UseFont = true; this.lb_createBy.Location = new System.Drawing.Point(268, 53); this.lb_createBy.Location = new System.Drawing.Point(517, 19); this.lb_createBy.Name = "lb_createBy"; this.lb_createBy.Size = new System.Drawing.Size(56, 21); this.lb_createBy.TabIndex = 219; @@ -436,7 +433,7 @@ // // txt_createBy // this.txt_createBy.Location = new System.Drawing.Point(330, 49); this.txt_createBy.Location = new System.Drawing.Point(579, 15); this.txt_createBy.Name = "txt_createBy"; this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_createBy.Properties.Appearance.Options.UseFont = true; @@ -461,7 +458,7 @@ // this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_remark.Appearance.Options.UseFont = true; this.lb_remark.Location = new System.Drawing.Point(767, 53); this.lb_remark.Location = new System.Drawing.Point(285, 56); this.lb_remark.Name = "lb_remark"; this.lb_remark.Size = new System.Drawing.Size(39, 21); this.lb_remark.TabIndex = 217; @@ -469,7 +466,7 @@ // // txt_remark // this.txt_remark.Location = new System.Drawing.Point(819, 49); this.txt_remark.Location = new System.Drawing.Point(330, 52); this.txt_remark.Name = "txt_remark"; this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_remark.Properties.Appearance.Options.UseFont = true; @@ -522,25 +519,6 @@ this.gv_name.Visible = true; this.gv_name.VisibleIndex = 2; this.gv_name.Width = 94; // // lb_factory // this.lb_factory.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_factory.Appearance.Options.UseFont = true; this.lb_factory.Location = new System.Drawing.Point(500, 20); this.lb_factory.Name = "lb_factory"; this.lb_factory.Size = new System.Drawing.Size(73, 21); this.lb_factory.TabIndex = 213; this.lb_factory.Text = "工厂编号 "; // // txt_factory // this.txt_factory.Location = new System.Drawing.Point(580, 16); this.txt_factory.Name = "txt_factory"; this.txt_factory.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_factory.Properties.Appearance.Options.UseFont = true; this.txt_factory.Size = new System.Drawing.Size(150, 28); this.txt_factory.TabIndex = 213; // // gv_factory // @@ -597,11 +575,11 @@ this.toolBarMenu1.isSetBtn = false; this.toolBarMenu1.Location = new System.Drawing.Point(0, 0); this.toolBarMenu1.Name = "toolBarMenu1"; this.toolBarMenu1.rptParameter = null; this.toolBarMenu1.Size = new System.Drawing.Size(1283, 80); this.toolBarMenu1.TabIndex = 0; this.toolBarMenu1.xlsInService = null; this.toolBarMenu1.xlsOutParameter = "xlsOut_workline{}"; // // gcMain // @@ -711,8 +689,6 @@ this.panel1.Controls.Add(this.txt_remark); this.panel1.Controls.Add(this.lb_name); this.panel1.Controls.Add(this.txt_name); this.panel1.Controls.Add(this.lb_factory); this.panel1.Controls.Add(this.txt_factory); this.panel1.Controls.Add(this.lb_workshopNo); this.panel1.Controls.Add(this.txt_workshopNo); this.panel1.Dock = System.Windows.Forms.DockStyle.Top; @@ -770,7 +746,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_name.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_workshopNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit(); @@ -836,9 +811,6 @@ private DevExpress.XtraEditors.LabelControl lb_name; private DevExpress.XtraEditors.TextEdit txt_name; private DevExpress.XtraGrid.Columns.GridColumn gv_name; private DevExpress.XtraEditors.LabelControl lb_factory; private DevExpress.XtraEditors.TextEdit txt_factory; private DevExpress.XtraGrid.Columns.GridColumn gv_factory; private DevExpress.XtraEditors.LabelControl lb_workshopNo; DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesWorkshop.resx
@@ -59,8 +59,7 @@ : using a System.ComponentModel.TypeConverter : and then encoded with base64 encoding. --> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root" xmlns=""> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> @@ -68,11 +67,9 @@ <xsd:element name="metadata"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0"/> <xsd:element name="value" type="xsd:string" minOccurs="0" /> </xsd:sequence> <xsd:attribute name="name" use="required" type="xsd:string"/> <xsd:attribute name="name" use="required" type="xsd:string" /> <xsd:attribute name="type" type="xsd:string"/> <xsd:attribute name="mimetype" type="xsd:string"/> <xsd:attribute ref="xml:space"/> @@ -87,28 +84,21 @@ <xsd:element name="data"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/> <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> <xsd:attribute ref="xml:space"/> </xsd:complexType> </xsd:element> <xsd:element name="resheader"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="name" type="xsd:string" use="required" /> </xsd:complexType> </xsd:element> </xsd:choice> @@ -122,13 +112,9 @@ <value>2.0</value> </resheader> <resheader name="reader"> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 </value> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 </value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> </root>
