| DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Customer.cs
@@ -84,8 +84,10 @@ /// <param name="e"></param> private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) { UtilityHelper.JumpToTab(xtraTabControl1, 0); getPageList(1, UtilityHelper.GetPageSize()); if (xtraTabControl1.SelectedTabPageIndex == 1) getModel(lbGuid.Text.Trim(), false, 999); else getPageList(1, UtilityHelper.GetPageSize()); } /// <summary> /// DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.Designer.cs
@@ -31,40 +31,17 @@ /// </summary> private void InitializeComponent() { 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_parentId = new DevExpress.XtraEditors.LabelControl(); this.txt_parentId = new DevExpress.XtraEditors.TextEdit(); this.gv_parentId = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_useOrg = new DevExpress.XtraEditors.LabelControl(); this.txt_useOrg = new DevExpress.XtraEditors.TextEdit(); this.gv_useOrg = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_createOrg = new DevExpress.XtraEditors.LabelControl(); this.txt_createOrg = new DevExpress.XtraEditors.TextEdit(); this.gv_createOrg = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_materialProperti = new DevExpress.XtraEditors.LabelControl(); this.txt_materialProperti = new DevExpress.XtraEditors.TextEdit(); this.gv_materialProperti = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_productionWorkshop = new DevExpress.XtraEditors.LabelControl(); this.txt_productionWorkshop = new DevExpress.XtraEditors.TextEdit(); this.gv_productionWorkshop = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_id = new DevExpress.XtraEditors.LabelControl(); this.txt_id = new DevExpress.XtraEditors.TextEdit(); this.lb_remark = new DevExpress.XtraEditors.LabelControl(); this.txt_remark = new DevExpress.XtraEditors.TextEdit(); this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_lastupdateDate = new DevExpress.XtraEditors.LabelControl(); this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit(); this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl(); this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit(); this.lb_createDate = new DevExpress.XtraEditors.LabelControl(); this.txt_createDate = new DevExpress.XtraEditors.TextEdit(); this.lb_createBy = new DevExpress.XtraEditors.LabelControl(); this.txt_createBy = new DevExpress.XtraEditors.TextEdit(); this.lb_factory = new DevExpress.XtraEditors.LabelControl(); this.txt_factory = new DevExpress.XtraEditors.TextEdit(); this.gv_factory = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_fmanager = new DevExpress.XtraEditors.LabelControl(); this.txt_fmanager = new DevExpress.XtraEditors.TextEdit(); @@ -75,8 +52,6 @@ this.lb_workshopNo = new DevExpress.XtraEditors.LabelControl(); this.txt_workshopNo = new DevExpress.XtraEditors.TextEdit(); this.gv_workshopNo = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_depextr5 = new DevExpress.XtraEditors.LabelControl(); this.txt_depextr5 = new DevExpress.XtraEditors.TextEdit(); this.lb_depextr4 = new DevExpress.XtraEditors.LabelControl(); this.txt_depextr4 = new DevExpress.XtraEditors.TextEdit(); this.gv_depextr4 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -110,24 +85,13 @@ this.panel1 = new System.Windows.Forms.Panel(); this.labelControl11 = new DevExpress.XtraEditors.LabelControl(); this.lbGuid = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark5.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark4.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_parentId.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_useOrg.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createOrg.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fmanager.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_workshopName.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_workshopNo.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depextr5.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depextr4.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depextr3.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depextr2.Properties)).BeginInit(); @@ -145,49 +109,11 @@ this.panel1.SuspendLayout(); this.SuspendLayout(); // // 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(513, 250); this.lb_remark5.Name = "lb_remark5"; this.lb_remark5.Size = new System.Drawing.Size(99, 21); this.lb_remark5.TabIndex = 327; this.lb_remark5.Text = "自定义字段5 "; // // txt_remark5 // this.txt_remark5.Location = new System.Drawing.Point(618, 246); 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 = 327; // // 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(261, 250); this.lb_remark4.Name = "lb_remark4"; this.lb_remark4.Size = new System.Drawing.Size(82, 21); this.lb_remark4.TabIndex = 319; this.lb_remark4.Text = "扩展字段4 "; // // txt_remark4 // this.txt_remark4.Location = new System.Drawing.Point(349, 246); 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 = 319; // // lb_parentId // this.lb_parentId.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_parentId.Appearance.Options.UseFont = true; this.lb_parentId.Location = new System.Drawing.Point(28, 216); this.lb_parentId.Location = new System.Drawing.Point(28, 184); this.lb_parentId.Name = "lb_parentId"; this.lb_parentId.Size = new System.Drawing.Size(73, 21); this.lb_parentId.TabIndex = 312; @@ -195,7 +121,7 @@ // // txt_parentId // this.txt_parentId.Location = new System.Drawing.Point(106, 212); this.txt_parentId.Location = new System.Drawing.Point(106, 180); this.txt_parentId.Name = "txt_parentId"; this.txt_parentId.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_parentId.Properties.Appearance.Options.UseFont = true; @@ -206,87 +132,21 @@ // this.gv_parentId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_parentId.AppearanceCell.Options.UseFont = true; this.gv_parentId.Caption = "上级部门 "; this.gv_parentId.FieldName = "parentId"; this.gv_parentId.MinWidth = 50; this.gv_parentId.Caption = "上级部门"; this.gv_parentId.FieldName = "fParentID"; this.gv_parentId.MinWidth = 150; this.gv_parentId.Name = "gv_parentId"; this.gv_parentId.OptionsColumn.AllowEdit = false; this.gv_parentId.Tag = "query_a.parent_id"; this.gv_parentId.Visible = true; this.gv_parentId.VisibleIndex = 16; this.gv_parentId.Width = 94; // // lb_useOrg // this.lb_useOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_useOrg.Appearance.Options.UseFont = true; this.lb_useOrg.Location = new System.Drawing.Point(270, 84); this.lb_useOrg.Name = "lb_useOrg"; this.lb_useOrg.Size = new System.Drawing.Size(73, 21); this.lb_useOrg.TabIndex = 306; this.lb_useOrg.Text = "使用组织 "; // // txt_useOrg // this.txt_useOrg.Location = new System.Drawing.Point(349, 84); this.txt_useOrg.Name = "txt_useOrg"; this.txt_useOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_useOrg.Properties.Appearance.Options.UseFont = true; this.txt_useOrg.Size = new System.Drawing.Size(150, 28); this.txt_useOrg.TabIndex = 306; // // gv_useOrg // this.gv_useOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_useOrg.AppearanceCell.Options.UseFont = true; this.gv_useOrg.Caption = "使用组织 "; this.gv_useOrg.FieldName = "useOrg"; this.gv_useOrg.MinWidth = 50; this.gv_useOrg.Name = "gv_useOrg"; this.gv_useOrg.OptionsColumn.AllowEdit = false; this.gv_useOrg.Tag = "query_a.use_org"; this.gv_useOrg.Visible = true; this.gv_useOrg.VisibleIndex = 15; this.gv_useOrg.Width = 94; // // lb_createOrg // this.lb_createOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_createOrg.Appearance.Options.UseFont = true; this.lb_createOrg.Location = new System.Drawing.Point(539, 180); this.lb_createOrg.Name = "lb_createOrg"; this.lb_createOrg.Size = new System.Drawing.Size(73, 21); this.lb_createOrg.TabIndex = 298; this.lb_createOrg.Text = "创建组织 "; // // txt_createOrg // this.txt_createOrg.Location = new System.Drawing.Point(618, 180); this.txt_createOrg.Name = "txt_createOrg"; this.txt_createOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_createOrg.Properties.Appearance.Options.UseFont = true; this.txt_createOrg.Size = new System.Drawing.Size(150, 28); this.txt_createOrg.TabIndex = 298; // // gv_createOrg // this.gv_createOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_createOrg.AppearanceCell.Options.UseFont = true; this.gv_createOrg.Caption = "创建组织 "; this.gv_createOrg.FieldName = "createOrg"; this.gv_createOrg.MinWidth = 50; this.gv_createOrg.Name = "gv_createOrg"; this.gv_createOrg.OptionsColumn.AllowEdit = false; this.gv_createOrg.Tag = "query_a.create_org"; this.gv_createOrg.Visible = true; this.gv_createOrg.VisibleIndex = 14; this.gv_createOrg.Width = 94; this.gv_parentId.VisibleIndex = 13; this.gv_parentId.Width = 150; // // lb_materialProperti // this.lb_materialProperti.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_materialProperti.Appearance.Options.UseFont = true; this.lb_materialProperti.Location = new System.Drawing.Point(270, 180); this.lb_materialProperti.Location = new System.Drawing.Point(270, 91); this.lb_materialProperti.Name = "lb_materialProperti"; this.lb_materialProperti.Size = new System.Drawing.Size(73, 21); this.lb_materialProperti.TabIndex = 291; @@ -294,32 +154,18 @@ // // txt_materialProperti // this.txt_materialProperti.Location = new System.Drawing.Point(349, 180); this.txt_materialProperti.Location = new System.Drawing.Point(349, 91); this.txt_materialProperti.Name = "txt_materialProperti"; this.txt_materialProperti.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_materialProperti.Properties.Appearance.Options.UseFont = true; this.txt_materialProperti.Size = new System.Drawing.Size(150, 28); this.txt_materialProperti.TabIndex = 291; // // gv_materialProperti // this.gv_materialProperti.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_materialProperti.AppearanceCell.Options.UseFont = true; this.gv_materialProperti.Caption = "物料属性 "; this.gv_materialProperti.FieldName = "materialProperti"; this.gv_materialProperti.MinWidth = 50; this.gv_materialProperti.Name = "gv_materialProperti"; this.gv_materialProperti.OptionsColumn.AllowEdit = false; this.gv_materialProperti.Tag = "query_a.material_properti"; this.gv_materialProperti.Visible = true; this.gv_materialProperti.VisibleIndex = 13; this.gv_materialProperti.Width = 94; // // lb_productionWorkshop // this.lb_productionWorkshop.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_productionWorkshop.Appearance.Options.UseFont = true; this.lb_productionWorkshop.Location = new System.Drawing.Point(28, 180); this.lb_productionWorkshop.Location = new System.Drawing.Point(28, 154); this.lb_productionWorkshop.Name = "lb_productionWorkshop"; this.lb_productionWorkshop.Size = new System.Drawing.Size(73, 21); this.lb_productionWorkshop.TabIndex = 285; @@ -327,7 +173,7 @@ // // txt_productionWorkshop // this.txt_productionWorkshop.Location = new System.Drawing.Point(106, 180); this.txt_productionWorkshop.Location = new System.Drawing.Point(106, 150); this.txt_productionWorkshop.Name = "txt_productionWorkshop"; this.txt_productionWorkshop.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_productionWorkshop.Properties.Appearance.Options.UseFont = true; @@ -338,7 +184,7 @@ // this.gv_productionWorkshop.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_productionWorkshop.AppearanceCell.Options.UseFont = true; this.gv_productionWorkshop.Caption = "生产车间 "; this.gv_productionWorkshop.Caption = "生产车间"; this.gv_productionWorkshop.FieldName = "productionWorkshop"; this.gv_productionWorkshop.MinWidth = 50; this.gv_productionWorkshop.Name = "gv_productionWorkshop"; @@ -348,30 +194,11 @@ this.gv_productionWorkshop.VisibleIndex = 12; this.gv_productionWorkshop.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(83, 288); this.lb_id.Name = "lb_id"; this.lb_id.Size = new System.Drawing.Size(18, 21); this.lb_id.TabIndex = 280; this.lb_id.Text = "id "; // // txt_id // this.txt_id.Location = new System.Drawing.Point(106, 284); 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 = 280; // // lb_remark // 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(573, 148); this.lb_remark.Location = new System.Drawing.Point(573, 119); this.lb_remark.Name = "lb_remark"; this.lb_remark.Size = new System.Drawing.Size(39, 21); this.lb_remark.TabIndex = 273; @@ -379,7 +206,7 @@ // // txt_remark // this.txt_remark.Location = new System.Drawing.Point(618, 148); this.txt_remark.Location = new System.Drawing.Point(618, 115); 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; @@ -390,7 +217,7 @@ // this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_remark.AppearanceCell.Options.UseFont = true; this.gv_remark.Caption = "备注 "; this.gv_remark.Caption = "备注"; this.gv_remark.FieldName = "remark"; this.gv_remark.MinWidth = 50; this.gv_remark.Name = "gv_remark"; @@ -400,120 +227,25 @@ this.gv_remark.VisibleIndex = 11; this.gv_remark.Width = 94; // // lb_lastupdateDate // this.lb_lastupdateDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_lastupdateDate.Appearance.Options.UseFont = true; this.lb_lastupdateDate.Location = new System.Drawing.Point(270, 148); this.lb_lastupdateDate.Name = "lb_lastupdateDate"; this.lb_lastupdateDate.Size = new System.Drawing.Size(73, 21); this.lb_lastupdateDate.TabIndex = 267; this.lb_lastupdateDate.Text = "修改日期 "; // // txt_lastupdateDate // this.txt_lastupdateDate.Location = new System.Drawing.Point(349, 148); this.txt_lastupdateDate.Name = "txt_lastupdateDate"; this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true; this.txt_lastupdateDate.Size = new System.Drawing.Size(150, 28); this.txt_lastupdateDate.TabIndex = 267; // // lb_lastupdateBy // this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_lastupdateBy.Appearance.Options.UseFont = true; this.lb_lastupdateBy.Location = new System.Drawing.Point(11, 148); this.lb_lastupdateBy.Name = "lb_lastupdateBy"; this.lb_lastupdateBy.Size = new System.Drawing.Size(90, 21); this.lb_lastupdateBy.TabIndex = 262; this.lb_lastupdateBy.Text = "最后修改人 "; // // txt_lastupdateBy // this.txt_lastupdateBy.Location = new System.Drawing.Point(106, 148); this.txt_lastupdateBy.Name = "txt_lastupdateBy"; this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true; this.txt_lastupdateBy.Size = new System.Drawing.Size(150, 28); this.txt_lastupdateBy.TabIndex = 262; // // lb_createDate // this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_createDate.Appearance.Options.UseFont = true; this.lb_createDate.Location = new System.Drawing.Point(539, 216); this.lb_createDate.Name = "lb_createDate"; this.lb_createDate.Size = new System.Drawing.Size(73, 21); this.lb_createDate.TabIndex = 258; this.lb_createDate.Text = "创建日期 "; // // txt_createDate // this.txt_createDate.Location = new System.Drawing.Point(618, 212); this.txt_createDate.Name = "txt_createDate"; this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_createDate.Properties.Appearance.Options.UseFont = true; this.txt_createDate.Size = new System.Drawing.Size(150, 28); this.txt_createDate.TabIndex = 258; // // lb_createBy // 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(556, 116); this.lb_createBy.Name = "lb_createBy"; this.lb_createBy.Size = new System.Drawing.Size(56, 21); this.lb_createBy.TabIndex = 252; this.lb_createBy.Text = "创建人 "; // // txt_createBy // this.txt_createBy.Location = new System.Drawing.Point(618, 116); 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; this.txt_createBy.Size = new System.Drawing.Size(150, 28); this.txt_createBy.TabIndex = 252; // // 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(304, 116); this.lb_factory.Name = "lb_factory"; this.lb_factory.Size = new System.Drawing.Size(39, 21); this.lb_factory.TabIndex = 247; this.lb_factory.Text = "工厂 "; // // txt_factory // this.txt_factory.Location = new System.Drawing.Point(349, 116); 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 = 247; // // gv_factory // this.gv_factory.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_factory.AppearanceCell.Options.UseFont = true; this.gv_factory.Caption = "工厂 "; this.gv_factory.FieldName = "factory"; this.gv_factory.MinWidth = 50; this.gv_factory.Caption = "使用组织"; this.gv_factory.FieldName = "fSubsidiary"; this.gv_factory.MinWidth = 250; 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 = 0; this.gv_factory.Width = 94; this.gv_factory.Width = 250; // // lb_fmanager // this.lb_fmanager.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_fmanager.Appearance.Options.UseFont = true; this.lb_fmanager.Location = new System.Drawing.Point(28, 116); this.lb_fmanager.Location = new System.Drawing.Point(28, 119); this.lb_fmanager.Name = "lb_fmanager"; this.lb_fmanager.Size = new System.Drawing.Size(73, 21); this.lb_fmanager.TabIndex = 243; @@ -521,7 +253,7 @@ // // txt_fmanager // this.txt_fmanager.Location = new System.Drawing.Point(106, 116); this.txt_fmanager.Location = new System.Drawing.Point(106, 115); this.txt_fmanager.Name = "txt_fmanager"; this.txt_fmanager.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_fmanager.Properties.Appearance.Options.UseFont = true; @@ -532,7 +264,7 @@ // this.gv_fmanager.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_fmanager.AppearanceCell.Options.UseFont = true; this.gv_fmanager.Caption = "部门经理 "; this.gv_fmanager.Caption = "部门经理"; this.gv_fmanager.FieldName = "fmanager"; this.gv_fmanager.MinWidth = 50; this.gv_fmanager.Name = "gv_fmanager"; @@ -546,7 +278,7 @@ // this.lb_workshopName.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_workshopName.Appearance.Options.UseFont = true; this.lb_workshopName.Location = new System.Drawing.Point(287, 216); this.lb_workshopName.Location = new System.Drawing.Point(287, 119); this.lb_workshopName.Name = "lb_workshopName"; this.lb_workshopName.Size = new System.Drawing.Size(56, 21); this.lb_workshopName.TabIndex = 240; @@ -554,7 +286,7 @@ // // txt_workshopName // this.txt_workshopName.Location = new System.Drawing.Point(349, 212); this.txt_workshopName.Location = new System.Drawing.Point(349, 115); this.txt_workshopName.Name = "txt_workshopName"; this.txt_workshopName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_workshopName.Properties.Appearance.Options.UseFont = true; @@ -565,15 +297,15 @@ // this.gv_workshopName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_workshopName.AppearanceCell.Options.UseFont = true; this.gv_workshopName.Caption = "车间名 "; this.gv_workshopName.Caption = "车间名"; this.gv_workshopName.FieldName = "workshopName"; this.gv_workshopName.MinWidth = 50; this.gv_workshopName.MinWidth = 150; this.gv_workshopName.Name = "gv_workshopName"; this.gv_workshopName.OptionsColumn.AllowEdit = false; this.gv_workshopName.Tag = "query_a.workshop_name"; this.gv_workshopName.Visible = true; this.gv_workshopName.VisibleIndex = 9; this.gv_workshopName.Width = 94; this.gv_workshopName.Width = 150; // // lb_workshopNo // @@ -598,7 +330,7 @@ // this.gv_workshopNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_workshopNo.AppearanceCell.Options.UseFont = true; this.gv_workshopNo.Caption = "车间ID "; this.gv_workshopNo.Caption = "车间ID"; this.gv_workshopNo.FieldName = "workshopNo"; this.gv_workshopNo.MinWidth = 50; this.gv_workshopNo.Name = "gv_workshopNo"; @@ -607,25 +339,6 @@ this.gv_workshopNo.Visible = true; this.gv_workshopNo.VisibleIndex = 8; this.gv_workshopNo.Width = 94; // // lb_depextr5 // this.lb_depextr5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_depextr5.Appearance.Options.UseFont = true; this.lb_depextr5.Location = new System.Drawing.Point(261, 288); this.lb_depextr5.Name = "lb_depextr5"; this.lb_depextr5.Size = new System.Drawing.Size(82, 21); this.lb_depextr5.TabIndex = 231; this.lb_depextr5.Text = "扩展字段5 "; // // txt_depextr5 // this.txt_depextr5.Location = new System.Drawing.Point(349, 284); this.txt_depextr5.Name = "txt_depextr5"; this.txt_depextr5.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_depextr5.Properties.Appearance.Options.UseFont = true; this.txt_depextr5.Size = new System.Drawing.Size(150, 28); this.txt_depextr5.TabIndex = 231; // // lb_depextr4 // @@ -650,7 +363,7 @@ // this.gv_depextr4.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_depextr4.AppearanceCell.Options.UseFont = true; this.gv_depextr4.Caption = "A启用B禁用 "; this.gv_depextr4.Caption = "A启用B禁用"; this.gv_depextr4.FieldName = "depextr4"; this.gv_depextr4.MinWidth = 50; this.gv_depextr4.Name = "gv_depextr4"; @@ -664,7 +377,7 @@ // this.lb_depextr3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_depextr3.Appearance.Options.UseFont = true; this.lb_depextr3.Location = new System.Drawing.Point(32, 250); this.lb_depextr3.Location = new System.Drawing.Point(274, 154); this.lb_depextr3.Name = "lb_depextr3"; this.lb_depextr3.Size = new System.Drawing.Size(69, 21); this.lb_depextr3.TabIndex = 226; @@ -672,7 +385,7 @@ // // txt_depextr3 // this.txt_depextr3.Location = new System.Drawing.Point(106, 246); this.txt_depextr3.Location = new System.Drawing.Point(348, 150); this.txt_depextr3.Name = "txt_depextr3"; this.txt_depextr3.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_depextr3.Properties.Appearance.Options.UseFont = true; @@ -683,7 +396,7 @@ // this.gv_depextr3.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_depextr3.AppearanceCell.Options.UseFont = true; this.gv_depextr3.Caption = "WIP仓库 "; this.gv_depextr3.Caption = "WIP仓库"; this.gv_depextr3.FieldName = "depextr3"; this.gv_depextr3.MinWidth = 50; this.gv_depextr3.Name = "gv_depextr3"; @@ -716,15 +429,15 @@ // this.gv_depextr2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_depextr2.AppearanceCell.Options.UseFont = true; this.gv_depextr2.Caption = "部门分组 "; this.gv_depextr2.Caption = "部门分组"; this.gv_depextr2.FieldName = "depextr2"; this.gv_depextr2.MinWidth = 50; this.gv_depextr2.MinWidth = 100; this.gv_depextr2.Name = "gv_depextr2"; this.gv_depextr2.OptionsColumn.AllowEdit = false; this.gv_depextr2.Tag = "query_a.depextr2"; this.gv_depextr2.Visible = true; this.gv_depextr2.VisibleIndex = 5; this.gv_depextr2.Width = 94; this.gv_depextr2.Width = 100; // // lb_depextr1 // @@ -749,15 +462,15 @@ // this.gv_depextr1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_depextr1.AppearanceCell.Options.UseFont = true; this.gv_depextr1.Caption = "部门属性 "; this.gv_depextr1.Caption = "部门属性"; this.gv_depextr1.FieldName = "depextr1"; this.gv_depextr1.MinWidth = 50; this.gv_depextr1.MinWidth = 100; this.gv_depextr1.Name = "gv_depextr1"; this.gv_depextr1.OptionsColumn.AllowEdit = false; this.gv_depextr1.Tag = "query_a.depextr1"; this.gv_depextr1.Visible = true; this.gv_depextr1.VisibleIndex = 4; this.gv_depextr1.Width = 94; this.gv_depextr1.Width = 100; // // lb_departmentname // @@ -782,15 +495,15 @@ // this.gv_departmentname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_departmentname.AppearanceCell.Options.UseFont = true; this.gv_departmentname.Caption = "部门名称 "; this.gv_departmentname.Caption = "部门名称"; this.gv_departmentname.FieldName = "departmentname"; this.gv_departmentname.MinWidth = 50; this.gv_departmentname.MinWidth = 150; this.gv_departmentname.Name = "gv_departmentname"; this.gv_departmentname.OptionsColumn.AllowEdit = false; this.gv_departmentname.Tag = "query_a.departmentname"; this.gv_departmentname.Visible = true; this.gv_departmentname.VisibleIndex = 3; this.gv_departmentname.Width = 94; this.gv_departmentname.Width = 150; // // lb_departmentcode // @@ -815,9 +528,9 @@ // this.gv_departmentcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_departmentcode.AppearanceCell.Options.UseFont = true; this.gv_departmentcode.Caption = "部门编号 "; this.gv_departmentcode.Caption = "部门编号"; this.gv_departmentcode.FieldName = "departmentcode"; this.gv_departmentcode.MinWidth = 50; this.gv_departmentcode.MinWidth = 80; this.gv_departmentcode.Name = "gv_departmentcode"; this.gv_departmentcode.OptionsColumn.AllowEdit = false; this.gv_departmentcode.Tag = "query_a.departmentcode"; @@ -848,7 +561,7 @@ // this.gv_departmentid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_departmentid.AppearanceCell.Options.UseFont = true; this.gv_departmentid.Caption = "部门ID "; this.gv_departmentid.Caption = "部门ID"; this.gv_departmentid.FieldName = "departmentid"; this.gv_departmentid.MinWidth = 50; this.gv_departmentid.Name = "gv_departmentid"; @@ -921,9 +634,6 @@ this.gv_fmanager, this.gv_remark, this.gv_productionWorkshop, this.gv_materialProperti, this.gv_createOrg, this.gv_useOrg, this.gv_parentId}); this.gridView1.GridControl = this.gcMain; this.gridView1.IndicatorWidth = 50; @@ -978,42 +688,20 @@ this.panel1.BackColor = System.Drawing.Color.White; this.panel1.Controls.Add(this.labelControl11); this.panel1.Controls.Add(this.lbGuid); 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_parentId); this.panel1.Controls.Add(this.txt_parentId); this.panel1.Controls.Add(this.lb_useOrg); this.panel1.Controls.Add(this.txt_useOrg); this.panel1.Controls.Add(this.lb_createOrg); this.panel1.Controls.Add(this.txt_createOrg); this.panel1.Controls.Add(this.lb_materialProperti); this.panel1.Controls.Add(this.txt_materialProperti); this.panel1.Controls.Add(this.lb_productionWorkshop); this.panel1.Controls.Add(this.txt_productionWorkshop); this.panel1.Controls.Add(this.lb_id); this.panel1.Controls.Add(this.txt_id); this.panel1.Controls.Add(this.lb_remark); this.panel1.Controls.Add(this.txt_remark); this.panel1.Controls.Add(this.lb_lastupdateDate); this.panel1.Controls.Add(this.txt_lastupdateDate); this.panel1.Controls.Add(this.lb_lastupdateBy); this.panel1.Controls.Add(this.txt_lastupdateBy); this.panel1.Controls.Add(this.lb_createDate); this.panel1.Controls.Add(this.txt_createDate); this.panel1.Controls.Add(this.lb_createBy); this.panel1.Controls.Add(this.txt_createBy); this.panel1.Controls.Add(this.lb_factory); this.panel1.Controls.Add(this.txt_factory); this.panel1.Controls.Add(this.lb_fmanager); this.panel1.Controls.Add(this.txt_fmanager); this.panel1.Controls.Add(this.lb_workshopName); this.panel1.Controls.Add(this.txt_workshopName); this.panel1.Controls.Add(this.lb_workshopNo); this.panel1.Controls.Add(this.txt_workshopNo); this.panel1.Controls.Add(this.lb_depextr5); this.panel1.Controls.Add(this.txt_depextr5); this.panel1.Controls.Add(this.lb_depextr4); this.panel1.Controls.Add(this.txt_depextr4); this.panel1.Controls.Add(this.lb_depextr3); @@ -1063,24 +751,13 @@ this.Controls.Add(this.xtraTabControl1); this.Controls.Add(this.toolBarMenu1); this.Name = "Frm_Department"; ((System.ComponentModel.ISupportInitialize)(this.txt_remark5.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark4.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_parentId.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_useOrg.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createOrg.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_factory.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fmanager.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_workshopName.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_workshopNo.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depextr5.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depextr4.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depextr3.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depextr2.Properties)).EndInit(); @@ -1111,54 +788,21 @@ private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Label lbGuid; private DevExpress.XtraEditors.LabelControl labelControl11; //BQCreateConrolObejct 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_parentId; private DevExpress.XtraEditors.TextEdit txt_parentId; private DevExpress.XtraGrid.Columns.GridColumn gv_parentId; private DevExpress.XtraEditors.LabelControl lb_useOrg; private DevExpress.XtraEditors.TextEdit txt_useOrg; private DevExpress.XtraGrid.Columns.GridColumn gv_useOrg; private DevExpress.XtraEditors.LabelControl lb_createOrg; private DevExpress.XtraEditors.TextEdit txt_createOrg; private DevExpress.XtraGrid.Columns.GridColumn gv_createOrg; private DevExpress.XtraEditors.LabelControl lb_materialProperti; private DevExpress.XtraEditors.TextEdit txt_materialProperti; private DevExpress.XtraGrid.Columns.GridColumn gv_materialProperti; private DevExpress.XtraEditors.LabelControl lb_productionWorkshop; private DevExpress.XtraEditors.TextEdit txt_productionWorkshop; private DevExpress.XtraGrid.Columns.GridColumn gv_productionWorkshop; private DevExpress.XtraEditors.LabelControl lb_id; private DevExpress.XtraEditors.TextEdit txt_id; private DevExpress.XtraEditors.LabelControl lb_remark; private DevExpress.XtraEditors.TextEdit txt_remark; private DevExpress.XtraGrid.Columns.GridColumn gv_remark; private DevExpress.XtraEditors.LabelControl lb_lastupdateDate; private DevExpress.XtraEditors.TextEdit txt_lastupdateDate; private DevExpress.XtraEditors.LabelControl lb_lastupdateBy; private DevExpress.XtraEditors.TextEdit txt_lastupdateBy; private DevExpress.XtraEditors.LabelControl lb_createDate; private DevExpress.XtraEditors.TextEdit txt_createDate; private DevExpress.XtraEditors.LabelControl lb_createBy; private DevExpress.XtraEditors.TextEdit txt_createBy; private DevExpress.XtraEditors.LabelControl lb_factory; private DevExpress.XtraEditors.TextEdit txt_factory; private DevExpress.XtraGrid.Columns.GridColumn gv_factory; private DevExpress.XtraEditors.LabelControl lb_fmanager; @@ -1172,9 +816,6 @@ private DevExpress.XtraEditors.LabelControl lb_workshopNo; private DevExpress.XtraEditors.TextEdit txt_workshopNo; private DevExpress.XtraGrid.Columns.GridColumn gv_workshopNo; private DevExpress.XtraEditors.LabelControl lb_depextr5; private DevExpress.XtraEditors.TextEdit txt_depextr5; private DevExpress.XtraEditors.LabelControl lb_depextr4; private DevExpress.XtraEditors.TextEdit txt_depextr4; @@ -1206,6 +847,5 @@ private DevExpress.XtraEditors.LabelControl lb_company; private DevExpress.XtraEditors.TextEdit txt_company; } } DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Department.cs
@@ -15,7 +15,7 @@ public partial class Frm_Department : XtraForm { private List<FilterEntity> _filterList = new List<FilterEntity>(); private readonly string _webServiceName = "MesCustomerManager/"; private readonly string _webServiceName = "SysDepartmentManager/"; public Frm_Department() { @@ -89,8 +89,10 @@ /// <param name="e"></param> private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) { UtilityHelper.JumpToTab(xtraTabControl1, 0); getPageList(1, UtilityHelper.GetPageSize()); if (xtraTabControl1.SelectedTabPageIndex == 1) getModel(lbGuid.Text.Trim(), false, 999); else getPageList(1, UtilityHelper.GetPageSize()); } /// <summary> @@ -103,7 +105,7 @@ foreach (var itm in _filterList) _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'"); var pgq = new PageQueryModel(curPage, pageSize, "create_date", var pgq = new PageQueryModel(curPage, pageSize, "a.create_date", "asc", "", _sbSqlWhere.ToString()); var json = JsonConvert.SerializeObject(pgq); try DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Holidy.cs
@@ -200,8 +200,10 @@ /// <param name="e"></param> private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) { UtilityHelper.JumpToTab(xtraTabControl1, 0); getPageList(1, UtilityHelper.GetPageSize()); if (xtraTabControl1.SelectedTabPageIndex == 1) getModel(lbGuid.Text.Trim(), false, 999); else getPageList(1, UtilityHelper.GetPageSize()); } /// <summary> DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesItemType.cs
@@ -93,8 +93,10 @@ /// <param name="e"></param> private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) { UtilityHelper.JumpToTab(xtraTabControl1, 0); getPageList(1, UtilityHelper.GetPageSize()); if (xtraTabControl1.SelectedTabPageIndex == 1) getModel(lbGuid.Text.Trim(), false, 999); else getPageList(1, UtilityHelper.GetPageSize()); } /// <summary> DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesPosition.cs
@@ -93,8 +93,10 @@ /// <param name="e"></param> private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) { UtilityHelper.JumpToTab(xtraTabControl1, 0); getPageList(1, UtilityHelper.GetPageSize()); if (xtraTabControl1.SelectedTabPageIndex == 1) getModel(lbGuid.Text.Trim(), false, 999); else getPageList(1, UtilityHelper.GetPageSize()); } /// <summary> DevApp/Gs.DevApp/DevFrm/BasicData/Frm_Staff.cs
@@ -90,8 +90,10 @@ /// <param name="e"></param> private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) { UtilityHelper.JumpToTab(xtraTabControl1, 0); getPageList(1, UtilityHelper.GetPageSize()); if (xtraTabControl1.SelectedTabPageIndex == 1) getModel(lbGuid.Text.Trim(), false, 999); else getPageList(1, UtilityHelper.GetPageSize()); } /// <summary> DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.Designer.cs
@@ -49,22 +49,8 @@ this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); 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_useOrg = new DevExpress.XtraEditors.LabelControl(); this.txt_useOrg = new DevExpress.XtraEditors.TextEdit(); this.lb_createOrg = new DevExpress.XtraEditors.LabelControl(); this.txt_createOrg = new DevExpress.XtraEditors.TextEdit(); this.lb_materialProperti = new DevExpress.XtraEditors.LabelControl(); this.txt_materialProperti = new DevExpress.XtraEditors.TextEdit(); this.gv_materialProperti = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_productionWorkshop = new DevExpress.XtraEditors.LabelControl(); this.txt_productionWorkshop = new DevExpress.XtraEditors.TextEdit(); this.gv_productionWorkshop = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_isFkc = new DevExpress.XtraEditors.LabelControl(); this.txt_isFkc = new DevExpress.XtraEditors.TextEdit(); this.gv_isFkc = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -83,17 +69,13 @@ this.gv_isWy = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_iconType = new DevExpress.XtraEditors.LabelControl(); this.txt_iconType = new DevExpress.XtraEditors.TextEdit(); this.lb_company = new DevExpress.XtraEditors.LabelControl(); this.txt_company = new DevExpress.XtraEditors.TextEdit(); this.lb_depottypecode = new DevExpress.XtraEditors.LabelControl(); this.txt_depottypecode = new DevExpress.XtraEditors.TextEdit(); this.gv_depottypecode = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_type2 = new DevExpress.XtraEditors.LabelControl(); this.txt_type2 = new DevExpress.XtraEditors.TextEdit(); this.gv_type2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_type1 = new DevExpress.XtraEditors.LabelControl(); this.txt_type1 = new DevExpress.XtraEditors.TextEdit(); this.gv_type1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_factory = new DevExpress.XtraEditors.LabelControl(); this.txt_factory = new DevExpress.XtraEditors.TextEdit(); this.lb_depottype = new DevExpress.XtraEditors.LabelControl(); @@ -101,10 +83,8 @@ this.gv_depottype = 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(); this.lb_lastupdateBy = new DevExpress.XtraEditors.LabelControl(); this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit(); this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn(); this.lb_createDate = new DevExpress.XtraEditors.LabelControl(); this.txt_createDate = new DevExpress.XtraEditors.TextEdit(); this.lb_createBy = new DevExpress.XtraEditors.LabelControl(); @@ -122,6 +102,7 @@ this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.gcMain = new DevExpress.XtraGrid.GridControl(); this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -135,13 +116,7 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).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_useOrg.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createOrg.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isFkc.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_piType.Properties)).BeginInit(); @@ -149,7 +124,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isWy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_iconType.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_company.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depottypecode.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_type2.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_type1.Properties)).BeginInit(); @@ -308,7 +282,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; this.tabMxPage1.Size = new System.Drawing.Size(1124, 285); this.tabMxPage1.Size = new System.Drawing.Size(1124, 338); this.tabMxPage1.Text = "明细1"; // // gcMx1 @@ -319,7 +293,7 @@ this.gcMx1.Name = "gcMx1"; this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemButtonEdit1}); this.gcMx1.Size = new System.Drawing.Size(1124, 285); this.gcMx1.Size = new System.Drawing.Size(1124, 338); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -366,101 +340,6 @@ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor; this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick); // // 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(532, 215); this.lb_remark5.Name = "lb_remark5"; this.lb_remark5.Size = new System.Drawing.Size(99, 21); this.lb_remark5.TabIndex = 343; this.lb_remark5.Text = "自定义字段5 "; // // txt_remark5 // this.txt_remark5.Location = new System.Drawing.Point(638, 211); 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 = 343; // // 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(279, 215); this.lb_remark4.Name = "lb_remark4"; this.lb_remark4.Size = new System.Drawing.Size(99, 21); this.lb_remark4.TabIndex = 336; this.lb_remark4.Text = "自定义字段4 "; // // txt_remark4 // this.txt_remark4.Location = new System.Drawing.Point(382, 211); 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 = 336; // // 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(14, 215); this.lb_remark3.Name = "lb_remark3"; this.lb_remark3.Size = new System.Drawing.Size(99, 21); this.lb_remark3.TabIndex = 327; this.lb_remark3.Text = "自定义字段3 "; // // txt_remark3 // this.txt_remark3.Location = new System.Drawing.Point(118, 211); 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 = 327; // // lb_useOrg // this.lb_useOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_useOrg.Appearance.Options.UseFont = true; this.lb_useOrg.Location = new System.Drawing.Point(848, 116); this.lb_useOrg.Name = "lb_useOrg"; this.lb_useOrg.Size = new System.Drawing.Size(73, 21); this.lb_useOrg.TabIndex = 319; this.lb_useOrg.Text = "使用组织 "; // // txt_useOrg // this.txt_useOrg.Location = new System.Drawing.Point(927, 112); this.txt_useOrg.Name = "txt_useOrg"; this.txt_useOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_useOrg.Properties.Appearance.Options.UseFont = true; this.txt_useOrg.Size = new System.Drawing.Size(150, 28); this.txt_useOrg.TabIndex = 319; // // lb_createOrg // this.lb_createOrg.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_createOrg.Appearance.Options.UseFont = true; this.lb_createOrg.Location = new System.Drawing.Point(558, 116); this.lb_createOrg.Name = "lb_createOrg"; this.lb_createOrg.Size = new System.Drawing.Size(73, 21); this.lb_createOrg.TabIndex = 312; this.lb_createOrg.Text = "创建组织 "; // // txt_createOrg // this.txt_createOrg.Location = new System.Drawing.Point(638, 112); this.txt_createOrg.Name = "txt_createOrg"; this.txt_createOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_createOrg.Properties.Appearance.Options.UseFont = true; this.txt_createOrg.Size = new System.Drawing.Size(150, 28); this.txt_createOrg.TabIndex = 312; // // lb_materialProperti // this.lb_materialProperti.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); @@ -480,58 +359,11 @@ this.txt_materialProperti.Size = new System.Drawing.Size(150, 28); this.txt_materialProperti.TabIndex = 306; // // gv_materialProperti // this.gv_materialProperti.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_materialProperti.AppearanceCell.Options.UseFont = true; this.gv_materialProperti.Caption = "物料属性"; this.gv_materialProperti.FieldName = "materialProperti"; this.gv_materialProperti.MinWidth = 50; this.gv_materialProperti.Name = "gv_materialProperti"; this.gv_materialProperti.OptionsColumn.AllowEdit = false; this.gv_materialProperti.Tag = "query_a.material_properti"; this.gv_materialProperti.Visible = true; this.gv_materialProperti.VisibleIndex = 16; this.gv_materialProperti.Width = 94; // // lb_productionWorkshop // this.lb_productionWorkshop.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_productionWorkshop.Appearance.Options.UseFont = true; this.lb_productionWorkshop.Location = new System.Drawing.Point(558, 180); this.lb_productionWorkshop.Name = "lb_productionWorkshop"; this.lb_productionWorkshop.Size = new System.Drawing.Size(73, 21); this.lb_productionWorkshop.TabIndex = 298; this.lb_productionWorkshop.Text = "生产车间 "; // // txt_productionWorkshop // this.txt_productionWorkshop.Location = new System.Drawing.Point(638, 176); this.txt_productionWorkshop.Name = "txt_productionWorkshop"; this.txt_productionWorkshop.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_productionWorkshop.Properties.Appearance.Options.UseFont = true; this.txt_productionWorkshop.Size = new System.Drawing.Size(150, 28); this.txt_productionWorkshop.TabIndex = 298; // // gv_productionWorkshop // this.gv_productionWorkshop.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_productionWorkshop.AppearanceCell.Options.UseFont = true; this.gv_productionWorkshop.Caption = "生产车间"; this.gv_productionWorkshop.FieldName = "productionWorkshop"; this.gv_productionWorkshop.MinWidth = 50; this.gv_productionWorkshop.Name = "gv_productionWorkshop"; this.gv_productionWorkshop.OptionsColumn.AllowEdit = false; this.gv_productionWorkshop.Tag = "query_a.production_workshop"; this.gv_productionWorkshop.Visible = true; this.gv_productionWorkshop.VisibleIndex = 15; this.gv_productionWorkshop.Width = 94; // // lb_isFkc // this.lb_isFkc.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_isFkc.Appearance.Options.UseFont = true; this.lb_isFkc.Location = new System.Drawing.Point(288, 180); this.lb_isFkc.Location = new System.Drawing.Point(541, 118); this.lb_isFkc.Name = "lb_isFkc"; this.lb_isFkc.Size = new System.Drawing.Size(90, 21); this.lb_isFkc.TabIndex = 291; @@ -539,7 +371,7 @@ // // txt_isFkc // this.txt_isFkc.Location = new System.Drawing.Point(382, 176); this.txt_isFkc.Location = new System.Drawing.Point(638, 114); this.txt_isFkc.Name = "txt_isFkc"; this.txt_isFkc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_isFkc.Properties.Appearance.Options.UseFont = true; @@ -557,14 +389,14 @@ this.gv_isFkc.OptionsColumn.AllowEdit = false; this.gv_isFkc.Tag = "query_a.is_fkc"; this.gv_isFkc.Visible = true; this.gv_isFkc.VisibleIndex = 14; this.gv_isFkc.VisibleIndex = 11; this.gv_isFkc.Width = 94; // // lb_zuid // this.lb_zuid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_zuid.Appearance.Options.UseFont = true; this.lb_zuid.Location = new System.Drawing.Point(74, 180); this.lb_zuid.Location = new System.Drawing.Point(592, 149); this.lb_zuid.Name = "lb_zuid"; this.lb_zuid.Size = new System.Drawing.Size(39, 21); this.lb_zuid.TabIndex = 285; @@ -572,7 +404,7 @@ // // txt_zuid // this.txt_zuid.Location = new System.Drawing.Point(118, 176); this.txt_zuid.Location = new System.Drawing.Point(638, 145); this.txt_zuid.Name = "txt_zuid"; this.txt_zuid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_zuid.Properties.Appearance.Options.UseFont = true; @@ -590,14 +422,14 @@ this.gv_zuid.OptionsColumn.AllowEdit = false; this.gv_zuid.Tag = "query_a.zuid"; this.gv_zuid.Visible = true; this.gv_zuid.VisibleIndex = 13; this.gv_zuid.VisibleIndex = 10; this.gv_zuid.Width = 94; // // lb_piType // this.lb_piType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_piType.Appearance.Options.UseFont = true; this.lb_piType.Location = new System.Drawing.Point(814, 148); this.lb_piType.Location = new System.Drawing.Point(814, 118); this.lb_piType.Name = "lb_piType"; this.lb_piType.Size = new System.Drawing.Size(107, 21); this.lb_piType.TabIndex = 280; @@ -605,7 +437,7 @@ // // txt_piType // this.txt_piType.Location = new System.Drawing.Point(927, 144); this.txt_piType.Location = new System.Drawing.Point(927, 114); this.txt_piType.Name = "txt_piType"; this.txt_piType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_piType.Properties.Appearance.Options.UseFont = true; @@ -616,7 +448,7 @@ // this.lb_cwhaddress.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_cwhaddress.Appearance.Options.UseFont = true; this.lb_cwhaddress.Location = new System.Drawing.Point(558, 148); this.lb_cwhaddress.Location = new System.Drawing.Point(305, 119); this.lb_cwhaddress.Name = "lb_cwhaddress"; this.lb_cwhaddress.Size = new System.Drawing.Size(73, 21); this.lb_cwhaddress.TabIndex = 273; @@ -624,7 +456,7 @@ // // txt_cwhaddress // this.txt_cwhaddress.Location = new System.Drawing.Point(638, 144); this.txt_cwhaddress.Location = new System.Drawing.Point(382, 115); this.txt_cwhaddress.Name = "txt_cwhaddress"; this.txt_cwhaddress.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_cwhaddress.Properties.Appearance.Options.UseFont = true; @@ -661,7 +493,7 @@ this.gv_isNg.OptionsColumn.AllowEdit = false; this.gv_isNg.Tag = "query_a.is_ng"; this.gv_isNg.Visible = true; this.gv_isNg.VisibleIndex = 12; this.gv_isNg.VisibleIndex = 9; this.gv_isNg.Width = 94; // // lb_isWy @@ -694,14 +526,14 @@ this.gv_isWy.OptionsColumn.AllowEdit = false; this.gv_isWy.Tag = "query_a.is_wy"; this.gv_isWy.Visible = true; this.gv_isWy.VisibleIndex = 11; this.gv_isWy.VisibleIndex = 8; this.gv_isWy.Width = 94; // // lb_iconType // this.lb_iconType.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_iconType.Appearance.Options.UseFont = true; this.lb_iconType.Location = new System.Drawing.Point(848, 180); this.lb_iconType.Location = new System.Drawing.Point(848, 149); this.lb_iconType.Name = "lb_iconType"; this.lb_iconType.Size = new System.Drawing.Size(73, 21); this.lb_iconType.TabIndex = 258; @@ -709,31 +541,12 @@ // // txt_iconType // this.txt_iconType.Location = new System.Drawing.Point(927, 176); this.txt_iconType.Location = new System.Drawing.Point(927, 145); this.txt_iconType.Name = "txt_iconType"; this.txt_iconType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_iconType.Properties.Appearance.Options.UseFont = true; this.txt_iconType.Size = new System.Drawing.Size(150, 28); this.txt_iconType.TabIndex = 258; // // lb_company // this.lb_company.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.lb_company.Appearance.Options.UseFont = true; this.lb_company.Location = new System.Drawing.Point(305, 116); this.lb_company.Name = "lb_company"; this.lb_company.Size = new System.Drawing.Size(73, 21); this.lb_company.TabIndex = 252; this.lb_company.Text = "公司代码 "; // // txt_company // this.txt_company.Location = new System.Drawing.Point(382, 112); this.txt_company.Name = "txt_company"; this.txt_company.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); this.txt_company.Properties.Appearance.Options.UseFont = true; this.txt_company.Size = new System.Drawing.Size(150, 28); this.txt_company.TabIndex = 252; // // lb_depottypecode // @@ -765,7 +578,7 @@ this.gv_depottypecode.OptionsColumn.AllowEdit = false; this.gv_depottypecode.Tag = "query_a.depottypecode"; this.gv_depottypecode.Visible = true; this.gv_depottypecode.VisibleIndex = 10; this.gv_depottypecode.VisibleIndex = 7; this.gv_depottypecode.Width = 94; // // lb_type2 @@ -787,20 +600,6 @@ this.txt_type2.Size = new System.Drawing.Size(150, 28); this.txt_type2.TabIndex = 243; // // gv_type2 // this.gv_type2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_type2.AppearanceCell.Options.UseFont = true; this.gv_type2.Caption = "成品使用"; this.gv_type2.FieldName = "type2"; this.gv_type2.MinWidth = 50; this.gv_type2.Name = "gv_type2"; this.gv_type2.OptionsColumn.AllowEdit = false; this.gv_type2.Tag = "query_a.type_2"; this.gv_type2.Visible = true; this.gv_type2.VisibleIndex = 9; this.gv_type2.Width = 94; // // lb_type1 // this.lb_type1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); @@ -819,20 +618,6 @@ this.txt_type1.Properties.Appearance.Options.UseFont = true; this.txt_type1.Size = new System.Drawing.Size(150, 28); this.txt_type1.TabIndex = 240; // // gv_type1 // this.gv_type1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_type1.AppearanceCell.Options.UseFont = true; this.gv_type1.Caption = "物料使用"; this.gv_type1.FieldName = "type1"; this.gv_type1.MinWidth = 50; this.gv_type1.Name = "gv_type1"; this.gv_type1.OptionsColumn.AllowEdit = false; this.gv_type1.Tag = "query_a.type_1"; this.gv_type1.Visible = true; this.gv_type1.VisibleIndex = 8; this.gv_type1.Width = 94; // // lb_factory // @@ -883,7 +668,7 @@ this.gv_depottype.OptionsColumn.AllowEdit = false; this.gv_depottype.Tag = "query_a.depottype"; this.gv_depottype.Visible = true; this.gv_depottype.VisibleIndex = 7; this.gv_depottype.VisibleIndex = 6; this.gv_depottype.Width = 94; // // lb_lastupdateDate @@ -905,20 +690,6 @@ this.txt_lastupdateDate.Size = new System.Drawing.Size(150, 28); this.txt_lastupdateDate.TabIndex = 228; // // gv_lastupdateDate // this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true; this.gv_lastupdateDate.Caption = "最后更新时间"; this.gv_lastupdateDate.FieldName = "lastupdateDate"; this.gv_lastupdateDate.MinWidth = 200; this.gv_lastupdateDate.Name = "gv_lastupdateDate"; this.gv_lastupdateDate.OptionsColumn.AllowEdit = false; this.gv_lastupdateDate.Tag = "query_a.lastupdate_date"; this.gv_lastupdateDate.Visible = true; this.gv_lastupdateDate.VisibleIndex = 6; this.gv_lastupdateDate.Width = 200; // // lb_lastupdateBy // this.lb_lastupdateBy.Appearance.Font = new System.Drawing.Font("Tahoma", 10F); @@ -937,20 +708,6 @@ this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true; this.txt_lastupdateBy.Size = new System.Drawing.Size(150, 28); this.txt_lastupdateBy.TabIndex = 226; // // gv_lastupdateBy // this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F); this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true; this.gv_lastupdateBy.Caption = "最后更新人"; this.gv_lastupdateBy.FieldName = "lastupdateBy"; this.gv_lastupdateBy.MinWidth = 50; this.gv_lastupdateBy.Name = "gv_lastupdateBy"; this.gv_lastupdateBy.OptionsColumn.AllowEdit = false; this.gv_lastupdateBy.Tag = "query_a.lastupdate_by"; this.gv_lastupdateBy.Visible = true; this.gv_lastupdateBy.VisibleIndex = 5; this.gv_lastupdateBy.Width = 94; // // lb_createDate // @@ -1001,7 +758,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_description @@ -1034,7 +791,7 @@ this.gv_description.OptionsColumn.AllowEdit = false; this.gv_description.Tag = "query_a.description"; this.gv_description.Visible = true; this.gv_description.VisibleIndex = 3; this.gv_description.VisibleIndex = 4; this.gv_description.Width = 94; // // lb_depotName @@ -1062,13 +819,13 @@ this.gv_depotName.AppearanceCell.Options.UseFont = true; this.gv_depotName.Caption = "仓库名称"; this.gv_depotName.FieldName = "depotName"; this.gv_depotName.MinWidth = 100; this.gv_depotName.MinWidth = 150; this.gv_depotName.Name = "gv_depotName"; this.gv_depotName.OptionsColumn.AllowEdit = false; this.gv_depotName.Tag = "query_a.depot_name"; this.gv_depotName.Visible = true; this.gv_depotName.VisibleIndex = 2; this.gv_depotName.Width = 100; this.gv_depotName.VisibleIndex = 3; this.gv_depotName.Width = 150; // // lb_depotCode // @@ -1100,7 +857,7 @@ this.gv_depotCode.OptionsColumn.AllowEdit = false; this.gv_depotCode.Tag = "query_a.depot_code"; this.gv_depotCode.Visible = true; this.gv_depotCode.VisibleIndex = 1; this.gv_depotCode.VisibleIndex = 2; this.gv_depotCode.Width = 100; // // toolBarMenu1 @@ -1131,26 +888,24 @@ // // gridView1 // this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true; this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap; this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F); this.gridView1.Appearance.Row.Options.UseFont = true; this.gridView1.ColumnPanelRowHeight = 60; this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { this.gridColumn1, this.gv_id, this.gv_depotCode, this.gv_depotName, this.gv_depottype, this.gv_description, this.gv_createBy, this.gv_lastupdateBy, this.gv_lastupdateDate, this.gv_type1, this.gv_type2, this.gv_depottypecode, this.gv_isWy, this.gv_isNg, this.gv_zuid, this.gv_isFkc, this.gv_productionWorkshop, this.gv_materialProperti}); this.gv_isFkc}); this.gridView1.GridControl = this.gcMain; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -1158,14 +913,26 @@ this.gridView1.OptionsView.ShowAutoFilterRow = true; this.gridView1.OptionsView.ShowGroupPanel = false; // // gridColumn1 // this.gridColumn1.Caption = "使用组织"; this.gridColumn1.FieldName = "fSubsidiary"; this.gridColumn1.MinWidth = 250; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.OptionsColumn.AllowEdit = false; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 0; this.gridColumn1.Width = 250; // // gv_id // this.gv_id.Caption = "gridColumn1"; this.gv_id.Caption = "仓库ID"; this.gv_id.FieldName = "depotId"; this.gv_id.MinWidth = 25; this.gv_id.Name = "gv_id"; this.gv_id.OptionsColumn.AllowEdit = false; this.gv_id.Visible = true; this.gv_id.VisibleIndex = 0; this.gv_id.VisibleIndex = 1; this.gv_id.Width = 94; // // xtraTabControl1 @@ -1213,10 +980,10 @@ // tabMx // this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; this.tabMx.Location = new System.Drawing.Point(0, 253); this.tabMx.Location = new System.Drawing.Point(0, 200); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; this.tabMx.Size = new System.Drawing.Size(1126, 317); this.tabMx.Size = new System.Drawing.Size(1126, 370); this.tabMx.TabIndex = 2; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -1226,20 +993,8 @@ this.panel1.BackColor = System.Drawing.Color.White; this.panel1.Controls.Add(this.labelControl11); this.panel1.Controls.Add(this.lbGuid); 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_useOrg); this.panel1.Controls.Add(this.txt_useOrg); this.panel1.Controls.Add(this.lb_createOrg); this.panel1.Controls.Add(this.txt_createOrg); this.panel1.Controls.Add(this.lb_materialProperti); this.panel1.Controls.Add(this.txt_materialProperti); this.panel1.Controls.Add(this.lb_productionWorkshop); this.panel1.Controls.Add(this.txt_productionWorkshop); this.panel1.Controls.Add(this.lb_isFkc); this.panel1.Controls.Add(this.txt_isFkc); this.panel1.Controls.Add(this.lb_zuid); @@ -1254,8 +1009,6 @@ this.panel1.Controls.Add(this.txt_isWy); this.panel1.Controls.Add(this.lb_iconType); this.panel1.Controls.Add(this.txt_iconType); this.panel1.Controls.Add(this.lb_company); this.panel1.Controls.Add(this.txt_company); this.panel1.Controls.Add(this.lb_depottypecode); this.panel1.Controls.Add(this.txt_depottypecode); this.panel1.Controls.Add(this.lb_type2); @@ -1284,12 +1037,12 @@ this.panel1.Font = new System.Drawing.Font("Tahoma", 10F); this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(1126, 253); this.panel1.Size = new System.Drawing.Size(1126, 200); this.panel1.TabIndex = 1; // // labelControl11 // this.labelControl11.Location = new System.Drawing.Point(864, 221); this.labelControl11.Location = new System.Drawing.Point(918, 177); 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); @@ -1300,7 +1053,7 @@ // lbGuid // this.lbGuid.AutoSize = true; this.lbGuid.Location = new System.Drawing.Point(915, 221); this.lbGuid.Location = new System.Drawing.Point(969, 177); this.lbGuid.Name = "lbGuid"; this.lbGuid.Size = new System.Drawing.Size(0, 21); this.lbGuid.TabIndex = 1; @@ -1318,13 +1071,7 @@ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).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_useOrg.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createOrg.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_materialProperti.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_productionWorkshop.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isFkc.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_zuid.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_piType.Properties)).EndInit(); @@ -1332,7 +1079,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_isNg.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isWy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_iconType.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_company.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_depottypecode.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_type2.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_type1.Properties)).EndInit(); @@ -1383,28 +1129,9 @@ private DevExpress.XtraTab.XtraTabPage tabMxPage1; private DevExpress.XtraGrid.GridControl gcMx1; private DevExpress.XtraGrid.Views.Grid.GridView gvMx1; 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_useOrg; private DevExpress.XtraEditors.TextEdit txt_useOrg; private DevExpress.XtraEditors.LabelControl lb_createOrg; private DevExpress.XtraEditors.TextEdit txt_createOrg; private DevExpress.XtraEditors.LabelControl lb_materialProperti; private DevExpress.XtraEditors.TextEdit txt_materialProperti; private DevExpress.XtraGrid.Columns.GridColumn gv_materialProperti; private DevExpress.XtraEditors.LabelControl lb_productionWorkshop; private DevExpress.XtraEditors.TextEdit txt_productionWorkshop; private DevExpress.XtraGrid.Columns.GridColumn gv_productionWorkshop; private DevExpress.XtraEditors.LabelControl lb_isFkc; private DevExpress.XtraEditors.TextEdit txt_isFkc; @@ -1431,20 +1158,15 @@ private DevExpress.XtraEditors.LabelControl lb_iconType; private DevExpress.XtraEditors.TextEdit txt_iconType; private DevExpress.XtraEditors.LabelControl lb_company; private DevExpress.XtraEditors.TextEdit txt_company; private DevExpress.XtraEditors.LabelControl lb_depottypecode; private DevExpress.XtraEditors.TextEdit txt_depottypecode; private DevExpress.XtraGrid.Columns.GridColumn gv_depottypecode; private DevExpress.XtraEditors.LabelControl lb_type2; private DevExpress.XtraEditors.TextEdit txt_type2; private DevExpress.XtraGrid.Columns.GridColumn gv_type2; private DevExpress.XtraEditors.LabelControl lb_type1; private DevExpress.XtraEditors.TextEdit txt_type1; private DevExpress.XtraGrid.Columns.GridColumn gv_type1; private DevExpress.XtraEditors.LabelControl lb_factory; private DevExpress.XtraEditors.TextEdit txt_factory; @@ -1455,11 +1177,9 @@ private DevExpress.XtraEditors.LabelControl lb_lastupdateDate; private DevExpress.XtraEditors.TextEdit txt_lastupdateDate; private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateDate; private DevExpress.XtraEditors.LabelControl lb_lastupdateBy; private DevExpress.XtraEditors.TextEdit txt_lastupdateBy; private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy; private DevExpress.XtraEditors.LabelControl lb_createDate; private DevExpress.XtraEditors.TextEdit txt_createDate; @@ -1482,5 +1202,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gvMxDel; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; private DevExpress.XtraGrid.Columns.GridColumn gv_id; private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; } } DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
@@ -184,8 +184,10 @@ /// <param name="e"></param> private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e) { UtilityHelper.JumpToTab(xtraTabControl1, 0); getPageList(1, UtilityHelper.GetPageSize()); if (xtraTabControl1.SelectedTabPageIndex == 1) getModel(lbGuid.Text.Trim(), false, 999); else getPageList(1, UtilityHelper.GetPageSize()); } /// <summary> @@ -298,7 +300,7 @@ foreach (var itm in _filterList) _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" + itm.fileValue + "'"); var pgq = new PageQueryModel(curPage, pageSize, "depot_code", "asc", var pgq = new PageQueryModel(curPage, pageSize, "a.depot_code", "asc", "", _sbSqlWhere.ToString()); var json = JsonConvert.SerializeObject(pgq); try
