DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -40,11 +40,12 @@ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); @@ -80,10 +81,12 @@ this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); this.txt_fngDesc = new Gs.DevApp.UserControl.UcDictionary(); this.btnYcReport = new DevExpress.XtraEditors.SimpleButton(); this.lbGuid = new System.Windows.Forms.Label(); this.txt_suppName = new DevExpress.XtraEditors.TextEdit(); @@ -133,6 +136,7 @@ this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem(); this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -259,6 +263,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit(); this.xtraTabControl2.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -414,7 +419,8 @@ this.gridColumn23, this.gridColumn30, this.gridColumn5, this.gridColumn6}); this.gridColumn6, this.gridColumn7}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -667,7 +673,7 @@ // gv_fngHandle // this.gv_fngHandle.AppearanceCell.Options.UseFont = true; this.gv_fngHandle.Caption = "不良处理方法"; this.gv_fngHandle.Caption = "处理结果"; this.gv_fngHandle.FieldName = "fngHandle"; this.gv_fngHandle.MinWidth = 30; this.gv_fngHandle.Name = "gv_fngHandle"; @@ -685,7 +691,7 @@ this.bandedGridColumn1.Name = "bandedGridColumn1"; this.bandedGridColumn1.Tag = "org.fnamber"; this.bandedGridColumn1.Visible = true; this.bandedGridColumn1.VisibleIndex = 21; this.bandedGridColumn1.VisibleIndex = 22; this.bandedGridColumn1.Width = 250; // // gridColumn18 @@ -695,7 +701,7 @@ this.gridColumn18.MinWidth = 25; this.gridColumn18.Name = "gridColumn18"; this.gridColumn18.Visible = true; this.gridColumn18.VisibleIndex = 22; this.gridColumn18.VisibleIndex = 23; this.gridColumn18.Width = 94; // // gridColumn19 @@ -705,7 +711,7 @@ this.gridColumn19.MinWidth = 25; this.gridColumn19.Name = "gridColumn19"; this.gridColumn19.Visible = true; this.gridColumn19.VisibleIndex = 23; this.gridColumn19.VisibleIndex = 24; this.gridColumn19.Width = 94; // // gridColumn17 @@ -723,7 +729,7 @@ this.gridColumn23.MinWidth = 25; this.gridColumn23.Name = "gridColumn23"; this.gridColumn23.Visible = true; this.gridColumn23.VisibleIndex = 24; this.gridColumn23.VisibleIndex = 25; this.gridColumn23.Width = 94; // // gridColumn30 @@ -755,6 +761,16 @@ this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 4; this.gridColumn6.Width = 94; // // gridColumn7 // this.gridColumn7.Caption = "退料方式"; this.gridColumn7.FieldName = "fmrmode"; this.gridColumn7.MinWidth = 25; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 21; this.gridColumn7.Width = 94; // // pageBar1 // @@ -793,11 +809,12 @@ this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1342, 688); this.splitMx1.SplitterPosition = 202; this.splitMx1.SplitterPosition = 231; this.splitMx1.TabIndex = 0; // // layoutMx1 // this.layoutMx1.Controls.Add(this.txt_fngDesc); this.layoutMx1.Controls.Add(this.btnYcReport); this.layoutMx1.Controls.Add(this.lbGuid); this.layoutMx1.Controls.Add(this.txt_suppName); @@ -829,20 +846,31 @@ this.layoutControlItem21}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1067, 391, 812, 500); this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(874, 322, 812, 500); this.layoutMx1.Root = this.Root; this.layoutMx1.Size = new System.Drawing.Size(1342, 202); this.layoutMx1.Size = new System.Drawing.Size(1342, 231); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // txt_fngDesc // this.txt_fngDesc.BtnTxt = "异常备注"; this.txt_fngDesc.Location = new System.Drawing.Point(12, 167); this.txt_fngDesc.Name = "txt_fngDesc"; this.txt_fngDesc.Size = new System.Drawing.Size(656, 52); this.txt_fngDesc.TabIndex = 815; this.txt_fngDesc.TextTxt = ""; this.txt_fngDesc.WhereTxt = "s_type=\'IQC缺陷描述\'"; // // btnYcReport // this.btnYcReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttopdf_16x16; this.btnYcReport.Location = new System.Drawing.Point(662, 167); this.btnYcReport.Location = new System.Drawing.Point(672, 167); this.btnYcReport.Name = "btnYcReport"; this.btnYcReport.Size = new System.Drawing.Size(116, 27); this.btnYcReport.StyleController = this.layoutMx1; this.btnYcReport.TabIndex = 814; this.btnYcReport.Tag = "gvBtnAlawys"; this.btnYcReport.Text = "查看异常报告"; // // lbGuid @@ -856,9 +884,9 @@ // // txt_suppName // this.txt_suppName.Location = new System.Drawing.Point(409, 105); this.txt_suppName.Location = new System.Drawing.Point(414, 105); this.txt_suppName.Name = "txt_suppName"; this.txt_suppName.Size = new System.Drawing.Size(249, 24); this.txt_suppName.Size = new System.Drawing.Size(254, 24); this.txt_suppName.StyleController = this.layoutMx1; this.txt_suppName.TabIndex = 801; this.txt_suppName.Tag = "readonly"; @@ -868,17 +896,18 @@ this.txt_remarks.Location = new System.Drawing.Point(84, 136); this.txt_remarks.Name = "txt_remarks"; this.txt_remarks.Properties.Appearance.Options.UseFont = true; this.txt_remarks.Size = new System.Drawing.Size(574, 24); this.txt_remarks.Size = new System.Drawing.Size(584, 24); this.txt_remarks.StyleController = this.layoutMx1; this.txt_remarks.TabIndex = 797; this.txt_remarks.Tag = "readonly"; // // txt_fcheckResu // this.txt_fcheckResu.Location = new System.Drawing.Point(734, 105); this.txt_fcheckResu.Location = new System.Drawing.Point(744, 105); this.txt_fcheckResu.Name = "txt_fcheckResu"; this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true; this.txt_fcheckResu.Size = new System.Drawing.Size(249, 24); this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24); this.txt_fcheckResu.StyleController = this.layoutMx1; this.txt_fcheckResu.TabIndex = 798; this.txt_fcheckResu.Tag = "readonly"; @@ -888,7 +917,7 @@ this.txt_itemName.Location = new System.Drawing.Point(84, 43); this.txt_itemName.Name = "txt_itemName"; this.txt_itemName.Properties.Appearance.Options.UseFont = true; this.txt_itemName.Size = new System.Drawing.Size(249, 24); this.txt_itemName.Size = new System.Drawing.Size(254, 24); this.txt_itemName.StyleController = this.layoutMx1; this.txt_itemName.TabIndex = 800; this.txt_itemName.Tag = "readonly"; @@ -898,27 +927,27 @@ this.txt_releaseNo.Location = new System.Drawing.Point(84, 12); this.txt_releaseNo.Name = "txt_releaseNo"; this.txt_releaseNo.Properties.Appearance.Options.UseFont = true; this.txt_releaseNo.Size = new System.Drawing.Size(249, 24); this.txt_releaseNo.Size = new System.Drawing.Size(254, 24); this.txt_releaseNo.StyleController = this.layoutMx1; this.txt_releaseNo.TabIndex = 213; this.txt_releaseNo.Tag = "readonly"; // // txt_fcheckDate // this.txt_fcheckDate.Location = new System.Drawing.Point(734, 12); this.txt_fcheckDate.Location = new System.Drawing.Point(744, 12); this.txt_fcheckDate.Name = "txt_fcheckDate"; this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true; this.txt_fcheckDate.Size = new System.Drawing.Size(249, 24); this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24); this.txt_fcheckDate.StyleController = this.layoutMx1; this.txt_fcheckDate.TabIndex = 216; this.txt_fcheckDate.Tag = "readonly"; // // txt_lotNo // this.txt_lotNo.Location = new System.Drawing.Point(409, 12); this.txt_lotNo.Location = new System.Drawing.Point(414, 12); this.txt_lotNo.Name = "txt_lotNo"; this.txt_lotNo.Properties.Appearance.Options.UseFont = true; this.txt_lotNo.Size = new System.Drawing.Size(249, 24); this.txt_lotNo.Size = new System.Drawing.Size(254, 24); this.txt_lotNo.StyleController = this.layoutMx1; this.txt_lotNo.TabIndex = 262; this.txt_lotNo.Tag = "readonly"; @@ -928,7 +957,7 @@ this.txt_itemNo.Location = new System.Drawing.Point(84, 74); this.txt_itemNo.Name = "txt_itemNo"; this.txt_itemNo.Properties.Appearance.Options.UseFont = true; this.txt_itemNo.Size = new System.Drawing.Size(249, 24); this.txt_itemNo.Size = new System.Drawing.Size(254, 24); this.txt_itemNo.StyleController = this.layoutMx1; this.txt_itemNo.TabIndex = 789; this.txt_itemNo.Tag = "readonly"; @@ -937,7 +966,7 @@ // this.txt_itemModel.Location = new System.Drawing.Point(84, 105); this.txt_itemModel.Name = "txt_itemModel"; this.txt_itemModel.Size = new System.Drawing.Size(249, 24); this.txt_itemModel.Size = new System.Drawing.Size(254, 24); this.txt_itemModel.StyleController = this.layoutMx1; this.txt_itemModel.TabIndex = 801; this.txt_itemModel.Tag = "readonly"; @@ -953,57 +982,57 @@ // // txt_fcheckBy // this.txt_fcheckBy.Location = new System.Drawing.Point(734, 43); this.txt_fcheckBy.Location = new System.Drawing.Point(744, 43); this.txt_fcheckBy.Name = "txt_fcheckBy"; this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true; this.txt_fcheckBy.Size = new System.Drawing.Size(249, 24); this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24); this.txt_fcheckBy.StyleController = this.layoutMx1; this.txt_fcheckBy.TabIndex = 217; this.txt_fcheckBy.Tag = "readonly"; // // txt_fbatchQty // this.txt_fbatchQty.Location = new System.Drawing.Point(409, 74); this.txt_fbatchQty.Location = new System.Drawing.Point(414, 74); this.txt_fbatchQty.Name = "txt_fbatchQty"; this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true; this.txt_fbatchQty.Size = new System.Drawing.Size(249, 24); this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24); this.txt_fbatchQty.StyleController = this.layoutMx1; this.txt_fbatchQty.TabIndex = 222; this.txt_fbatchQty.Tag = "readonly"; // // txt_fsubmitBy // this.txt_fsubmitBy.Location = new System.Drawing.Point(1059, 43); this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 43); this.txt_fsubmitBy.Name = "txt_fsubmitBy"; this.txt_fsubmitBy.Size = new System.Drawing.Size(250, 24); this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24); this.txt_fsubmitBy.StyleController = this.layoutMx1; this.txt_fsubmitBy.TabIndex = 804; this.txt_fsubmitBy.Tag = "readonly"; // // txt_fsubmitDate // this.txt_fsubmitDate.Location = new System.Drawing.Point(1059, 74); this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 74); this.txt_fsubmitDate.Name = "txt_fsubmitDate"; this.txt_fsubmitDate.Size = new System.Drawing.Size(250, 24); this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24); this.txt_fsubmitDate.StyleController = this.layoutMx1; this.txt_fsubmitDate.TabIndex = 805; this.txt_fsubmitDate.Tag = "readonly"; // // txt_fsubmit // this.txt_fsubmit.Location = new System.Drawing.Point(987, 12); this.txt_fsubmit.Location = new System.Drawing.Point(1002, 12); this.txt_fsubmit.Name = "txt_fsubmit"; this.txt_fsubmit.Properties.Caption = "审核标识"; this.txt_fsubmit.Size = new System.Drawing.Size(322, 24); this.txt_fsubmit.Size = new System.Drawing.Size(328, 24); this.txt_fsubmit.StyleController = this.layoutMx1; this.txt_fsubmit.TabIndex = 806; this.txt_fsubmit.Tag = "readonly"; // // txt_slOrg // this.txt_slOrg.Location = new System.Drawing.Point(734, 136); this.txt_slOrg.Location = new System.Drawing.Point(744, 136); this.txt_slOrg.Name = "txt_slOrg"; this.txt_slOrg.Size = new System.Drawing.Size(249, 24); this.txt_slOrg.Size = new System.Drawing.Size(254, 24); this.txt_slOrg.StyleController = this.layoutMx1; this.txt_slOrg.TabIndex = 807; this.txt_slOrg.Tag = "readonly"; @@ -1019,53 +1048,53 @@ // // txt_checkStates // this.txt_checkStates.Location = new System.Drawing.Point(734, 74); this.txt_checkStates.Location = new System.Drawing.Point(744, 74); this.txt_checkStates.Name = "txt_checkStates"; this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true; this.txt_checkStates.Size = new System.Drawing.Size(249, 24); this.txt_checkStates.Size = new System.Drawing.Size(254, 24); this.txt_checkStates.StyleController = this.layoutMx1; this.txt_checkStates.TabIndex = 809; this.txt_checkStates.Tag = "readonly"; // // txt_freceQty // this.txt_freceQty.Location = new System.Drawing.Point(1059, 105); this.txt_freceQty.Location = new System.Drawing.Point(1074, 105); this.txt_freceQty.Name = "txt_freceQty"; this.txt_freceQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_freceQty.Properties.Appearance.Options.UseForeColor = true; this.txt_freceQty.Size = new System.Drawing.Size(250, 24); this.txt_freceQty.Size = new System.Drawing.Size(256, 24); this.txt_freceQty.StyleController = this.layoutMx1; this.txt_freceQty.TabIndex = 810; this.txt_freceQty.Tag = "readonly"; // // txt_cgdNo // this.txt_cgdNo.Location = new System.Drawing.Point(409, 43); this.txt_cgdNo.Location = new System.Drawing.Point(414, 43); this.txt_cgdNo.Name = "txt_cgdNo"; this.txt_cgdNo.Size = new System.Drawing.Size(249, 24); this.txt_cgdNo.Size = new System.Drawing.Size(254, 24); this.txt_cgdNo.StyleController = this.layoutMx1; this.txt_cgdNo.TabIndex = 811; this.txt_cgdNo.Tag = "readonly"; // // txt_fngHandle // this.txt_fngHandle.Location = new System.Drawing.Point(1059, 136); this.txt_fngHandle.Location = new System.Drawing.Point(1074, 136); this.txt_fngHandle.Name = "txt_fngHandle"; this.txt_fngHandle.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_fngHandle.Properties.Appearance.Options.UseForeColor = true; this.txt_fngHandle.Size = new System.Drawing.Size(250, 24); this.txt_fngHandle.Size = new System.Drawing.Size(256, 24); this.txt_fngHandle.StyleController = this.layoutMx1; this.txt_fngHandle.TabIndex = 812; this.txt_fngHandle.Tag = "readonly"; // // txt_fmrmode // this.txt_fmrmode.Location = new System.Drawing.Point(1059, 167); this.txt_fmrmode.Location = new System.Drawing.Point(1074, 167); this.txt_fmrmode.Name = "txt_fmrmode"; this.txt_fmrmode.Properties.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_fmrmode.Properties.Appearance.Options.UseForeColor = true; this.txt_fmrmode.Size = new System.Drawing.Size(250, 24); this.txt_fmrmode.Size = new System.Drawing.Size(256, 24); this.txt_fmrmode.StyleController = this.layoutMx1; this.txt_fmrmode.TabIndex = 813; this.txt_fmrmode.Tag = "readonly"; @@ -1128,7 +1157,8 @@ this.layoutControlItem23, this.layoutControlItem25, this.layoutControlItem26, this.layoutControlItem27}); this.layoutControlItem27, this.layoutControlItem28}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -1156,14 +1186,17 @@ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition6.Height = 100D; rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition7.Height = 25D; rowDefinition7.SizeType = System.Windows.Forms.SizeType.AutoSize; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, rowDefinition3, rowDefinition4, rowDefinition5, rowDefinition6}); this.Root.Size = new System.Drawing.Size(1321, 206); rowDefinition6, rowDefinition7}); this.Root.Size = new System.Drawing.Size(1342, 231); this.Root.TextVisible = false; // // layoutControlItem1 @@ -1171,7 +1204,7 @@ this.layoutControlItem1.Control = this.txt_releaseNo; this.layoutControlItem1.Location = new System.Drawing.Point(0, 0); this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.Size = new System.Drawing.Size(325, 31); this.layoutControlItem1.Size = new System.Drawing.Size(330, 31); this.layoutControlItem1.Text = "检验单号"; this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); // @@ -1181,7 +1214,7 @@ this.layoutControlItem4.Location = new System.Drawing.Point(0, 31); this.layoutControlItem4.Name = "layoutControlItem4"; this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem4.Size = new System.Drawing.Size(325, 31); this.layoutControlItem4.Size = new System.Drawing.Size(330, 31); this.layoutControlItem4.Text = "物料名称"; this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18); // @@ -1191,7 +1224,7 @@ this.layoutControlItem5.Location = new System.Drawing.Point(0, 62); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem5.Size = new System.Drawing.Size(325, 31); this.layoutControlItem5.Size = new System.Drawing.Size(330, 31); this.layoutControlItem5.Text = "物料编码"; this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); // @@ -1201,39 +1234,39 @@ this.layoutControlItem6.Location = new System.Drawing.Point(0, 93); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem6.Size = new System.Drawing.Size(325, 31); this.layoutControlItem6.Size = new System.Drawing.Size(330, 31); this.layoutControlItem6.Text = "物料规格"; this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_fsubmitBy; this.layoutControlItem15.Location = new System.Drawing.Point(975, 31); this.layoutControlItem15.Location = new System.Drawing.Point(990, 31); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem15.Size = new System.Drawing.Size(326, 31); this.layoutControlItem15.Size = new System.Drawing.Size(332, 31); this.layoutControlItem15.Text = "审核日期"; this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem16 // this.layoutControlItem16.Control = this.txt_fsubmitDate; this.layoutControlItem16.Location = new System.Drawing.Point(975, 62); this.layoutControlItem16.Location = new System.Drawing.Point(990, 62); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem16.Size = new System.Drawing.Size(326, 31); this.layoutControlItem16.Size = new System.Drawing.Size(332, 31); this.layoutControlItem16.Text = "审核人员"; this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_fsubmit; this.layoutControlItem14.Location = new System.Drawing.Point(975, 0); this.layoutControlItem14.Location = new System.Drawing.Point(990, 0); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem14.Size = new System.Drawing.Size(326, 31); this.layoutControlItem14.Size = new System.Drawing.Size(332, 31); this.layoutControlItem14.Text = "审核标识"; this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem14.TextVisible = false; @@ -1245,154 +1278,167 @@ this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem12.Size = new System.Drawing.Size(650, 31); this.layoutControlItem12.Text = "备注说明"; this.layoutControlItem12.Size = new System.Drawing.Size(660, 31); this.layoutControlItem12.Text = "到货备注"; this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_fcheckResu; this.layoutControlItem10.Location = new System.Drawing.Point(650, 93); this.layoutControlItem10.Location = new System.Drawing.Point(660, 93); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem10.Size = new System.Drawing.Size(325, 31); this.layoutControlItem10.Size = new System.Drawing.Size(330, 31); this.layoutControlItem10.Text = "检验结果"; this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_suppName; this.layoutControlItem13.Location = new System.Drawing.Point(325, 93); this.layoutControlItem13.Location = new System.Drawing.Point(330, 93); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem13.Size = new System.Drawing.Size(325, 31); this.layoutControlItem13.Size = new System.Drawing.Size(330, 31); this.layoutControlItem13.Text = "供应商"; this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem22 // this.layoutControlItem22.Control = this.txt_checkStates; this.layoutControlItem22.Location = new System.Drawing.Point(650, 62); this.layoutControlItem22.Location = new System.Drawing.Point(660, 62); this.layoutControlItem22.Name = "layoutControlItem22"; this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem22.Size = new System.Drawing.Size(325, 31); this.layoutControlItem22.Size = new System.Drawing.Size(330, 31); this.layoutControlItem22.Text = "检验状态"; this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem9 // this.layoutControlItem9.Control = this.txt_fbatchQty; this.layoutControlItem9.Location = new System.Drawing.Point(325, 62); this.layoutControlItem9.Location = new System.Drawing.Point(330, 62); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem9.Size = new System.Drawing.Size(325, 31); this.layoutControlItem9.Size = new System.Drawing.Size(330, 31); this.layoutControlItem9.Text = "收货数量"; this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_fcheckBy; this.layoutControlItem8.Location = new System.Drawing.Point(650, 31); this.layoutControlItem8.Location = new System.Drawing.Point(660, 31); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem8.Size = new System.Drawing.Size(325, 31); this.layoutControlItem8.Size = new System.Drawing.Size(330, 31); this.layoutControlItem8.Text = "检验人员"; this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_fcheckDate; this.layoutControlItem2.Location = new System.Drawing.Point(650, 0); this.layoutControlItem2.Location = new System.Drawing.Point(660, 0); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem2.Size = new System.Drawing.Size(325, 31); this.layoutControlItem2.Size = new System.Drawing.Size(330, 31); this.layoutControlItem2.Text = "检验日期"; this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_lotNo; this.layoutControlItem3.Location = new System.Drawing.Point(325, 0); this.layoutControlItem3.Location = new System.Drawing.Point(330, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem3.Size = new System.Drawing.Size(325, 31); this.layoutControlItem3.Size = new System.Drawing.Size(330, 31); this.layoutControlItem3.Text = "送检批号"; this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem24 // this.layoutControlItem24.Control = this.txt_cgdNo; this.layoutControlItem24.Location = new System.Drawing.Point(325, 31); this.layoutControlItem24.Location = new System.Drawing.Point(330, 31); this.layoutControlItem24.Name = "layoutControlItem24"; this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem24.Size = new System.Drawing.Size(325, 31); this.layoutControlItem24.Size = new System.Drawing.Size(330, 31); this.layoutControlItem24.Text = "采购单号"; this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem18 // this.layoutControlItem18.Control = this.txt_slOrg; this.layoutControlItem18.Location = new System.Drawing.Point(650, 124); this.layoutControlItem18.Location = new System.Drawing.Point(660, 124); this.layoutControlItem18.Name = "layoutControlItem18"; this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem18.Size = new System.Drawing.Size(325, 31); this.layoutControlItem18.Size = new System.Drawing.Size(330, 31); this.layoutControlItem18.Text = "收料组织"; this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem23 // this.layoutControlItem23.Control = this.txt_freceQty; this.layoutControlItem23.Location = new System.Drawing.Point(975, 93); this.layoutControlItem23.Location = new System.Drawing.Point(990, 93); this.layoutControlItem23.Name = "layoutControlItem23"; this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem23.Size = new System.Drawing.Size(326, 31); this.layoutControlItem23.Size = new System.Drawing.Size(332, 31); this.layoutControlItem23.Text = "判定结果"; this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem25 // this.layoutControlItem25.Control = this.txt_fngHandle; this.layoutControlItem25.Location = new System.Drawing.Point(975, 124); this.layoutControlItem25.Location = new System.Drawing.Point(990, 124); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem25.Size = new System.Drawing.Size(326, 31); this.layoutControlItem25.Size = new System.Drawing.Size(332, 31); this.layoutControlItem25.Text = "处理结果"; this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem26 // this.layoutControlItem26.Control = this.txt_fmrmode; this.layoutControlItem26.Location = new System.Drawing.Point(975, 155); this.layoutControlItem26.Location = new System.Drawing.Point(990, 155); this.layoutControlItem26.Name = "layoutControlItem26"; this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5; this.layoutControlItem26.Size = new System.Drawing.Size(326, 31); this.layoutControlItem26.Size = new System.Drawing.Size(332, 31); this.layoutControlItem26.Text = "退料方式"; this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem27 // this.layoutControlItem27.Control = this.btnYcReport; this.layoutControlItem27.Location = new System.Drawing.Point(650, 155); this.layoutControlItem27.Location = new System.Drawing.Point(660, 155); this.layoutControlItem27.MaxSize = new System.Drawing.Size(120, 31); this.layoutControlItem27.MinSize = new System.Drawing.Size(120, 31); this.layoutControlItem27.Name = "layoutControlItem27"; this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5; this.layoutControlItem27.Size = new System.Drawing.Size(325, 31); this.layoutControlItem27.Size = new System.Drawing.Size(330, 31); this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem27.Text = "查看异常报告"; this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem27.TextVisible = false; // // layoutControlItem28 // this.layoutControlItem28.Control = this.txt_fngDesc; this.layoutControlItem28.Location = new System.Drawing.Point(0, 155); this.layoutControlItem28.Name = "layoutControlItem28"; this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5; this.layoutControlItem28.OptionsTableLayoutItem.RowSpan = 2; this.layoutControlItem28.Size = new System.Drawing.Size(660, 56); this.layoutControlItem28.Text = "异常备注"; this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem28.TextVisible = false; // // xtraTabControl2 // @@ -1400,7 +1446,7 @@ this.xtraTabControl2.Location = new System.Drawing.Point(0, 0); this.xtraTabControl2.Name = "xtraTabControl2"; this.xtraTabControl2.SelectedTabPage = this.tabMxPage1; this.xtraTabControl2.Size = new System.Drawing.Size(1342, 474); this.xtraTabControl2.Size = new System.Drawing.Size(1342, 445); this.xtraTabControl2.TabIndex = 3; this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, @@ -1411,7 +1457,7 @@ this.tabMxPage1.Controls.Add(this.splitMx2); this.tabMxPage1.Controls.Add(this.panMsg); this.tabMxPage1.Name = "tabMxPage1"; this.tabMxPage1.Size = new System.Drawing.Size(1340, 442); this.tabMxPage1.Size = new System.Drawing.Size(1340, 413); this.tabMxPage1.Text = "抽样信息"; // // splitMx2 @@ -1430,7 +1476,7 @@ // this.splitMx2.Panel2.Controls.Add(this.splitYangLi); this.splitMx2.Panel2.Text = "Panel2"; this.splitMx2.Size = new System.Drawing.Size(1340, 395); this.splitMx2.Size = new System.Drawing.Size(1340, 366); this.splitMx2.SplitterPosition = 287; this.splitMx2.TabIndex = 3; // @@ -1695,7 +1741,7 @@ // this.splitYangLi.Panel2.Controls.Add(this.groupControl2); this.splitYangLi.Panel2.Text = "Panel2"; this.splitYangLi.Size = new System.Drawing.Size(1340, 96); this.splitYangLi.Size = new System.Drawing.Size(1340, 67); this.splitYangLi.SplitterPosition = 676; this.splitYangLi.TabIndex = 4; // @@ -1705,7 +1751,7 @@ this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.groupControl1.Location = new System.Drawing.Point(0, 0); this.groupControl1.Name = "groupControl1"; this.groupControl1.Size = new System.Drawing.Size(676, 96); this.groupControl1.Size = new System.Drawing.Size(676, 67); this.groupControl1.TabIndex = 3; this.groupControl1.Text = "检测结果"; // @@ -1715,7 +1761,7 @@ this.gcMx2.Location = new System.Drawing.Point(2, 28); this.gcMx2.MainView = this.gvMx2; this.gcMx2.Name = "gcMx2"; this.gcMx2.Size = new System.Drawing.Size(672, 66); this.gcMx2.Size = new System.Drawing.Size(672, 37); this.gcMx2.TabIndex = 0; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); @@ -1803,7 +1849,7 @@ this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill; this.groupControl2.Location = new System.Drawing.Point(0, 0); this.groupControl2.Name = "groupControl2"; this.groupControl2.Size = new System.Drawing.Size(652, 96); this.groupControl2.Size = new System.Drawing.Size(652, 67); this.groupControl2.TabIndex = 4; this.groupControl2.Text = "样本结果"; // @@ -1813,7 +1859,7 @@ this.gcMx3.Location = new System.Drawing.Point(2, 28); this.gcMx3.MainView = this.gvMx3; this.gcMx3.Name = "gcMx3"; this.gcMx3.Size = new System.Drawing.Size(648, 66); this.gcMx3.Size = new System.Drawing.Size(648, 37); this.gcMx3.TabIndex = 0; this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx3}); @@ -1984,10 +2030,10 @@ columnDefinition6, columnDefinition7, columnDefinition8}); rowDefinition7.Height = 100D; rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition8.Height = 100D; rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition7}); rowDefinition8}); this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0); this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43); this.layoutControlGroup1.TextVisible = false; @@ -2037,7 +2083,7 @@ // this.tabMxPage2.Controls.Add(this.ucUpFileList1); this.tabMxPage2.Name = "tabMxPage2"; this.tabMxPage2.Size = new System.Drawing.Size(1340, 458); this.tabMxPage2.Size = new System.Drawing.Size(1340, 413); this.tabMxPage2.Text = "附件信息"; // // ucUpFileList1 @@ -2047,7 +2093,7 @@ this.ucUpFileList1.Name = "ucUpFileList1"; this.ucUpFileList1.parentGroup = null; this.ucUpFileList1.pGuid = null; this.ucUpFileList1.Size = new System.Drawing.Size(1340, 458); this.ucUpFileList1.Size = new System.Drawing.Size(1340, 413); this.ucUpFileList1.TabIndex = 0; // // repositoryItemComboBox2 @@ -2160,6 +2206,7 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit(); this.xtraTabControl2.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -2351,5 +2398,8 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26; private DevExpress.XtraEditors.SimpleButton btnYcReport; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27; private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; private UserControl.UcDictionary txt_fngDesc; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28; } } DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -250,9 +250,9 @@ return; if (txt_fcheckResu.Text.Trim() == "不合格") { if (string.IsNullOrEmpty(txt_remarks.Text.Trim())) if (string.IsNullOrEmpty(txt_fngDesc.Text.Trim())) { MsgHelper.Warning("单据为不合格时，请填写备注说明！"); MsgHelper.Warning("单据为不合格时，请填写异常备注说明！"); return; } }; @@ -357,16 +357,16 @@ private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e) { toolBarMenu1.isSetBtn = false; if (txt_fcheckResu.Text.Trim() == "N:不合格" && string.IsNullOrEmpty(txt_remarks.Text.Trim())) if (txt_fcheckResu.Text.Trim() == "N:不合格" && string.IsNullOrEmpty(txt_fngDesc.Text.Trim())) { Gs.DevApp.ToolBox.MsgHelper.Warning("当检验结果不合格时，请填写备注说明！"); txt_remarks.Focus(); txt_fngDesc.Focus(); return; } var _obj = new { guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建 remarks = txt_remarks.Text.Trim(), fngDesc = txt_fngDesc.Text.Trim(), }; try { @@ -381,6 +381,7 @@ this.setEable(false); toolBarMenu1.currentAction = ""; Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); } } catch (Exception ex) @@ -454,7 +455,7 @@ if (_rtn.rtnCode > 0) { dynamic dy = _rtn.rtnData; btnYcReport.Tag = dy.toGuid.ToString(); btnYcReport.ToolTip = dy.toGuid.ToString(); lbGuid.Text = strGuid; List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>(); gvList.Add(gvMx1); @@ -566,7 +567,7 @@ public event EventHandler<UpdateParentEventArgs> ToUpdateParent; private void BtnYcReport_Click(object sender, EventArgs e) { string _toGuid = (btnYcReport.Tag == null ? "" : btnYcReport.Tag.ToString()); string _toGuid = (btnYcReport.ToolTip == null ? "" : btnYcReport.ToolTip.ToString()); if (string.IsNullOrEmpty(_toGuid)) { Gs.DevApp.ToolBox.MsgHelper.ShowInformation("该单无异常报告，查看失败！"); DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.Designer.cs
@@ -56,6 +56,7 @@ this.gv_lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -163,6 +164,7 @@ // split1 // this.split1.Dock = System.Windows.Forms.DockStyle.Fill; this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2; this.split1.Horizontal = false; this.split1.Location = new System.Drawing.Point(0, 0); this.split1.Name = "split1"; @@ -175,7 +177,8 @@ // // split1.Panel2 // this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Panel2.Text = "Panel2"; this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.split1.Size = new System.Drawing.Size(1167, 570); this.split1.SplitterPosition = 0; this.split1.TabIndex = 0; @@ -207,7 +210,8 @@ this.gv_lastupdateBy, this.gv_lastupdateDate, this.gv_checkUser, this.gv_checkDate}); this.gv_checkDate, this.gridColumn4}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -224,7 +228,7 @@ this.gridColumn1.OptionsColumn.AllowEdit = false; this.gridColumn1.Tag = "org.fnamber"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 0; this.gridColumn1.VisibleIndex = 6; this.gridColumn1.Width = 250; // // gv_status @@ -238,7 +242,7 @@ this.gv_status.Tag = "query_a.STATUS"; this.gv_status.UnboundDataType = typeof(bool); this.gv_status.Visible = true; this.gv_status.VisibleIndex = 1; this.gv_status.VisibleIndex = 0; this.gv_status.Width = 94; // // gv_itemId @@ -250,6 +254,8 @@ this.gv_itemId.Name = "gv_itemId"; this.gv_itemId.OptionsColumn.AllowEdit = false; this.gv_itemId.Tag = "query_a.ITEM_ID"; this.gv_itemId.Visible = true; this.gv_itemId.VisibleIndex = 1; this.gv_itemId.Width = 94; // // gv_itemNo @@ -312,7 +318,7 @@ this.gv_createBy.OptionsColumn.AllowEdit = false; this.gv_createBy.Tag = "query_a.CREATE_BY"; this.gv_createBy.Visible = true; this.gv_createBy.VisibleIndex = 6; this.gv_createBy.VisibleIndex = 7; this.gv_createBy.Width = 94; // // gv_createDate @@ -325,7 +331,7 @@ this.gv_createDate.OptionsColumn.AllowEdit = false; this.gv_createDate.Tag = "query_a.CREATE_DATE"; this.gv_createDate.Visible = true; this.gv_createDate.VisibleIndex = 7; this.gv_createDate.VisibleIndex = 8; this.gv_createDate.Width = 180; // // gv_lastupdateBy @@ -338,7 +344,7 @@ this.gv_lastupdateBy.OptionsColumn.AllowEdit = false; this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY"; this.gv_lastupdateBy.Visible = true; this.gv_lastupdateBy.VisibleIndex = 8; this.gv_lastupdateBy.VisibleIndex = 9; this.gv_lastupdateBy.Width = 94; // // gv_lastupdateDate @@ -351,7 +357,7 @@ this.gv_lastupdateDate.OptionsColumn.AllowEdit = false; this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE"; this.gv_lastupdateDate.Visible = true; this.gv_lastupdateDate.VisibleIndex = 9; this.gv_lastupdateDate.VisibleIndex = 10; this.gv_lastupdateDate.Width = 180; // // gv_checkUser @@ -364,7 +370,7 @@ this.gv_checkUser.OptionsColumn.AllowEdit = false; this.gv_checkUser.Tag = "query_a.CHECK_USER"; this.gv_checkUser.Visible = true; this.gv_checkUser.VisibleIndex = 10; this.gv_checkUser.VisibleIndex = 11; this.gv_checkUser.Width = 94; // // gv_checkDate @@ -377,8 +383,16 @@ this.gv_checkDate.OptionsColumn.AllowEdit = false; this.gv_checkDate.Tag = "query_a.CHECK_DATE"; this.gv_checkDate.Visible = true; this.gv_checkDate.VisibleIndex = 11; this.gv_checkDate.VisibleIndex = 12; this.gv_checkDate.Width = 120; // // gridColumn4 // this.gridColumn4.Caption = "主键Guid"; this.gridColumn4.FieldName = "guid"; this.gridColumn4.MinWidth = 25; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Width = 94; // // pageBar1 // @@ -404,7 +418,7 @@ this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitMx1.Horizontal = false; this.splitMx1.Location = new System.Drawing.Point(0, 0); this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Name = "splitMx1"; // // splitMx1.Panel1 // @@ -414,6 +428,7 @@ // splitMx1.Panel2 // this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1167, 570); this.splitMx1.SplitterPosition = 112; this.splitMx1.TabIndex = 0; @@ -657,7 +672,7 @@ this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem6.Size = new System.Drawing.Size(287, 30); this.layoutControlItem6.Text = "更新人"; this.layoutControlItem6.Text = "更新人员"; this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem7 @@ -678,7 +693,7 @@ this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem8.Size = new System.Drawing.Size(287, 30); this.layoutControlItem8.Text = "审核人"; this.layoutControlItem8.Text = "审核人员"; this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem9 @@ -815,5 +830,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; } } DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaMj.cs
@@ -15,11 +15,13 @@ { string _webServiceName = "MesQaMjManager/"; List<FilterEntity> _filterList = new List<FilterEntity>(); string _ucItem = "";//物料 string _ucGys = "";//物料 public Frm_MesQaMj() { InitializeComponent(); this.toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick; this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; //this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick; this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick; this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick; this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1; @@ -46,8 +48,8 @@ string _orgId = txt_fSubsidiary.GetId(); if (string.IsNullOrEmpty(_orgId)) return; txt_suppId.getSuppler(_orgId); txt_itemId.getSuppler(_orgId); txt_suppId.getSuppler(_orgId,_ucGys); txt_itemId.getSuppler(_orgId,_ucItem); }; txt_itemId.EditChanged += (s, e) => { @@ -120,7 +122,7 @@ private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e) { string rowGuid = "", rowName = ""; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1); (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemNo"); if (string.IsNullOrEmpty(rowGuid)) { ToolBox.MsgHelper.Warning("请先选择你要操作的行！"); @@ -336,8 +338,12 @@ if (_rtn.rtnCode > 0) { dynamic dy = _rtn.rtnData; _ucItem = dy.itemId; _ucGys = dy.suppId; lbGuid.Text = strGuid; UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit); _ucItem =""; _ucGys = ""; } else ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg); @@ -388,7 +394,7 @@ }; toolBarMenu1.guidKey = ""; string rowGuid, rowName; (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemName"); (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemNo"); if (string.IsNullOrEmpty(rowGuid)) { MsgHelper.Warning("请先选择你要操作的行！"); @@ -412,9 +418,11 @@ if (_rtn.rtnCode > 0) { if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim()); else getPageList(this.pageBar1.CurrentPage); } int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid); gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "status", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString()); } } DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -30,12 +30,8 @@ /// </summary> private void InitializeComponent() { this.SuspendLayout(); // this.jyxm1 = new QC.Jyxm("iqc"); this.jyxm1 = new QC.Jyxm("iqc"); this.SuspendLayout(); // // jyxm1 // @@ -44,6 +40,7 @@ this.jyxm1.Name = "jyxm1"; this.jyxm1.Size = new System.Drawing.Size(1044, 711); this.jyxm1.TabIndex = 0; // // Frm_MesQmCheckitemDt // DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -9,5 +9,6 @@ InitializeComponent(); } } } DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
@@ -85,10 +85,10 @@ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -154,10 +154,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); @@ -509,7 +509,7 @@ // btnCopy // this.btnCopy.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.chartswitchrowcolumn_16x16; this.btnCopy.Location = new System.Drawing.Point(554, 43); this.btnCopy.Location = new System.Drawing.Point(554, 74); this.btnCopy.Name = "btnCopy"; this.btnCopy.Size = new System.Drawing.Size(131, 27); this.btnCopy.StyleController = this.layoutMx1; @@ -611,7 +611,7 @@ // // txt_isenabled // this.txt_isenabled.Location = new System.Drawing.Point(554, 74); this.txt_isenabled.Location = new System.Drawing.Point(554, 43); this.txt_isenabled.Name = "txt_isenabled"; this.txt_isenabled.Properties.Caption = "可用标识"; this.txt_isenabled.Size = new System.Drawing.Size(267, 24); @@ -641,10 +641,10 @@ this.layoutControlItem10, this.layoutControlItem11, this.layoutControlItem12, this.layoutControlItem14, this.layoutControlItem3, this.layoutControlItem7, this.layoutControlItem8, this.layoutControlItem14, this.layoutControlItem5}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; @@ -737,6 +737,21 @@ this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem12.TextVisible = false; // // layoutControlItem14 // this.layoutControlItem14.Control = this.btnCopy; this.layoutControlItem14.Location = new System.Drawing.Point(542, 62); this.layoutControlItem14.MaxSize = new System.Drawing.Size(135, 31); this.layoutControlItem14.MinSize = new System.Drawing.Size(135, 31); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem14.Size = new System.Drawing.Size(271, 31); this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem14.Text = "复制"; this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem14.TextVisible = false; // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_ftype; @@ -744,7 +759,7 @@ this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem3.Size = new System.Drawing.Size(271, 31); this.layoutControlItem3.Text = "类别"; this.layoutControlItem3.Text = "项目分类"; this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem7 @@ -768,29 +783,15 @@ this.layoutControlItem8.Text = "物料规格"; this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.btnCopy; this.layoutControlItem14.Location = new System.Drawing.Point(542, 31); this.layoutControlItem14.MaxSize = new System.Drawing.Size(135, 31); this.layoutControlItem14.MinSize = new System.Drawing.Size(135, 31); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem14.Size = new System.Drawing.Size(271, 31); this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem14.Text = "复制"; this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem14.TextVisible = false; // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_isenabled; this.layoutControlItem5.Location = new System.Drawing.Point(542, 62); this.layoutControlItem5.Location = new System.Drawing.Point(542, 31); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem5.Size = new System.Drawing.Size(271, 31); this.layoutControlItem5.Text = "可用标识"; this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem5.TextVisible = false; // @@ -1161,10 +1162,10 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); @@ -1255,11 +1256,11 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraEditors.CheckEdit txt_isenabled; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; private DevExpress.XtraEditors.CheckEdit txt_isenabled; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; } } DevApp/Gs.DevApp/DevFrm/QC/Jyxm.cs
@@ -18,6 +18,7 @@ public partial class Jyxm : DevExpress.XtraEditors.XtraUserControl { private List<FilterEntity> _filterList = new List<FilterEntity>(); string _ucItem = "";//物料 private readonly string _webServiceName = "MesQmCheckitemManager/"; public string strType = "";//iqc type public decimal dfValue = 1; //iqc的样品数量默认5，否则1 @@ -70,6 +71,11 @@ if ((lbGuid.Text.Trim().Length < 10)) { Gs.DevApp.ToolBox.MsgHelper.ShowInformation("请先保存当前信息！"); return; } if ((txt_foneChecked.Checked==false)) { Gs.DevApp.ToolBox.MsgHelper.ShowInformation("该项目未审核，暂不能复制到其它物料！"); return; } JyxmShow frm = new JyxmShow(lbGuid.Text.Trim(), strType); @@ -453,11 +459,12 @@ if (_rtn.rtnCode > 0) { var dy = _rtn.rtnData; _ucItem = dy.itemId; lbGuid.Text = strGuid; var gvList = new List<GridView>(); gvList.Add(gvMx1); UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList); UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList); _ucItem = ""; var _job = JObject.Parse(strJson); var array = new JArray(); foreach (var a in _job["rtnData"]["list"]) array.Add(a); @@ -528,7 +535,7 @@ _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_inFieldValue < 0 && _rtn.rtnCode > 0) { if (xtraTabControl1.SelectedTabPageIndex == 0) @@ -565,9 +572,7 @@ string _orgId = txt_fSubsidiary.GetId(); if (string.IsNullOrEmpty(_orgId)) return; txt_itemId.getSuppler(_orgId); //txt_gg.Text =""; //txt_itemNo.Text = ""; txt_itemId.getSuppler(_orgId, _ucItem, " ", strType); }; txt_itemId.EditChanged += (s, e) => { DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.Designer.cs
@@ -75,7 +75,6 @@ this.gv_salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_orderLineId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); this.panBom = new DevExpress.XtraEditors.PanelControl(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.splitRight = new DevExpress.XtraEditors.SplitContainerControl(); @@ -481,8 +480,7 @@ this.gv2, this.gv_salesOrderId, this.gv_orderLineId, this.gv_itemId, this.gridColumn2}); this.gv_itemId}); this.gvMain.GridControl = this.gcMain; this.gvMain.IndicatorWidth = 50; this.gvMain.Name = "gvMain"; @@ -518,7 +516,7 @@ this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Tag = "org.FNumber"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 5; this.gridColumn1.VisibleIndex = 4; this.gridColumn1.Width = 50; // // gv2 @@ -566,22 +564,6 @@ this.gv_itemId.OptionsColumn.AllowEdit = false; this.gv_itemId.Tag = "a.item_model"; this.gv_itemId.Width = 50; // // gridColumn2 // this.gridColumn2.AppearanceCell.ForeColor = System.Drawing.Color.Red; this.gridColumn2.AppearanceCell.Options.UseForeColor = true; this.gridColumn2.AppearanceHeader.ForeColor = System.Drawing.Color.Red; this.gridColumn2.AppearanceHeader.Options.UseForeColor = true; this.gridColumn2.Caption = "配置次数"; this.gridColumn2.FieldName = "jyxm"; this.gridColumn2.MaxWidth = 50; this.gridColumn2.MinWidth = 50; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.OptionsColumn.ReadOnly = true; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 4; this.gridColumn2.Width = 50; // // panBom // @@ -839,7 +821,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gv_salesOrderId; private DevExpress.XtraGrid.Columns.GridColumn gv_orderLineId; private DevExpress.XtraGrid.Columns.GridColumn gv_itemId; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private UserControls.Data.UcPageBar pageBar1; private DevExpress.XtraGrid.Columns.GridColumn colChkInt; private DevExpress.XtraGrid.GridControl gcMx1; DevApp/Gs.DevApp/DevFrm/QC/JyxmShow.cs
@@ -92,7 +92,7 @@ } var _obj = new { sourceGuid = UtilityHelper.ToGuid(_sourceGuid), sourceGuid = UtilityHelper.ToGuid(sourceGuid), itemGuids = _sbGuids.ToString(), iqcType = this.strType, }; @@ -152,7 +152,9 @@ /// <param name="pageSize">每页几条</param> private void getPageList(int curPage) { gcMain.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); gcMain.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); _sbSqlWhere += " and q.guid is null"; var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "item_no", "asc", "", _sbSqlWhere.ToString(), strType); var json = JsonConvert.SerializeObject(pgq); try DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -76,7 +76,6 @@ string _orgId = txt_fapporgid.GetId(); string _orgName = txt_fapporgid.GetName(); if (string.IsNullOrEmpty(_orgId)) return; gvMx1.SetFocusedRowCellValue("dcOrg", _orgName); gvMx1.SetFocusedRowCellValue("dcOrgGuid", _orgId); gvMx1.SetFocusedRowCellValue("drOrg", _orgName); DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -75,7 +75,6 @@ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvcol6 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); this.pageBar1 = new UserControls.Data.UcPageBar(); this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); @@ -90,6 +89,10 @@ this.txt_cancellationStatusTxt = new DevExpress.XtraEditors.TextEdit(); this.txt_dptName = new DevExpress.XtraEditors.TextEdit(); this.txt_purchaseDate = new DevExpress.XtraEditors.TextEdit(); this.txt_docStusTxt = new DevExpress.XtraEditors.TextEdit(); this.txt_createDate = new DevExpress.XtraEditors.TextEdit(); this.txt_erpCheckDate = new DevExpress.XtraEditors.TextEdit(); this.txt_erpCheckBy = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); @@ -99,6 +102,12 @@ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -116,7 +125,6 @@ this.gvMx1latestDeliveryDate = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1purchaseQty = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1purchaseUnit = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1remainingReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1inventoryUnit = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1demandDocumentId = new DevExpress.XtraGrid.Columns.GridColumn(); this.gvMx1isGift = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -143,16 +151,6 @@ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.txt_docStusTxt = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.txt_createDate = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.txt_erpCheckDate = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.txt_erpCheckBy = new DevExpress.XtraEditors.TextEdit(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -181,6 +179,10 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_cancellationStatusTxt.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_purchaseDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_docStusTxt.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); @@ -190,22 +192,18 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_docStusTxt.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -315,8 +313,7 @@ this.gridColumn4, this.gridColumn5, this.gridColumn7, this.gvcol6, this.gridColumn9}); this.gvcol6}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -724,16 +721,6 @@ this.gvcol6.Name = "gvcol6"; this.gvcol6.Width = 94; // // gridColumn9 // this.gridColumn9.Caption = "同步时间"; this.gridColumn9.FieldName = "createDate"; this.gridColumn9.MinWidth = 25; this.gridColumn9.Name = "gridColumn9"; this.gridColumn9.Visible = true; this.gridColumn9.VisibleIndex = 31; this.gridColumn9.Width = 94; // // pageBar1 // this.pageBar1.CurrentPage = 1; @@ -811,7 +798,7 @@ // // txt_billNo // this.txt_billNo.Location = new System.Drawing.Point(109, 8); this.txt_billNo.Location = new System.Drawing.Point(109, 12); this.txt_billNo.Name = "txt_billNo"; this.txt_billNo.Properties.Appearance.Options.UseFont = true; this.txt_billNo.Size = new System.Drawing.Size(229, 24); @@ -828,7 +815,7 @@ // // txt_suppName // this.txt_suppName.Location = new System.Drawing.Point(769, 8); this.txt_suppName.Location = new System.Drawing.Point(769, 12); this.txt_suppName.Name = "txt_suppName"; this.txt_suppName.Size = new System.Drawing.Size(229, 24); this.txt_suppName.StyleController = this.layoutMx1; @@ -836,7 +823,7 @@ // // txt_documentTypeTxt // this.txt_documentTypeTxt.Location = new System.Drawing.Point(439, 8); this.txt_documentTypeTxt.Location = new System.Drawing.Point(439, 12); this.txt_documentTypeTxt.Name = "txt_documentTypeTxt"; this.txt_documentTypeTxt.Size = new System.Drawing.Size(229, 24); this.txt_documentTypeTxt.StyleController = this.layoutMx1; @@ -844,7 +831,7 @@ // // txt_suppNo // this.txt_suppNo.Location = new System.Drawing.Point(769, 36); this.txt_suppNo.Location = new System.Drawing.Point(769, 40); this.txt_suppNo.Name = "txt_suppNo"; this.txt_suppNo.Size = new System.Drawing.Size(229, 24); this.txt_suppNo.StyleController = this.layoutMx1; @@ -852,7 +839,7 @@ // // txt_closeStatusTxt // this.txt_closeStatusTxt.Location = new System.Drawing.Point(1099, 36); this.txt_closeStatusTxt.Location = new System.Drawing.Point(1099, 40); this.txt_closeStatusTxt.Name = "txt_closeStatusTxt"; this.txt_closeStatusTxt.Size = new System.Drawing.Size(231, 24); this.txt_closeStatusTxt.StyleController = this.layoutMx1; @@ -860,7 +847,7 @@ // // txt_cancellationStatusTxt // this.txt_cancellationStatusTxt.Location = new System.Drawing.Point(1099, 64); this.txt_cancellationStatusTxt.Location = new System.Drawing.Point(1099, 68); this.txt_cancellationStatusTxt.Name = "txt_cancellationStatusTxt"; this.txt_cancellationStatusTxt.Size = new System.Drawing.Size(231, 24); this.txt_cancellationStatusTxt.StyleController = this.layoutMx1; @@ -868,7 +855,7 @@ // // txt_dptName // this.txt_dptName.Location = new System.Drawing.Point(109, 36); this.txt_dptName.Location = new System.Drawing.Point(109, 40); this.txt_dptName.Name = "txt_dptName"; this.txt_dptName.Size = new System.Drawing.Size(229, 24); this.txt_dptName.StyleController = this.layoutMx1; @@ -876,11 +863,43 @@ // // txt_purchaseDate // this.txt_purchaseDate.Location = new System.Drawing.Point(439, 36); this.txt_purchaseDate.Location = new System.Drawing.Point(439, 40); this.txt_purchaseDate.Name = "txt_purchaseDate"; this.txt_purchaseDate.Size = new System.Drawing.Size(229, 24); this.txt_purchaseDate.StyleController = this.layoutMx1; this.txt_purchaseDate.TabIndex = 237; // // txt_docStusTxt // this.txt_docStusTxt.Location = new System.Drawing.Point(1099, 12); this.txt_docStusTxt.Name = "txt_docStusTxt"; this.txt_docStusTxt.Size = new System.Drawing.Size(231, 24); this.txt_docStusTxt.StyleController = this.layoutMx1; this.txt_docStusTxt.TabIndex = 238; // // txt_createDate // this.txt_createDate.Location = new System.Drawing.Point(769, 68); this.txt_createDate.Name = "txt_createDate"; this.txt_createDate.Size = new System.Drawing.Size(229, 24); this.txt_createDate.StyleController = this.layoutMx1; this.txt_createDate.TabIndex = 239; // // txt_erpCheckDate // this.txt_erpCheckDate.Location = new System.Drawing.Point(439, 68); this.txt_erpCheckDate.Name = "txt_erpCheckDate"; this.txt_erpCheckDate.Size = new System.Drawing.Size(229, 24); this.txt_erpCheckDate.StyleController = this.layoutMx1; this.txt_erpCheckDate.TabIndex = 240; // // txt_erpCheckBy // this.txt_erpCheckBy.Location = new System.Drawing.Point(109, 68); this.txt_erpCheckBy.Name = "txt_erpCheckBy"; this.txt_erpCheckBy.Size = new System.Drawing.Size(229, 24); this.txt_erpCheckBy.StyleController = this.layoutMx1; this.txt_erpCheckBy.TabIndex = 241; // // layoutControlItem3 // @@ -1009,6 +1028,70 @@ this.layoutControlItem10.Text = "采购日期"; this.layoutControlItem10.TextSize = new System.Drawing.Size(85, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_cancellationStatusTxt; this.layoutControlItem8.Location = new System.Drawing.Point(990, 56); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem8.Size = new System.Drawing.Size(332, 28); this.layoutControlItem8.Text = "作废状态"; this.layoutControlItem8.TextSize = new System.Drawing.Size(85, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_closeStatusTxt; this.layoutControlItem7.Location = new System.Drawing.Point(990, 28); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem7.Size = new System.Drawing.Size(332, 28); this.layoutControlItem7.Text = "关闭状态"; this.layoutControlItem7.TextSize = new System.Drawing.Size(85, 18); // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_docStusTxt; this.layoutControlItem11.Location = new System.Drawing.Point(990, 0); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem11.Size = new System.Drawing.Size(332, 28); this.layoutControlItem11.Text = "单据状态"; this.layoutControlItem11.TextSize = new System.Drawing.Size(85, 18); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_createDate; this.layoutControlItem12.Location = new System.Drawing.Point(660, 56); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem12.Size = new System.Drawing.Size(330, 28); this.layoutControlItem12.Text = "同步时间"; this.layoutControlItem12.TextSize = new System.Drawing.Size(85, 18); // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_erpCheckDate; this.layoutControlItem13.Location = new System.Drawing.Point(330, 56); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem13.Size = new System.Drawing.Size(330, 28); this.layoutControlItem13.Text = "ERP审核时间"; this.layoutControlItem13.TextSize = new System.Drawing.Size(85, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_erpCheckBy; this.layoutControlItem14.Location = new System.Drawing.Point(0, 56); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem14.Size = new System.Drawing.Size(330, 28); this.layoutControlItem14.Text = "ERP审核人"; this.layoutControlItem14.TextSize = new System.Drawing.Size(85, 18); // // tabMx // this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1057,7 +1140,6 @@ this.gvMx1latestDeliveryDate, this.gvMx1purchaseQty, this.gvMx1purchaseUnit, this.gvMx1remainingReceivedQty, this.gvMx1inventoryUnit, this.gvMx1demandDocumentId, this.gvMx1isGift, @@ -1117,7 +1199,7 @@ this.gvMx1salesOrderId.Name = "gvMx1salesOrderId"; this.gvMx1salesOrderId.Tag = "query_a.SALES_ORDER_ID"; this.gvMx1salesOrderId.Visible = true; this.gvMx1salesOrderId.VisibleIndex = 29; this.gvMx1salesOrderId.VisibleIndex = 28; this.gvMx1salesOrderId.Width = 69; // // gvMx1itemId @@ -1234,18 +1316,6 @@ this.gvMx1purchaseUnit.VisibleIndex = 11; this.gvMx1purchaseUnit.Width = 25; // // gvMx1remainingReceivedQty // this.gvMx1remainingReceivedQty.AppearanceCell.Options.UseFont = true; this.gvMx1remainingReceivedQty.Caption = "剩余收货数量"; this.gvMx1remainingReceivedQty.FieldName = "remainingReceivedQty"; this.gvMx1remainingReceivedQty.MinWidth = 25; this.gvMx1remainingReceivedQty.Name = "gvMx1remainingReceivedQty"; this.gvMx1remainingReceivedQty.Tag = "query_a.REMAINING_RECEIVED_QTY"; this.gvMx1remainingReceivedQty.Visible = true; this.gvMx1remainingReceivedQty.VisibleIndex = 12; this.gvMx1remainingReceivedQty.Width = 32; // // gvMx1inventoryUnit // this.gvMx1inventoryUnit.AppearanceCell.Options.UseFont = true; @@ -1255,7 +1325,7 @@ this.gvMx1inventoryUnit.Name = "gvMx1inventoryUnit"; this.gvMx1inventoryUnit.Tag = "query_a.INVENTORY_UNIT"; this.gvMx1inventoryUnit.Visible = true; this.gvMx1inventoryUnit.VisibleIndex = 13; this.gvMx1inventoryUnit.VisibleIndex = 12; this.gvMx1inventoryUnit.Width = 25; // // gvMx1demandDocumentId @@ -1267,7 +1337,7 @@ this.gvMx1demandDocumentId.Name = "gvMx1demandDocumentId"; this.gvMx1demandDocumentId.Tag = "query_a.DEMAND_DOCUMENT_ID"; this.gvMx1demandDocumentId.Visible = true; this.gvMx1demandDocumentId.VisibleIndex = 14; this.gvMx1demandDocumentId.VisibleIndex = 13; this.gvMx1demandDocumentId.Width = 46; // // gvMx1isGift @@ -1279,7 +1349,7 @@ this.gvMx1isGift.Name = "gvMx1isGift"; this.gvMx1isGift.Tag = "query_a.IS_GIFT"; this.gvMx1isGift.Visible = true; this.gvMx1isGift.VisibleIndex = 15; this.gvMx1isGift.VisibleIndex = 14; this.gvMx1isGift.Width = 25; // // gvMx1remarks @@ -1291,7 +1361,7 @@ this.gvMx1remarks.Name = "gvMx1remarks"; this.gvMx1remarks.Tag = "query_a.REMARKS"; this.gvMx1remarks.Visible = true; this.gvMx1remarks.VisibleIndex = 16; this.gvMx1remarks.VisibleIndex = 15; this.gvMx1remarks.Width = 46; // // gvMx1businessTerminate @@ -1315,7 +1385,7 @@ this.gvMx1businessClose.Name = "gvMx1businessClose"; this.gvMx1businessClose.Tag = "query_a.BUSINESS_CLOSE"; this.gvMx1businessClose.Visible = true; this.gvMx1businessClose.VisibleIndex = 17; this.gvMx1businessClose.VisibleIndex = 16; this.gvMx1businessClose.Width = 25; // // gvMx1businessFreeze @@ -1327,7 +1397,7 @@ this.gvMx1businessFreeze.Name = "gvMx1businessFreeze"; this.gvMx1businessFreeze.Tag = "query_a.BUSINESS_FREEZE"; this.gvMx1businessFreeze.Visible = true; this.gvMx1businessFreeze.VisibleIndex = 18; this.gvMx1businessFreeze.VisibleIndex = 17; this.gvMx1businessFreeze.Width = 25; // // gvMx1freezer @@ -1379,7 +1449,7 @@ this.gvMx1totalReceivedQty.Name = "gvMx1totalReceivedQty"; this.gvMx1totalReceivedQty.Tag = "query_a.TOTAL_RECEIVED_QTY"; this.gvMx1totalReceivedQty.Visible = true; this.gvMx1totalReceivedQty.VisibleIndex = 19; this.gvMx1totalReceivedQty.VisibleIndex = 18; this.gvMx1totalReceivedQty.Width = 32; // // gridColumn10 @@ -1389,7 +1459,7 @@ this.gridColumn10.MinWidth = 25; this.gridColumn10.Name = "gridColumn10"; this.gridColumn10.Visible = true; this.gridColumn10.VisibleIndex = 20; this.gridColumn10.VisibleIndex = 19; this.gridColumn10.Width = 37; // // gvMx1totalStoredQty @@ -1401,7 +1471,7 @@ this.gvMx1totalStoredQty.Name = "gvMx1totalStoredQty"; this.gvMx1totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY"; this.gvMx1totalStoredQty.Visible = true; this.gvMx1totalStoredQty.VisibleIndex = 21; this.gvMx1totalStoredQty.VisibleIndex = 20; this.gvMx1totalStoredQty.Width = 28; // // gvMx1remainingStoredQty @@ -1413,7 +1483,7 @@ this.gvMx1remainingStoredQty.Name = "gvMx1remainingStoredQty"; this.gvMx1remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY"; this.gvMx1remainingStoredQty.Visible = true; this.gvMx1remainingStoredQty.VisibleIndex = 22; this.gvMx1remainingStoredQty.VisibleIndex = 21; this.gvMx1remainingStoredQty.Width = 32; // // gvMx1totalReturnedQty @@ -1425,7 +1495,7 @@ this.gvMx1totalReturnedQty.Name = "gvMx1totalReturnedQty"; this.gvMx1totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY"; this.gvMx1totalReturnedQty.Visible = true; this.gvMx1totalReturnedQty.VisibleIndex = 23; this.gvMx1totalReturnedQty.VisibleIndex = 22; this.gvMx1totalReturnedQty.Width = 32; // // gvMx1returnableReceivedQty @@ -1437,7 +1507,7 @@ this.gvMx1returnableReceivedQty.Name = "gvMx1returnableReceivedQty"; this.gvMx1returnableReceivedQty.Tag = "query_a.RETURNABLE_RECEIVED_QTY"; this.gvMx1returnableReceivedQty.Visible = true; this.gvMx1returnableReceivedQty.VisibleIndex = 24; this.gvMx1returnableReceivedQty.VisibleIndex = 23; this.gvMx1returnableReceivedQty.Width = 32; // // gvMx1returnableStoredQty @@ -1449,7 +1519,7 @@ this.gvMx1returnableStoredQty.Name = "gvMx1returnableStoredQty"; this.gvMx1returnableStoredQty.Tag = "query_a.RETURNABLE_STORED_QTY"; this.gvMx1returnableStoredQty.Visible = true; this.gvMx1returnableStoredQty.VisibleIndex = 25; this.gvMx1returnableStoredQty.VisibleIndex = 24; this.gvMx1returnableStoredQty.Width = 32; // // gvMx1sourceDocumentType @@ -1461,7 +1531,7 @@ this.gvMx1sourceDocumentType.Name = "gvMx1sourceDocumentType"; this.gvMx1sourceDocumentType.Tag = "query_a.SOURCE_DOCUMENT_TYPE"; this.gvMx1sourceDocumentType.Visible = true; this.gvMx1sourceDocumentType.VisibleIndex = 26; this.gvMx1sourceDocumentType.VisibleIndex = 25; this.gvMx1sourceDocumentType.Width = 36; // // gvMx1planTrackingId @@ -1473,7 +1543,7 @@ this.gvMx1planTrackingId.Name = "gvMx1planTrackingId"; this.gvMx1planTrackingId.Tag = "query_a.PLAN_TRACKING_ID"; this.gvMx1planTrackingId.Visible = true; this.gvMx1planTrackingId.VisibleIndex = 27; this.gvMx1planTrackingId.VisibleIndex = 26; this.gvMx1planTrackingId.Width = 46; // // gvMx1changeFlag @@ -1485,7 +1555,7 @@ this.gvMx1changeFlag.Name = "gvMx1changeFlag"; this.gvMx1changeFlag.Tag = "query_a.CHANGE_FLAG"; this.gvMx1changeFlag.Visible = true; this.gvMx1changeFlag.VisibleIndex = 28; this.gvMx1changeFlag.VisibleIndex = 27; this.gvMx1changeFlag.Width = 25; // // gvMx1demandDocumentLineId @@ -1513,7 +1583,7 @@ this.gridColumn8.MinWidth = 25; this.gridColumn8.Name = "gridColumn8"; this.gridColumn8.Visible = true; this.gridColumn8.VisibleIndex = 30; this.gridColumn8.VisibleIndex = 29; this.gridColumn8.Width = 43; // // picCheckBox @@ -1526,102 +1596,6 @@ this.picCheckBox.TabIndex = 229; this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_cancellationStatusTxt; this.layoutControlItem8.Location = new System.Drawing.Point(990, 56); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem8.Size = new System.Drawing.Size(332, 28); this.layoutControlItem8.Text = "作废状态"; this.layoutControlItem8.TextSize = new System.Drawing.Size(85, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_closeStatusTxt; this.layoutControlItem7.Location = new System.Drawing.Point(990, 28); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem7.Size = new System.Drawing.Size(332, 28); this.layoutControlItem7.Text = "关闭状态"; this.layoutControlItem7.TextSize = new System.Drawing.Size(85, 18); // // txt_docStusTxt // this.txt_docStusTxt.Location = new System.Drawing.Point(1099, 8); this.txt_docStusTxt.Name = "txt_docStusTxt"; this.txt_docStusTxt.Size = new System.Drawing.Size(231, 24); this.txt_docStusTxt.StyleController = this.layoutMx1; this.txt_docStusTxt.TabIndex = 238; // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_docStusTxt; this.layoutControlItem11.Location = new System.Drawing.Point(990, 0); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem11.Size = new System.Drawing.Size(332, 28); this.layoutControlItem11.Text = "单据状态"; this.layoutControlItem11.TextSize = new System.Drawing.Size(85, 18); // // txt_createDate // this.txt_createDate.Location = new System.Drawing.Point(769, 64); this.txt_createDate.Name = "txt_createDate"; this.txt_createDate.Size = new System.Drawing.Size(229, 24); this.txt_createDate.StyleController = this.layoutMx1; this.txt_createDate.TabIndex = 239; // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_createDate; this.layoutControlItem12.Location = new System.Drawing.Point(660, 56); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem12.Size = new System.Drawing.Size(330, 28); this.layoutControlItem12.Text = "同步时间"; this.layoutControlItem12.TextSize = new System.Drawing.Size(85, 18); // // txt_erpCheckDate // this.txt_erpCheckDate.Location = new System.Drawing.Point(439, 64); this.txt_erpCheckDate.Name = "txt_erpCheckDate"; this.txt_erpCheckDate.Size = new System.Drawing.Size(229, 24); this.txt_erpCheckDate.StyleController = this.layoutMx1; this.txt_erpCheckDate.TabIndex = 240; // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_erpCheckDate; this.layoutControlItem13.Location = new System.Drawing.Point(330, 56); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem13.Size = new System.Drawing.Size(330, 28); this.layoutControlItem13.Text = "ERP审核时间"; this.layoutControlItem13.TextSize = new System.Drawing.Size(85, 18); // // txt_erpCheckBy // this.txt_erpCheckBy.Location = new System.Drawing.Point(109, 64); this.txt_erpCheckBy.Name = "txt_erpCheckBy"; this.txt_erpCheckBy.Size = new System.Drawing.Size(229, 24); this.txt_erpCheckBy.StyleController = this.layoutMx1; this.txt_erpCheckBy.TabIndex = 241; // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_erpCheckBy; this.layoutControlItem14.Location = new System.Drawing.Point(0, 56); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem14.Size = new System.Drawing.Size(330, 28); this.layoutControlItem14.Text = "ERP审核人"; this.layoutControlItem14.TextSize = new System.Drawing.Size(85, 18); // // Frm_MesRohIn // @@ -1661,6 +1635,10 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_cancellationStatusTxt.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_purchaseDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_docStusTxt.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); @@ -1670,22 +1648,18 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_docStusTxt.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); this.ResumeLayout(false); } @@ -1753,7 +1727,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gvMx1latestDeliveryDate; private DevExpress.XtraGrid.Columns.GridColumn gvMx1purchaseQty; private DevExpress.XtraGrid.Columns.GridColumn gvMx1purchaseUnit; private DevExpress.XtraGrid.Columns.GridColumn gvMx1remainingReceivedQty; private DevExpress.XtraGrid.Columns.GridColumn gvMx1inventoryUnit; private DevExpress.XtraGrid.Columns.GridColumn gvMx1demandDocumentId; private DevExpress.XtraGrid.Columns.GridColumn gvMx1isGift; @@ -1781,7 +1754,6 @@ private System.Windows.Forms.Label lbGuid; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.Utils.ToolTipController tips; private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4; private DevExpress.XtraEditors.TextEdit txt_suppName; private DevExpress.XtraEditors.TextEdit txt_documentTypeTxt; DevApp/Gs.DevApp/UserControl/UcLookItems.cs
@@ -28,17 +28,20 @@ if (EditChanged != null) EditChanged(this, e); } public void getSuppler(string orgId) public void getSuppler(string orgId, string _dftVale = "",string strWhere="",string strType="") { string _keyWhere = ""; if (!string.IsNullOrEmpty(orgId)) _keyWhere = " and a.FSubsidiary ='" + orgId + "'"; if (!string.IsNullOrEmpty(strWhere)) _keyWhere += strWhere; var _obj = new { currentPage = 1, everyPageSize = 999999, sortName = "", keyWhere = _keyWhere, keyType= strType }; var json = JsonConvert.SerializeObject(_obj); try @@ -52,6 +55,8 @@ lookSearchSupplier.Properties.ValueMember = "id"; lookSearchSupplier.ForceInitialize(); lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup; if (!string.IsNullOrEmpty(_dftVale)) SetIdOrCode(_dftVale); } catch (Exception ex) { DevApp/Gs.DevApp/UserControl/UcPageBar.cs
@@ -125,7 +125,7 @@ { layoutControlItem6.Visibility = LayoutVisibility.Never; emptySpaceItem4.Visibility = LayoutVisibility.Never; layoutControlItem12.Visibility = LayoutVisibility.Never; // layoutControlItem12.Visibility = LayoutVisibility.Never; emptySpaceItem1.Visibility = LayoutVisibility.Never; layoutControlItem7.Visibility = LayoutVisibility.Never; emptySpaceItem3.Visibility = LayoutVisibility.Never;
