DevApp/Gs.DevApp/App.config
@@ -35,9 +35,9 @@ </assemblyBinding> </runtime> <appSettings> <add key="WebApiUrl" value="http://localhost:5263/" /> <!--<add key="WebApiUrl" value="http://localhost:5263/" />--> <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />--> <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> <add key="WebApiUrl" value="http://192.168.1.145:81/" /> <add key="LogPath" value="logs" /> <add key="ProductName" value="G-MES V2.0" /> <add key="PageSize" value="50" /> DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -42,12 +42,11 @@ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition9 = 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 rowDefinition10 = new DevExpress.XtraLayout.RowDefinition(); DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition(); this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu(); this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl(); @@ -85,7 +84,6 @@ this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage(); this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl(); this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl(); this.txt_fmrmode = new Gs.DevApp.UserControl.UcLookGx(); this.txt_fzrId = new Gs.DevApp.UserControl.UcLookStaff(); this.txt_zrType = new DevExpress.XtraEditors.ComboBoxEdit(); this.txt_fngHandle = new DevExpress.XtraEditors.ComboBoxEdit(); @@ -131,7 +129,6 @@ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -151,10 +148,8 @@ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem(); this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); @@ -221,6 +216,10 @@ this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit(); this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); @@ -282,7 +281,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); @@ -302,10 +300,8 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit(); this.xtraTabControl2.SuspendLayout(); @@ -350,6 +346,10 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); this.SuspendLayout(); // // repositoryItemComboBox1 @@ -812,12 +812,11 @@ this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(1342, 688); this.splitMx1.SplitterPosition = 282; this.splitMx1.SplitterPosition = 242; this.splitMx1.TabIndex = 0; // // layoutMx1 // this.layoutMx1.Controls.Add(this.txt_fmrmode); this.layoutMx1.Controls.Add(this.txt_fzrId); this.layoutMx1.Controls.Add(this.txt_zrType); this.layoutMx1.Controls.Add(this.txt_fngHandle); @@ -852,44 +851,36 @@ this.layoutMx1.Controls.Add(this.txt_itemId); this.layoutMx1.Controls.Add(this.txt_lineId); this.layoutMx1.Controls.Add(this.txt_kbSl); this.layoutMx1.Controls.Add(this.txt_fmrmode); this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem17, this.layoutControlItem21, this.txt_itemId1111, this.layoutControlItem4}); this.layoutControlItem4, this.layoutControlItem29}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(789, 440, 812, 500); this.layoutMx1.Root = this.Root; this.layoutMx1.Size = new System.Drawing.Size(1342, 282); this.layoutMx1.Size = new System.Drawing.Size(1342, 242); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // // txt_fmrmode // this.txt_fmrmode.IsReadly = false; this.txt_fmrmode.Location = new System.Drawing.Point(1074, 215); this.txt_fmrmode.Margin = new System.Windows.Forms.Padding(0); this.txt_fmrmode.Name = "txt_fmrmode"; this.txt_fmrmode.Size = new System.Drawing.Size(256, 24); this.txt_fmrmode.TabIndex = 814; this.txt_fmrmode.Tag = "readonly"; // // txt_fzrId // this.txt_fzrId.Appearance.ForeColor = System.Drawing.Color.Blue; this.txt_fzrId.Appearance.Options.UseForeColor = true; this.txt_fzrId.IsReadly = false; this.txt_fzrId.Location = new System.Drawing.Point(1074, 157); this.txt_fzrId.Location = new System.Drawing.Point(1059, 152); this.txt_fzrId.Name = "txt_fzrId"; this.txt_fzrId.Size = new System.Drawing.Size(256, 24); this.txt_fzrId.Size = new System.Drawing.Size(250, 24); this.txt_fzrId.TabIndex = 839; // // txt_zrType // this.txt_zrType.EditValue = "-请选择-"; this.txt_zrType.Location = new System.Drawing.Point(1074, 128); this.txt_zrType.Location = new System.Drawing.Point(1059, 124); this.txt_zrType.Name = "txt_zrType"; this.txt_zrType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -898,34 +889,32 @@ "1:生产责任", "2:非生产责任"}); this.txt_zrType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.txt_zrType.Size = new System.Drawing.Size(256, 24); this.txt_zrType.Size = new System.Drawing.Size(250, 24); this.txt_zrType.StyleController = this.layoutMx1; this.txt_zrType.TabIndex = 838; // // txt_fngHandle // this.txt_fngHandle.EditValue = "-请选择-"; this.txt_fngHandle.Location = new System.Drawing.Point(1074, 99); this.txt_fngHandle.Location = new System.Drawing.Point(1059, 96); this.txt_fngHandle.Name = "txt_fngHandle"; this.txt_fngHandle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_fngHandle.Properties.Items.AddRange(new object[] { "-请选择-", "1:返工", "2:特采", "3:挑选使用"}); "1:返工"}); this.txt_fngHandle.Properties.NullText = "-请选择-"; this.txt_fngHandle.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.txt_fngHandle.Size = new System.Drawing.Size(256, 24); this.txt_fngHandle.Size = new System.Drawing.Size(250, 24); this.txt_fngHandle.StyleController = this.layoutMx1; this.txt_fngHandle.TabIndex = 837; // // txt_msg // this.txt_msg.BtnTxt = "违规类别"; this.txt_msg.Location = new System.Drawing.Point(1002, 12); this.txt_msg.Location = new System.Drawing.Point(987, 12); this.txt_msg.Name = "txt_msg"; this.txt_msg.Size = new System.Drawing.Size(328, 83); this.txt_msg.Size = new System.Drawing.Size(322, 80); this.txt_msg.TabIndex = 814; this.txt_msg.TextTxt = ""; this.txt_msg.WhereTxt = " a.s_type=\'违规类别\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'"; @@ -933,9 +922,9 @@ // txt_suppId // this.txt_suppId.IsReadly = false; this.txt_suppId.Location = new System.Drawing.Point(414, 99); this.txt_suppId.Location = new System.Drawing.Point(409, 96); this.txt_suppId.Name = "txt_suppId"; this.txt_suppId.Size = new System.Drawing.Size(254, 24); this.txt_suppId.Size = new System.Drawing.Size(249, 24); this.txt_suppId.TabIndex = 811; // // lbGuid @@ -949,126 +938,126 @@ // // txt_remarks // this.txt_remarks.Location = new System.Drawing.Point(84, 244); this.txt_remarks.Location = new System.Drawing.Point(409, 208); this.txt_remarks.Name = "txt_remarks"; this.txt_remarks.Properties.Appearance.Options.UseFont = true; this.txt_remarks.Size = new System.Drawing.Size(584, 24); this.txt_remarks.Size = new System.Drawing.Size(249, 24); this.txt_remarks.StyleController = this.layoutMx1; this.txt_remarks.TabIndex = 797; // // txt_fcheckResu // this.txt_fcheckResu.Location = new System.Drawing.Point(744, 128); this.txt_fcheckResu.Location = new System.Drawing.Point(734, 124); 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(254, 24); this.txt_fcheckResu.Size = new System.Drawing.Size(249, 24); this.txt_fcheckResu.StyleController = this.layoutMx1; this.txt_fcheckResu.TabIndex = 798; this.txt_fcheckResu.Tag = "readonly"; // // txt_releaseNo // this.txt_releaseNo.Location = new System.Drawing.Point(414, 12); this.txt_releaseNo.Location = new System.Drawing.Point(409, 12); this.txt_releaseNo.Name = "txt_releaseNo"; this.txt_releaseNo.Properties.Appearance.Options.UseFont = true; this.txt_releaseNo.Size = new System.Drawing.Size(254, 24); this.txt_releaseNo.Size = new System.Drawing.Size(249, 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(744, 157); this.txt_fcheckDate.Location = new System.Drawing.Point(734, 152); this.txt_fcheckDate.Name = "txt_fcheckDate"; this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true; this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24); this.txt_fcheckDate.Size = new System.Drawing.Size(249, 24); this.txt_fcheckDate.StyleController = this.layoutMx1; this.txt_fcheckDate.TabIndex = 216; this.txt_fcheckDate.Tag = "readonly"; // // txt_lotNo1 // this.txt_lotNo1.Location = new System.Drawing.Point(414, 128); this.txt_lotNo1.Location = new System.Drawing.Point(409, 124); this.txt_lotNo1.Name = "txt_lotNo1"; this.txt_lotNo1.Properties.Appearance.Options.UseFont = true; this.txt_lotNo1.Size = new System.Drawing.Size(254, 24); this.txt_lotNo1.Size = new System.Drawing.Size(249, 24); this.txt_lotNo1.StyleController = this.layoutMx1; this.txt_lotNo1.TabIndex = 262; this.txt_lotNo1.Tag = ""; // // txt_itemNo // this.txt_itemNo.Location = new System.Drawing.Point(84, 157); this.txt_itemNo.Location = new System.Drawing.Point(84, 152); this.txt_itemNo.Name = "txt_itemNo"; this.txt_itemNo.Properties.Appearance.Options.UseFont = true; this.txt_itemNo.Size = new System.Drawing.Size(254, 24); this.txt_itemNo.Size = new System.Drawing.Size(249, 24); this.txt_itemNo.StyleController = this.layoutMx1; this.txt_itemNo.TabIndex = 789; this.txt_itemNo.Tag = "readonly"; // // txt_itemModel // this.txt_itemModel.Location = new System.Drawing.Point(84, 215); this.txt_itemModel.Location = new System.Drawing.Point(84, 208); this.txt_itemModel.Name = "txt_itemModel"; this.txt_itemModel.Size = new System.Drawing.Size(584, 24); this.txt_itemModel.Size = new System.Drawing.Size(249, 24); this.txt_itemModel.StyleController = this.layoutMx1; this.txt_itemModel.TabIndex = 801; this.txt_itemModel.Tag = "readonly"; // // txt_fcheckBy // this.txt_fcheckBy.Location = new System.Drawing.Point(744, 70); this.txt_fcheckBy.Location = new System.Drawing.Point(734, 68); this.txt_fcheckBy.Name = "txt_fcheckBy"; this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true; this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24); this.txt_fcheckBy.Size = new System.Drawing.Size(249, 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(414, 41); this.txt_fbatchQty.Location = new System.Drawing.Point(409, 40); this.txt_fbatchQty.Name = "txt_fbatchQty"; this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true; this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24); this.txt_fbatchQty.Size = new System.Drawing.Size(249, 24); this.txt_fbatchQty.StyleController = this.layoutMx1; this.txt_fbatchQty.TabIndex = 222; this.txt_fbatchQty.Tag = ""; // // txt_fsubmitBy // this.txt_fsubmitBy.Location = new System.Drawing.Point(744, 215); this.txt_fsubmitBy.Location = new System.Drawing.Point(734, 208); this.txt_fsubmitBy.Name = "txt_fsubmitBy"; this.txt_fsubmitBy.Size = new System.Drawing.Size(254, 24); this.txt_fsubmitBy.Size = new System.Drawing.Size(249, 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(744, 186); this.txt_fsubmitDate.Location = new System.Drawing.Point(734, 180); this.txt_fsubmitDate.Name = "txt_fsubmitDate"; this.txt_fsubmitDate.Size = new System.Drawing.Size(254, 24); this.txt_fsubmitDate.Size = new System.Drawing.Size(249, 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(672, 244); this.txt_fsubmit.Location = new System.Drawing.Point(987, 208); this.txt_fsubmit.Name = "txt_fsubmit"; this.txt_fsubmit.Properties.Caption = "审核标识"; this.txt_fsubmit.Size = new System.Drawing.Size(326, 24); this.txt_fsubmit.Size = new System.Drawing.Size(322, 24); this.txt_fsubmit.StyleController = this.layoutMx1; this.txt_fsubmit.TabIndex = 806; this.txt_fsubmit.Tag = "readonly"; // // txt_fmanageNo // this.txt_fmanageNo.Location = new System.Drawing.Point(414, 186); this.txt_fmanageNo.Location = new System.Drawing.Point(409, 180); this.txt_fmanageNo.Name = "txt_fmanageNo"; this.txt_fmanageNo.Size = new System.Drawing.Size(254, 24); this.txt_fmanageNo.Size = new System.Drawing.Size(249, 24); this.txt_fmanageNo.StyleController = this.layoutMx1; this.txt_fmanageNo.TabIndex = 807; this.txt_fmanageNo.Tag = ""; @@ -1084,9 +1073,9 @@ // // txt_lifnr // this.txt_lifnr.Location = new System.Drawing.Point(414, 70); this.txt_lifnr.Location = new System.Drawing.Point(409, 68); this.txt_lifnr.Name = "txt_lifnr"; this.txt_lifnr.Size = new System.Drawing.Size(254, 24); this.txt_lifnr.Size = new System.Drawing.Size(249, 24); this.txt_lifnr.StyleController = this.layoutMx1; this.txt_lifnr.TabIndex = 809; // @@ -1101,7 +1090,7 @@ "-请选择-", "1:常规流程"}); this.txt_djType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.txt_djType.Size = new System.Drawing.Size(254, 24); this.txt_djType.Size = new System.Drawing.Size(249, 24); this.txt_djType.StyleController = this.layoutMx1; this.txt_djType.TabIndex = 810; // @@ -1116,78 +1105,78 @@ // // txt_checkStates // this.txt_checkStates.Location = new System.Drawing.Point(744, 99); this.txt_checkStates.Location = new System.Drawing.Point(734, 96); 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(254, 24); this.txt_checkStates.Size = new System.Drawing.Size(249, 24); this.txt_checkStates.StyleController = this.layoutMx1; this.txt_checkStates.TabIndex = 819; this.txt_checkStates.Tag = "readonly"; // // txt_epTag // this.txt_epTag.Location = new System.Drawing.Point(414, 157); this.txt_epTag.Location = new System.Drawing.Point(409, 152); this.txt_epTag.Name = "txt_epTag"; this.txt_epTag.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_epTag.Size = new System.Drawing.Size(254, 24); this.txt_epTag.Size = new System.Drawing.Size(249, 24); this.txt_epTag.StyleController = this.layoutMx1; this.txt_epTag.TabIndex = 820; // // txt_createBy // this.txt_createBy.Location = new System.Drawing.Point(744, 12); this.txt_createBy.Location = new System.Drawing.Point(734, 12); this.txt_createBy.Name = "txt_createBy"; this.txt_createBy.Size = new System.Drawing.Size(254, 24); this.txt_createBy.Size = new System.Drawing.Size(249, 24); this.txt_createBy.StyleController = this.layoutMx1; this.txt_createBy.TabIndex = 822; this.txt_createBy.Tag = "readonly"; // // txt_createDate // this.txt_createDate.Location = new System.Drawing.Point(744, 41); this.txt_createDate.Location = new System.Drawing.Point(734, 40); this.txt_createDate.Name = "txt_createDate"; this.txt_createDate.Size = new System.Drawing.Size(254, 24); this.txt_createDate.Size = new System.Drawing.Size(249, 24); this.txt_createDate.StyleController = this.layoutMx1; this.txt_createDate.TabIndex = 823; this.txt_createDate.Tag = "readonly"; // // txt_itemName // this.txt_itemName.Location = new System.Drawing.Point(84, 186); this.txt_itemName.Location = new System.Drawing.Point(84, 180); this.txt_itemName.Name = "txt_itemName"; this.txt_itemName.Size = new System.Drawing.Size(254, 24); this.txt_itemName.Size = new System.Drawing.Size(249, 24); this.txt_itemName.StyleController = this.layoutMx1; this.txt_itemName.TabIndex = 825; this.txt_itemName.Tag = "readonly"; // // txt_kbList // this.txt_kbList.Location = new System.Drawing.Point(84, 70); this.txt_kbList.Location = new System.Drawing.Point(84, 68); this.txt_kbList.Name = "txt_kbList"; this.txt_kbList.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton()}); this.txt_kbList.Size = new System.Drawing.Size(254, 24); this.txt_kbList.Size = new System.Drawing.Size(249, 24); this.txt_kbList.StyleController = this.layoutMx1; this.txt_kbList.TabIndex = 830; // // txt_lotNo // this.txt_lotNo.EditValue = ""; this.txt_lotNo.Location = new System.Drawing.Point(84, 41); this.txt_lotNo.Location = new System.Drawing.Point(84, 40); this.txt_lotNo.Name = "txt_lotNo"; this.txt_lotNo.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton()}); this.txt_lotNo.Size = new System.Drawing.Size(254, 24); this.txt_lotNo.Size = new System.Drawing.Size(249, 24); this.txt_lotNo.StyleController = this.layoutMx1; this.txt_lotNo.TabIndex = 831; // // txt_lineName // this.txt_lineName.Location = new System.Drawing.Point(84, 128); this.txt_lineName.Location = new System.Drawing.Point(84, 124); this.txt_lineName.Name = "txt_lineName"; this.txt_lineName.Size = new System.Drawing.Size(254, 24); this.txt_lineName.Size = new System.Drawing.Size(249, 24); this.txt_lineName.StyleController = this.layoutMx1; this.txt_lineName.TabIndex = 832; this.txt_lineName.Tag = "readonly"; @@ -1212,9 +1201,9 @@ // // txt_kbSl // this.txt_kbSl.Location = new System.Drawing.Point(84, 99); this.txt_kbSl.Location = new System.Drawing.Point(84, 96); this.txt_kbSl.Name = "txt_kbSl"; this.txt_kbSl.Size = new System.Drawing.Size(254, 24); this.txt_kbSl.Size = new System.Drawing.Size(249, 24); this.txt_kbSl.StyleController = this.layoutMx1; this.txt_kbSl.TabIndex = 835; this.txt_kbSl.Tag = "readonly"; @@ -1275,7 +1264,6 @@ this.layoutControlItem8, this.layoutControlItem33, this.layoutControlItem2, this.layoutControlItem12, this.layoutControlItem6, this.layoutControlItem34, this.layoutControlItem5, @@ -1294,12 +1282,12 @@ this.layoutControlItem13, this.layoutControlItem7, this.layoutControlItem35, this.layoutControlItem29, this.layoutControlItem25, this.layoutControlItem16, this.layoutControlItem15, this.layoutControlItem14, this.layoutControlItem27}); this.layoutControlItem27, this.layoutControlItem25, this.layoutControlItem12, this.layoutControlItem14}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -1331,8 +1319,6 @@ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition8.Height = 100D; rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition9.Height = 100D; rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition1, rowDefinition2, @@ -1341,106 +1327,93 @@ rowDefinition5, rowDefinition6, rowDefinition7, rowDefinition8, rowDefinition9}); this.Root.Size = new System.Drawing.Size(1342, 282); rowDefinition8}); this.Root.Size = new System.Drawing.Size(1321, 244); this.Root.TextVisible = false; // // layoutControlItem31 // this.layoutControlItem31.Control = this.txt_createBy; this.layoutControlItem31.Location = new System.Drawing.Point(660, 0); this.layoutControlItem31.Location = new System.Drawing.Point(650, 0); this.layoutControlItem31.Name = "layoutControlItem31"; this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem31.Size = new System.Drawing.Size(330, 29); this.layoutControlItem31.Size = new System.Drawing.Size(325, 28); this.layoutControlItem31.Text = "创建人员"; this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.txt_fcheckResu; this.layoutControlItem10.Location = new System.Drawing.Point(660, 116); this.layoutControlItem10.Location = new System.Drawing.Point(650, 112); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem10.Size = new System.Drawing.Size(330, 29); this.layoutControlItem10.Size = new System.Drawing.Size(325, 28); this.layoutControlItem10.Text = "检验结果"; this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem32 // this.layoutControlItem32.Control = this.txt_checkStates; this.layoutControlItem32.Location = new System.Drawing.Point(660, 87); this.layoutControlItem32.Location = new System.Drawing.Point(650, 84); this.layoutControlItem32.Name = "layoutControlItem32"; this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem32.Size = new System.Drawing.Size(330, 29); this.layoutControlItem32.Size = new System.Drawing.Size(325, 28); this.layoutControlItem32.Text = "检验状态"; this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem8 // this.layoutControlItem8.Control = this.txt_fcheckBy; this.layoutControlItem8.Location = new System.Drawing.Point(660, 58); this.layoutControlItem8.Location = new System.Drawing.Point(650, 56); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem8.Size = new System.Drawing.Size(330, 29); this.layoutControlItem8.Size = new System.Drawing.Size(325, 28); this.layoutControlItem8.Text = "检验人员"; this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem33 // this.layoutControlItem33.Control = this.txt_createDate; this.layoutControlItem33.Location = new System.Drawing.Point(660, 29); this.layoutControlItem33.Location = new System.Drawing.Point(650, 28); this.layoutControlItem33.Name = "layoutControlItem33"; this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem33.Size = new System.Drawing.Size(330, 29); this.layoutControlItem33.Size = new System.Drawing.Size(325, 28); this.layoutControlItem33.Text = "创建时间"; this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_fcheckDate; this.layoutControlItem2.Location = new System.Drawing.Point(660, 145); this.layoutControlItem2.Location = new System.Drawing.Point(650, 140); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 5; this.layoutControlItem2.Size = new System.Drawing.Size(330, 29); this.layoutControlItem2.Size = new System.Drawing.Size(325, 28); this.layoutControlItem2.Text = "检验日期"; this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_remarks; this.layoutControlItem12.Location = new System.Drawing.Point(0, 232); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 8; this.layoutControlItem12.Size = new System.Drawing.Size(660, 30); this.layoutControlItem12.Text = "备注说明"; this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem6 // this.layoutControlItem6.Control = this.txt_itemModel; this.layoutControlItem6.CustomizationFormText = "产品规格"; this.layoutControlItem6.Location = new System.Drawing.Point(0, 203); this.layoutControlItem6.Location = new System.Drawing.Point(0, 196); this.layoutControlItem6.Name = "layoutControlItem6"; this.layoutControlItem6.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 7; this.layoutControlItem6.Size = new System.Drawing.Size(660, 29); this.layoutControlItem6.Size = new System.Drawing.Size(325, 28); this.layoutControlItem6.Text = "物料规格"; this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem34 // this.layoutControlItem34.Control = this.txt_itemName; this.layoutControlItem34.Location = new System.Drawing.Point(0, 174); this.layoutControlItem34.Location = new System.Drawing.Point(0, 168); this.layoutControlItem34.Name = "layoutControlItem34"; this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 6; this.layoutControlItem34.Size = new System.Drawing.Size(330, 29); this.layoutControlItem34.Size = new System.Drawing.Size(325, 28); this.layoutControlItem34.Text = "产品名称"; this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18); // @@ -1448,126 +1421,126 @@ // this.layoutControlItem5.Control = this.txt_itemNo; this.layoutControlItem5.CustomizationFormText = "产品编码"; this.layoutControlItem5.Location = new System.Drawing.Point(0, 145); this.layoutControlItem5.Location = new System.Drawing.Point(0, 140); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 5; this.layoutControlItem5.Size = new System.Drawing.Size(330, 29); this.layoutControlItem5.Size = new System.Drawing.Size(325, 28); this.layoutControlItem5.Text = "产品编码"; this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem1 // this.layoutControlItem1.Control = this.txt_releaseNo; this.layoutControlItem1.Location = new System.Drawing.Point(330, 0); this.layoutControlItem1.Location = new System.Drawing.Point(325, 0); this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem1.Size = new System.Drawing.Size(330, 29); this.layoutControlItem1.Size = new System.Drawing.Size(325, 28); this.layoutControlItem1.Text = "检验单号"; this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem28 // this.layoutControlItem28.Control = this.txt_lotNo; this.layoutControlItem28.Location = new System.Drawing.Point(0, 29); this.layoutControlItem28.Location = new System.Drawing.Point(0, 28); this.layoutControlItem28.Name = "layoutControlItem28"; this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem28.Size = new System.Drawing.Size(330, 29); this.layoutControlItem28.Size = new System.Drawing.Size(325, 28); this.layoutControlItem28.Text = "选择工单"; this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18); // // txt_boxQty11 // this.txt_boxQty11.Control = this.txt_kbList; this.txt_boxQty11.Location = new System.Drawing.Point(0, 58); this.txt_boxQty11.Location = new System.Drawing.Point(0, 56); this.txt_boxQty11.Name = "txt_boxQty11"; this.txt_boxQty11.OptionsTableLayoutItem.RowIndex = 2; this.txt_boxQty11.Size = new System.Drawing.Size(330, 29); this.txt_boxQty11.Size = new System.Drawing.Size(325, 28); this.txt_boxQty11.Text = "送检箱码"; this.txt_boxQty11.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem9 // this.layoutControlItem9.Control = this.txt_fbatchQty; this.layoutControlItem9.Location = new System.Drawing.Point(330, 29); this.layoutControlItem9.Location = new System.Drawing.Point(325, 28); this.layoutControlItem9.Name = "layoutControlItem9"; this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem9.Size = new System.Drawing.Size(330, 29); this.layoutControlItem9.Size = new System.Drawing.Size(325, 28); this.layoutControlItem9.Text = "抽检数量"; this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem22 // this.layoutControlItem22.Control = this.txt_lifnr; this.layoutControlItem22.Location = new System.Drawing.Point(330, 58); this.layoutControlItem22.Location = new System.Drawing.Point(325, 56); this.layoutControlItem22.Name = "layoutControlItem22"; this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem22.Size = new System.Drawing.Size(330, 29); this.layoutControlItem22.Size = new System.Drawing.Size(325, 28); this.layoutControlItem22.Text = "客户订单"; this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem24 // this.layoutControlItem24.Control = this.txt_suppId; this.layoutControlItem24.Location = new System.Drawing.Point(330, 87); this.layoutControlItem24.Location = new System.Drawing.Point(325, 84); this.layoutControlItem24.Name = "layoutControlItem24"; this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem24.Size = new System.Drawing.Size(330, 29); this.layoutControlItem24.Size = new System.Drawing.Size(325, 28); this.layoutControlItem24.Text = "客户编码"; this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem3 // this.layoutControlItem3.Control = this.txt_lotNo1; this.layoutControlItem3.Location = new System.Drawing.Point(330, 116); this.layoutControlItem3.Location = new System.Drawing.Point(325, 112); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem3.Size = new System.Drawing.Size(330, 29); this.layoutControlItem3.Size = new System.Drawing.Size(325, 28); this.layoutControlItem3.Text = "送检批号"; this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); // // txt_epTagtxt // this.txt_epTagtxt.Control = this.txt_epTag; this.txt_epTagtxt.Location = new System.Drawing.Point(330, 145); this.txt_epTagtxt.Location = new System.Drawing.Point(325, 140); this.txt_epTagtxt.Name = "txt_epTagtxt"; this.txt_epTagtxt.OptionsTableLayoutItem.ColumnIndex = 1; this.txt_epTagtxt.OptionsTableLayoutItem.RowIndex = 5; this.txt_epTagtxt.Size = new System.Drawing.Size(330, 29); this.txt_epTagtxt.Size = new System.Drawing.Size(325, 28); this.txt_epTagtxt.Text = "环保标识"; this.txt_epTagtxt.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem18 // this.layoutControlItem18.Control = this.txt_fmanageNo; this.layoutControlItem18.Location = new System.Drawing.Point(330, 174); this.layoutControlItem18.Location = new System.Drawing.Point(325, 168); this.layoutControlItem18.Name = "layoutControlItem18"; this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 6; this.layoutControlItem18.Size = new System.Drawing.Size(330, 29); this.layoutControlItem18.Size = new System.Drawing.Size(325, 28); this.layoutControlItem18.Text = "流程编号"; this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18); // // txt_lineName111 // this.txt_lineName111.Control = this.txt_lineName; this.txt_lineName111.Location = new System.Drawing.Point(0, 116); this.txt_lineName111.Location = new System.Drawing.Point(0, 112); this.txt_lineName111.Name = "txt_lineName111"; this.txt_lineName111.OptionsTableLayoutItem.RowIndex = 4; this.txt_lineName111.Size = new System.Drawing.Size(330, 29); this.txt_lineName111.Size = new System.Drawing.Size(325, 28); this.txt_lineName111.Text = "生产线别"; this.txt_lineName111.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem30 // this.layoutControlItem30.Control = this.txt_kbSl; this.layoutControlItem30.Location = new System.Drawing.Point(0, 87); this.layoutControlItem30.Location = new System.Drawing.Point(0, 84); this.layoutControlItem30.Name = "layoutControlItem30"; this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem30.Size = new System.Drawing.Size(330, 29); this.layoutControlItem30.Size = new System.Drawing.Size(325, 28); this.layoutControlItem30.Text = "送检数量"; this.layoutControlItem30.TextSize = new System.Drawing.Size(60, 18); // @@ -1576,40 +1549,40 @@ this.layoutControlItem23.Control = this.txt_djType; this.layoutControlItem23.Location = new System.Drawing.Point(0, 0); this.layoutControlItem23.Name = "layoutControlItem23"; this.layoutControlItem23.Size = new System.Drawing.Size(330, 29); this.layoutControlItem23.Size = new System.Drawing.Size(325, 28); this.layoutControlItem23.Text = "单据类型"; this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem13 // this.layoutControlItem13.Control = this.txt_fngHandle; this.layoutControlItem13.Location = new System.Drawing.Point(990, 87); this.layoutControlItem13.Location = new System.Drawing.Point(975, 84); this.layoutControlItem13.Name = "layoutControlItem13"; this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem13.Size = new System.Drawing.Size(332, 29); this.layoutControlItem13.Size = new System.Drawing.Size(326, 28); this.layoutControlItem13.Text = "处置结果"; this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem7 // this.layoutControlItem7.Control = this.txt_zrType; this.layoutControlItem7.Location = new System.Drawing.Point(990, 116); this.layoutControlItem7.Location = new System.Drawing.Point(975, 112); this.layoutControlItem7.Name = "layoutControlItem7"; this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4; this.layoutControlItem7.Size = new System.Drawing.Size(332, 29); this.layoutControlItem7.Size = new System.Drawing.Size(326, 28); this.layoutControlItem7.Text = "判定责任"; this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem35 // this.layoutControlItem35.Control = this.txt_fzrId; this.layoutControlItem35.Location = new System.Drawing.Point(990, 145); this.layoutControlItem35.Location = new System.Drawing.Point(975, 140); this.layoutControlItem35.Name = "layoutControlItem35"; this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5; this.layoutControlItem35.Size = new System.Drawing.Size(332, 29); this.layoutControlItem35.Size = new System.Drawing.Size(326, 28); this.layoutControlItem35.Text = "责任人"; this.layoutControlItem35.TextSize = new System.Drawing.Size(60, 18); // @@ -1624,59 +1597,36 @@ this.layoutControlItem29.Text = "返工单号"; this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem25 // this.layoutControlItem25.Control = this.txt_fmrmode; this.layoutControlItem25.Location = new System.Drawing.Point(990, 203); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 7; this.layoutControlItem25.Size = new System.Drawing.Size(332, 29); this.layoutControlItem25.Text = "返工工序"; this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem16 // this.layoutControlItem16.Control = this.txt_fsubmitDate; this.layoutControlItem16.Location = new System.Drawing.Point(660, 174); this.layoutControlItem16.Location = new System.Drawing.Point(650, 168); this.layoutControlItem16.Name = "layoutControlItem16"; this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 6; this.layoutControlItem16.Size = new System.Drawing.Size(330, 29); this.layoutControlItem16.Size = new System.Drawing.Size(325, 28); this.layoutControlItem16.Text = "审核人员"; this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem15 // this.layoutControlItem15.Control = this.txt_fsubmitBy; this.layoutControlItem15.Location = new System.Drawing.Point(660, 203); this.layoutControlItem15.Location = new System.Drawing.Point(650, 196); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 7; this.layoutControlItem15.Size = new System.Drawing.Size(330, 29); this.layoutControlItem15.Size = new System.Drawing.Size(325, 28); this.layoutControlItem15.Text = "审核日期"; this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_fsubmit; this.layoutControlItem14.Location = new System.Drawing.Point(660, 232); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 8; this.layoutControlItem14.Size = new System.Drawing.Size(330, 30); this.layoutControlItem14.Text = "审核标识"; this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem14.TextVisible = false; // // layoutControlItem27 // this.layoutControlItem27.Control = this.txt_msg; this.layoutControlItem27.Location = new System.Drawing.Point(990, 0); this.layoutControlItem27.Location = new System.Drawing.Point(975, 0); this.layoutControlItem27.Name = "layoutControlItem27"; this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 3; this.layoutControlItem27.Size = new System.Drawing.Size(332, 87); this.layoutControlItem27.Size = new System.Drawing.Size(326, 84); this.layoutControlItem27.Text = "违规类别"; this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem27.TextVisible = false; @@ -1687,7 +1637,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, 394); this.xtraTabControl2.Size = new System.Drawing.Size(1342, 434); this.xtraTabControl2.TabIndex = 3; this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1, @@ -1699,7 +1649,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, 362); this.tabMxPage1.Size = new System.Drawing.Size(1340, 402); this.tabMxPage1.Text = "抽样信息"; // // splitMx2 @@ -1718,7 +1668,7 @@ // this.splitMx2.Panel2.Controls.Add(this.splitYangLi); this.splitMx2.Panel2.Text = "Panel2"; this.splitMx2.Size = new System.Drawing.Size(1340, 315); this.splitMx2.Size = new System.Drawing.Size(1340, 355); this.splitMx2.SplitterPosition = 287; this.splitMx2.TabIndex = 3; // @@ -2037,7 +1987,7 @@ // this.splitYangLi.Panel2.Controls.Add(this.groupControl2); this.splitYangLi.Panel2.Text = "Panel2"; this.splitYangLi.Size = new System.Drawing.Size(1340, 16); this.splitYangLi.Size = new System.Drawing.Size(1340, 56); this.splitYangLi.SplitterPosition = 676; this.splitYangLi.TabIndex = 4; // @@ -2047,7 +1997,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, 16); this.groupControl1.Size = new System.Drawing.Size(676, 56); this.groupControl1.TabIndex = 3; this.groupControl1.Text = "检测结果"; // @@ -2057,7 +2007,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, 0); this.gcMx2.Size = new System.Drawing.Size(672, 26); this.gcMx2.TabIndex = 0; this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx2}); @@ -2142,7 +2092,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, 16); this.groupControl2.Size = new System.Drawing.Size(652, 56); this.groupControl2.TabIndex = 4; this.groupControl2.Text = "样本结果"; // @@ -2152,7 +2102,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, 0); this.gcMx3.Size = new System.Drawing.Size(648, 26); this.gcMx3.TabIndex = 0; this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx3}); @@ -2318,10 +2268,10 @@ columnDefinition6, columnDefinition7, columnDefinition8}); rowDefinition10.Height = 100D; rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent; rowDefinition9.Height = 100D; rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent; this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] { rowDefinition10}); rowDefinition9}); 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; @@ -2433,6 +2383,52 @@ // this.gridView4.Name = "gridView4"; // // txt_fmrmode // this.txt_fmrmode.Location = new System.Drawing.Point(1059, 180); this.txt_fmrmode.Name = "txt_fmrmode"; this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.txt_fmrmode.Properties.NullText = "-请选择-"; this.txt_fmrmode.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.txt_fmrmode.Size = new System.Drawing.Size(250, 24); this.txt_fmrmode.StyleController = this.layoutMx1; this.txt_fmrmode.TabIndex = 840; // // layoutControlItem25 // this.layoutControlItem25.Control = this.txt_fmrmode; this.layoutControlItem25.Location = new System.Drawing.Point(975, 168); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6; this.layoutControlItem25.Size = new System.Drawing.Size(326, 28); this.layoutControlItem25.Text = "返工工序"; this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_remarks; this.layoutControlItem12.Location = new System.Drawing.Point(325, 196); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7; this.layoutControlItem12.Size = new System.Drawing.Size(325, 28); this.layoutControlItem12.Text = "备注说明"; this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_fsubmit; this.layoutControlItem14.Location = new System.Drawing.Point(975, 196); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 7; this.layoutControlItem14.Size = new System.Drawing.Size(326, 28); this.layoutControlItem14.Text = "审核标识"; this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem14.TextVisible = false; // // Frm_FqcDetect01 // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -2504,7 +2500,6 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); @@ -2524,10 +2519,8 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit(); this.xtraTabControl2.ResumeLayout(false); @@ -2572,6 +2565,10 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); this.ResumeLayout(false); } @@ -2711,7 +2708,6 @@ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDefectDetails; private DevExpress.XtraEditors.ButtonEdit txt_kbList; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; @@ -2738,16 +2734,17 @@ private DevExpress.XtraEditors.ComboBoxEdit txt_fngHandle; private DevExpress.XtraEditors.ComboBoxEdit txt_zrType; private UserControl.UcLookStaff txt_fzrId; private UserControl.UcLookGx txt_fmrmode; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27; private DevExpress.XtraEditors.ComboBoxEdit txt_fmrmode; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; } } DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -1,4 +1,5 @@ using Gs.DevApp.DevFrm.Work; using DevExpress.XtraGrid.Drawing; using Gs.DevApp.DevFrm.Work; using Gs.DevApp.Entity; using Gs.DevApp.ToolBox; using Gs.DevApp.UserControl; @@ -7,6 +8,7 @@ using System; using System.Collections.Generic; using System.Data; using System.Data.SqlTypes; using System.Threading.Tasks; using System.Windows.Forms; @@ -75,7 +77,7 @@ } catch (Exception ex) { MessageBox.Show(ex.Message); ToolBox.MsgHelper.ShowError(ex.Message); } }; frm.ShowDialog(); @@ -86,7 +88,7 @@ string _lotNo = txt_lotNo.Text.Trim(); if (string.IsNullOrEmpty(_lotNo)) { Gs.DevApp.ToolBox.MsgHelper.ShowInformation("请先选择工单！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("请先选择工单！"); return; } var frm = new SelectFqcBox(_lotNo); @@ -110,17 +112,15 @@ } catch (Exception ex) { MessageBox.Show(ex.Message); Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message); } }; frm.ShowDialog(); }; // 读取缺陷等级 getRptDefectLevel(); //工序 txt_fmrmode.getSuppler("", " and isnull(isBack,0)=1"); } /// <summary> /// 批量录入 /// </summary> @@ -162,7 +162,7 @@ string strGuid = lbGuid.Text.Trim(); if (string.IsNullOrEmpty(strGuid)) { ToolBox.MsgHelper.Warning("请先选择你要操作的行！"); ToolBox.MsgHelper.ShowError("请先选择你要操作的行！"); return; } var _obj = new @@ -179,12 +179,12 @@ } else { Gs.DevApp.ToolBox.MsgHelper.ShowInformation(_rtn.rtnMsg); Gs.DevApp.ToolBox.MsgHelper.ShowError(_rtn.rtnMsg); } } catch (Exception ex) { ToolBox.MsgHelper.Warning("提示：" + ex.Message); ToolBox.MsgHelper.ShowError("提示：" + ex.Message); } } /// <summary> @@ -197,7 +197,7 @@ int intHandle = this.gvMx1.FocusedRowHandle; if (intHandle < 0) { ToolBox.MsgHelper.Warning("提示：请选择检验项目！"); ToolBox.MsgHelper.ShowError("提示：请选择检验项目！"); return; } if (e.KeyCode == Keys.Enter) @@ -246,7 +246,7 @@ } catch (Exception ex) { MsgHelper.Warning("提示：" + ex.Message); MsgHelper.ShowError("提示：" + ex.Message); } } } @@ -333,7 +333,7 @@ lbGuid, txt_releaseNo, gridView1, "releaseNo"); if (string.IsNullOrEmpty(rowGuid)) { MsgHelper.Warning("请先选择你要操作的行！"); MsgHelper.ShowError("请先选择你要操作的行！"); return; } if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定删除吗？")) @@ -350,17 +350,19 @@ var _rtn = UtilityHelper.ReturnToDynamic(strJson); if (_rtn.rtnCode > 0) { MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg); if (xtraTabControl1.SelectedTabPageIndex == 0) { } else Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2); getPageList(this.pageBar1.CurrentPage); } MsgHelper.Warning("提示：" + _rtn.rtnMsg); else MsgHelper.ShowError("提示：" + _rtn.rtnMsg); } catch (Exception ex) { MsgHelper.Warning("提示：" + ex.Message); MsgHelper.ShowError("提示：" + ex.Message); } } /// <summary> @@ -455,55 +457,55 @@ string _kbList = txt_kbList.Text.Trim(); if (txt_djType.SelectedIndex <= 0) { Gs.DevApp.ToolBox.MsgHelper.Warning("单据类型不能为空！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("单据类型不能为空！"); txt_djType.Focus(); return; } if (string.IsNullOrEmpty(_txt_lotNo.Trim())) { Gs.DevApp.ToolBox.MsgHelper.Warning("工单号不能为空！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("工单号不能为空！"); txt_lotNo.Focus(); return; } if (string.IsNullOrEmpty(_kbList.Trim())) { Gs.DevApp.ToolBox.MsgHelper.Warning("送检箱码不能为空！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("送检箱码不能为空！"); txt_kbList.Focus(); return; } if (string.IsNullOrEmpty(txt_kbSl.Text.Trim())) { Gs.DevApp.ToolBox.MsgHelper.Warning("送检数量不能为空！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("送检数量不能为空！"); txt_kbList.Focus(); return; } if (string.IsNullOrEmpty(_txt_fbatchQty.Trim())) { Gs.DevApp.ToolBox.MsgHelper.Warning("抽检数量不能为空！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("抽检数量不能为空！"); txt_fbatchQty.Focus(); return; } if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(_txt_fbatchQty)) { Gs.DevApp.ToolBox.MsgHelper.Warning("请输入正确的抽检数量！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("请输入正确的抽检数量！"); txt_fbatchQty.Focus(); return; } if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric2(txt_kbSl.Text.Trim())) { Gs.DevApp.ToolBox.MsgHelper.Warning("请输入正确的送检数量！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("请输入正确的送检数量！"); txt_kbList.Focus(); return; } if (Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_txt_fbatchQty) > Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_kbSl.Text.Trim())) { Gs.DevApp.ToolBox.MsgHelper.Warning("抽检数量不能大于送检数量！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("抽检数量不能大于送检数量！"); txt_fbatchQty.Focus(); return; } //当不合格时的检查 string _txt_fngHandle = txt_fngHandle.Text.Trim(); string _txt_fmrmode = txt_fmrmode.GetCode(); string _txt_fmrmode = txt_fmrmode.SelectedText.Trim(); string _txt_fzrId = txt_fzrId.GetId(); string _txt_workNo = txt_workNo.Text.Trim(); string _txt_zrType = txt_zrType.Text.Trim(); @@ -511,41 +513,41 @@ { if (string.IsNullOrEmpty(txt_msg.TextTxt.Trim())) { MsgHelper.Warning("当不合格时，请填写违规信息！"); MsgHelper.ShowError("当不合格时，请填写违规信息！"); txt_msg.Focus(); return; } if (txt_fngHandle.SelectedIndex <= 0) { Gs.DevApp.ToolBox.MsgHelper.Warning("当不合格时，请选择处置结果！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("当不合格时，请选择处置结果！"); txt_fngHandle.Focus(); return; } if (txt_zrType.SelectedIndex <= 0) { Gs.DevApp.ToolBox.MsgHelper.Warning("当不合格时，请选择责任判定！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("当不合格时，请选择责任判定！"); txt_zrType.Focus(); return; } if (_txt_fzrId.Length <= 0) { Gs.DevApp.ToolBox.MsgHelper.Warning("当不合格时，请选择责任人！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("当不合格时，请选择责任人！"); txt_fzrId.Focus(); return; } //当处置结果为反工时，要选择工序和反工编号 if (txt_fngHandle.SelectedIndex == 1) { if (string.IsNullOrEmpty(_txt_workNo)) { Gs.DevApp.ToolBox.MsgHelper.Warning("当不合格时，请填写反工单号！"); txt_workNo.Focus(); return; } //if (string.IsNullOrEmpty(_txt_workNo)) //{ // Gs.DevApp.ToolBox.MsgHelper.ShowError("当不合格时，请填写反工单号！"); // txt_workNo.Focus(); // return; //} if (string.IsNullOrEmpty(_txt_fmrmode)) { Gs.DevApp.ToolBox.MsgHelper.Warning("当不合格时，请填选择反工工序！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("当不合格时，请填选择反工工序！"); txt_fmrmode.Focus(); return; } @@ -554,13 +556,13 @@ { if (!string.IsNullOrEmpty(_txt_workNo)) { Gs.DevApp.ToolBox.MsgHelper.Warning("不需要填写反工单号！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("不需要填写反工单号！"); txt_workNo.Focus(); return; } if (!string.IsNullOrEmpty(_txt_fmrmode)) { Gs.DevApp.ToolBox.MsgHelper.Warning("不需要选择反工工序！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("不需要选择反工工序！"); txt_fmrmode.Focus(); return; } @@ -627,9 +629,9 @@ { string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj)); ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson); ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg); if (_rtn.rtnCode > 0) { ToolBox.MsgHelper.ShowInformation("提示：" + _rtn.rtnMsg); lbGuid.Text = _rtn.rtnData.outGuid; txt_releaseNo.Text = _rtn.rtnData.outNo; toolBarMenu1.isSetBtn = true; @@ -639,10 +641,12 @@ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6); getModel(lbGuid.Text, "0"); } else ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg); } catch (Exception ex) { ToolBox.MsgHelper.Warning("提示：" + ex.Message); ToolBox.MsgHelper.ShowError("提示：" + ex.Message); } } @@ -654,7 +658,6 @@ private void getPageList(int curPage) { gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList); // _sbSqlWhere += " and isnull(fsubmit,0)=0"; PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString()); string json = JsonConvert.SerializeObject(pgq); try @@ -686,7 +689,7 @@ } catch (Exception ex) { ToolBox.MsgHelper.Warning("提示：" + ex.Message); ToolBox.MsgHelper.ShowError("提示：" + ex.Message); } } private void getModel(string strGuid, string guid5) @@ -744,13 +747,38 @@ { Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); } getGxList(dy.aboutGuid.ToString()); } else ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg); ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg); } catch (Exception ex) { ToolBox.MsgHelper.Warning("提示：" + ex.Message); ToolBox.MsgHelper.ShowError("提示：" + ex.Message); } } private void getGxList(string daaGuid) { txt_fmrmode.Properties.Items.Clear(); var _obj = new { guid = daaGuid, }; var json = JsonConvert.SerializeObject(_obj); try { var strReturn = UtilityHelper.HttpPost("", "WomdaaManager/GetGyList", json); var dd = UtilityHelper.ReturnToList(strReturn); var dt = dd.rtnData; foreach (DataRow row in dt.Rows) { txt_fmrmode.Properties.Items.Add(row["processNo"].ToString()); } } catch (Exception ex) { MsgHelper.ShowError("提示：" + ex.Message); } } @@ -809,7 +837,7 @@ } catch (Exception ex) { MsgHelper.Warning("提示：" + ex.Message); MsgHelper.ShowError("提示：" + ex.Message); } } @@ -843,7 +871,7 @@ } catch (Exception ex) { MsgHelper.Warning("提示：" + ex.Message); MsgHelper.ShowError("提示：" + ex.Message); } } /// <summary> @@ -897,7 +925,7 @@ toolBarMenu1.guidKey = rowGuid; if (string.IsNullOrEmpty(rowGuid)) { MsgHelper.Warning("请先选择你要操作的行！"); MsgHelper.ShowError("请先选择你要操作的行！"); return; } if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？")) @@ -908,45 +936,45 @@ { if (string.IsNullOrEmpty(txt_msg.TextTxt.Trim())) { MsgHelper.Warning("单据为不合格时，请填写违规信息！"); MsgHelper.ShowError("单据为不合格时，请填写违规信息！"); return; } string _txt_fngHandle = txt_fngHandle.Text.Trim(); string _txt_fmrmode = txt_fmrmode.GetCode(); string _txt_fmrmode = txt_fmrmode.SelectedText.Trim(); string _txt_fzrId = txt_fzrId.GetId(); string _txt_workNo = txt_workNo.Text.Trim(); string _txt_msg = txt_msg.TextTxt; string _txt_zrType = txt_zrType.Text.Trim(); if (txt_fngHandle.SelectedIndex <= 0) { Gs.DevApp.ToolBox.MsgHelper.Warning("请选择处置结果！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择处置结果！"); txt_fngHandle.Focus(); return; } if (txt_zrType.SelectedIndex <= 0) { Gs.DevApp.ToolBox.MsgHelper.Warning("请选择责任判定！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择责任判定！"); txt_zrType.Focus(); return; } if (_txt_fzrId.Length <= 0) { Gs.DevApp.ToolBox.MsgHelper.Warning("请选择责任人！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择责任人！"); txt_fzrId.Focus(); return; } //当处置结果为反工时，要选择工序和反工编号 if (txt_fngHandle.SelectedIndex == 1) { if (string.IsNullOrEmpty(_txt_workNo)) { Gs.DevApp.ToolBox.MsgHelper.Warning("请填写反工单号！"); txt_workNo.Focus(); return; } //if (string.IsNullOrEmpty(_txt_workNo)) //{ // Gs.DevApp.ToolBox.MsgHelper.Warning("请填写反工单号！"); // txt_workNo.Focus(); // return; //} if (string.IsNullOrEmpty(_txt_fmrmode)) { Gs.DevApp.ToolBox.MsgHelper.Warning("请填选择反工工序！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("请填选择反工工序！"); txt_fmrmode.Focus(); return; } @@ -955,13 +983,13 @@ { if (!string.IsNullOrEmpty(_txt_workNo)) { Gs.DevApp.ToolBox.MsgHelper.Warning("不需要填写反工单号！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("不需要填写反工单号！"); txt_workNo.Focus(); return; } if (!string.IsNullOrEmpty(_txt_fmrmode)) { Gs.DevApp.ToolBox.MsgHelper.Warning("不需要选择反工工序！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("不需要选择反工工序！"); txt_fmrmode.Focus(); return; } @@ -980,9 +1008,9 @@ _webServiceName + "EditModelSubmit", JsonConvert.SerializeObject(_obj)); var _rtn = UtilityHelper.ReturnToDynamic(strJson); MsgHelper.Warning("提示：" + _rtn.rtnData.outMsg); if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0) { MsgHelper.ShowInformation("提示：" + _rtn.rtnData.outMsg); if (xtraTabControl1.SelectedTabPageIndex == 1) { getModel(lbGuid.Text.Trim(), "0"); @@ -991,12 +1019,13 @@ gridView1.FocusedRowHandle = rowHandle; UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, this, _inFieldValue.ToString()); } else MsgHelper.ShowError("提示：" + _rtn.rtnData.outMsg); } catch (Exception ex) { MsgHelper.Warning("提示：" + ex.Message); MsgHelper.ShowError("提示：" + ex.Message); } } } } DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.cs
@@ -119,8 +119,8 @@ /// <exception cref="NotImplementedException"></exception> private void ToolBarMenu1_btnOutClick(object sender, EventArgs e) { var frm = new Frm_XunJianDetect01Show(); frm.UpdateParent += (ss, ee) => var frm2 = new Frm_XunJianDetect01Show(); frm2.UpdateParent += (ss, ee) => { string begDate = ee.StringSingle.Trim(); using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog()) @@ -147,7 +147,8 @@ { client.DownloadFile(_url, _folderName); } ToolBox.MsgHelper.ShowInformation("导出成功！"); var frm = new Gs.DevApp.DevFrm.QC.Xls(_folderName); frm.ShowDialog(); } else { @@ -161,7 +162,7 @@ } } }; frm.ShowDialog(); frm2.ShowDialog(); } /// <summary> /// 日志事件 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01Show.Designer.cs
@@ -39,7 +39,7 @@ // // labelControl1 // this.labelControl1.Location = new System.Drawing.Point(67, 65); this.labelControl1.Location = new System.Drawing.Point(44, 46); this.labelControl1.Name = "labelControl1"; this.labelControl1.Size = new System.Drawing.Size(90, 18); this.labelControl1.TabIndex = 0; @@ -48,7 +48,7 @@ // txt_fBegDate // this.txt_fBegDate.EditValue = null; this.txt_fBegDate.Location = new System.Drawing.Point(67, 112); this.txt_fBegDate.Location = new System.Drawing.Point(44, 70); this.txt_fBegDate.Name = "txt_fBegDate"; this.txt_fBegDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -63,7 +63,7 @@ this.btnCancel.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat; this.btnCancel.Cursor = System.Windows.Forms.Cursors.Hand; this.btnCancel.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCancel.ImageOptions.Image"))); this.btnCancel.Location = new System.Drawing.Point(184, 177); this.btnCancel.Location = new System.Drawing.Point(157, 144); this.btnCancel.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(87, 37); @@ -76,7 +76,7 @@ this.btnSave.ButtonStyle = DevExpress.XtraEditors.Controls.BorderStyles.HotFlat; this.btnSave.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSave.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnSave.ImageOptions.Image"))); this.btnSave.Location = new System.Drawing.Point(67, 177); this.btnSave.Location = new System.Drawing.Point(40, 144); this.btnSave.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnSave.Name = "btnSave"; this.btnSave.Size = new System.Drawing.Size(87, 37); @@ -87,12 +87,14 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(366, 260); this.ClientSize = new System.Drawing.Size(316, 260); this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnSave); this.Controls.Add(this.txt_fBegDate); this.Controls.Add(this.labelControl1); this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "Frm_XunJianDetect01Show"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "选择日期"; DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01Show.cs
@@ -21,7 +21,7 @@ { if (txt_fBegDate.Text.Length <= 0) { Gs.DevApp.ToolBox.MsgHelper.ShowInformation("日期不能为空！"); Gs.DevApp.ToolBox.MsgHelper.ShowError("日期不能为空！"); txt_fBegDate.Focus(); return; } DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -328,6 +328,7 @@ this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage(); this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint(); this.tips = new DevExpress.Utils.ToolTipController(this.components); this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -601,7 +602,8 @@ this.gridColumn22, this.gridColumn23, this.gridColumn24, this.gridColumn25}); this.gridColumn25, this.gridColumn52}); this.gridView1.GridControl = this.gcMain1; this.gridView1.IndicatorWidth = 50; this.gridView1.Name = "gridView1"; @@ -676,7 +678,7 @@ this.gridColumn27.MinWidth = 25; this.gridColumn27.Name = "gridColumn27"; this.gridColumn27.Visible = true; this.gridColumn27.VisibleIndex = 18; this.gridColumn27.VisibleIndex = 19; this.gridColumn27.Width = 94; // // gv_daa018 @@ -700,7 +702,7 @@ this.gridColoun100.Name = "gridColoun100"; this.gridColoun100.Tag = "org.fnamber"; this.gridColoun100.Visible = true; this.gridColoun100.VisibleIndex = 28; this.gridColoun100.VisibleIndex = 29; this.gridColoun100.Width = 250; // // gv_daa001 @@ -736,7 +738,7 @@ this.gridColumn3.MinWidth = 50; this.gridColumn3.Name = "gridColumn3"; this.gridColumn3.Visible = true; this.gridColumn3.VisibleIndex = 9; this.gridColumn3.VisibleIndex = 10; this.gridColumn3.Width = 94; // // gv_daa003 @@ -749,7 +751,7 @@ this.gv_daa003.OptionsColumn.AllowEdit = false; this.gv_daa003.Tag = "query_a.daa003"; this.gv_daa003.Visible = true; this.gv_daa003.VisibleIndex = 10; this.gv_daa003.VisibleIndex = 11; this.gv_daa003.Width = 150; // // gv_daa004 @@ -762,7 +764,7 @@ this.gv_daa004.OptionsColumn.AllowEdit = false; this.gv_daa004.Tag = "query_a.daa004"; this.gv_daa004.Visible = true; this.gv_daa004.VisibleIndex = 11; this.gv_daa004.VisibleIndex = 12; this.gv_daa004.Width = 150; // // gv_daa008 @@ -776,7 +778,7 @@ this.gv_daa008.OptionsColumn.AllowEdit = false; this.gv_daa008.Tag = "query_a.daa008"; this.gv_daa008.Visible = true; this.gv_daa008.VisibleIndex = 12; this.gv_daa008.VisibleIndex = 13; this.gv_daa008.Width = 50; // // gv_daa011 @@ -790,7 +792,7 @@ this.gv_daa011.OptionsColumn.AllowEdit = false; this.gv_daa011.Tag = "query_a.daa011"; this.gv_daa011.Visible = true; this.gv_daa011.VisibleIndex = 13; this.gv_daa011.VisibleIndex = 14; this.gv_daa011.Width = 50; // // gridColumn4 @@ -805,7 +807,7 @@ this.gridColumn4.MinWidth = 50; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.Visible = true; this.gridColumn4.VisibleIndex = 14; this.gridColumn4.VisibleIndex = 15; this.gridColumn4.Width = 50; // // gv_daa010 @@ -819,7 +821,7 @@ this.gv_daa010.OptionsColumn.AllowEdit = false; this.gv_daa010.Tag = "query_a.daa010"; this.gv_daa010.Visible = true; this.gv_daa010.VisibleIndex = 16; this.gv_daa010.VisibleIndex = 17; this.gv_daa010.Width = 50; // // gv_daa005 @@ -833,7 +835,7 @@ this.gv_daa005.OptionsColumn.AllowEdit = false; this.gv_daa005.Tag = "query_a.daa005"; this.gv_daa005.Visible = true; this.gv_daa005.VisibleIndex = 17; this.gv_daa005.VisibleIndex = 18; this.gv_daa005.Width = 50; // // gv_cust @@ -854,7 +856,7 @@ this.gridColumn1.MinWidth = 50; this.gridColumn1.Name = "gridColumn1"; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 19; this.gridColumn1.VisibleIndex = 20; this.gridColumn1.Width = 94; // // gv_daa015 @@ -880,7 +882,7 @@ this.gv_daa009.OptionsColumn.AllowEdit = false; this.gv_daa009.Tag = "query_a.daa009"; this.gv_daa009.Visible = true; this.gv_daa009.VisibleIndex = 15; this.gv_daa009.VisibleIndex = 16; this.gv_daa009.Width = 94; // // gv_prepareTime @@ -915,7 +917,7 @@ this.gv_daa016.OptionsColumn.AllowEdit = false; this.gv_daa016.Tag = "query_a.daa016"; this.gv_daa016.Visible = true; this.gv_daa016.VisibleIndex = 20; this.gv_daa016.VisibleIndex = 21; this.gv_daa016.Width = 180; // // gv_daa017 @@ -928,7 +930,7 @@ this.gv_daa017.OptionsColumn.AllowEdit = false; this.gv_daa017.Tag = "query_a.daa017"; this.gv_daa017.Visible = true; this.gv_daa017.VisibleIndex = 21; this.gv_daa017.VisibleIndex = 22; this.gv_daa017.Width = 180; // // gv_mesStartProd @@ -941,7 +943,7 @@ this.gv_mesStartProd.OptionsColumn.AllowEdit = false; this.gv_mesStartProd.Tag = "query_a.mes_start_prod"; this.gv_mesStartProd.Visible = true; this.gv_mesStartProd.VisibleIndex = 22; this.gv_mesStartProd.VisibleIndex = 23; this.gv_mesStartProd.Width = 180; // // gv_mesEndProd @@ -954,7 +956,7 @@ this.gv_mesEndProd.OptionsColumn.AllowEdit = false; this.gv_mesEndProd.Tag = "query_a.mes_end_prod"; this.gv_mesEndProd.Visible = true; this.gv_mesEndProd.VisibleIndex = 23; this.gv_mesEndProd.VisibleIndex = 24; this.gv_mesEndProd.Width = 180; // // gridColumn21 @@ -964,7 +966,7 @@ this.gridColumn21.MinWidth = 25; this.gridColumn21.Name = "gridColumn21"; this.gridColumn21.Visible = true; this.gridColumn21.VisibleIndex = 24; this.gridColumn21.VisibleIndex = 25; this.gridColumn21.Width = 94; // // gridColumn22 @@ -974,7 +976,7 @@ this.gridColumn22.MinWidth = 25; this.gridColumn22.Name = "gridColumn22"; this.gridColumn22.Visible = true; this.gridColumn22.VisibleIndex = 25; this.gridColumn22.VisibleIndex = 26; this.gridColumn22.Width = 94; // // gridColumn23 @@ -992,7 +994,7 @@ this.gridColumn24.MinWidth = 25; this.gridColumn24.Name = "gridColumn24"; this.gridColumn24.Visible = true; this.gridColumn24.VisibleIndex = 26; this.gridColumn24.VisibleIndex = 27; this.gridColumn24.Width = 94; // // gridColumn25 @@ -1002,7 +1004,7 @@ this.gridColumn25.MinWidth = 25; this.gridColumn25.Name = "gridColumn25"; this.gridColumn25.Visible = true; this.gridColumn25.VisibleIndex = 27; this.gridColumn25.VisibleIndex = 28; this.gridColumn25.Width = 94; // // pageBar1 @@ -1319,6 +1321,7 @@ this.txt_isQiTao.Size = new System.Drawing.Size(405, 24); this.txt_isQiTao.StyleController = this.layoutMx1; this.txt_isQiTao.TabIndex = 476; this.txt_isQiTao.Tag = "readonly"; // // txt_daa018 // @@ -3741,6 +3744,16 @@ this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32); this.ucBtnPrint101.TabIndex = 0; // // gridColumn52 // this.gridColumn52.Caption = "生产类型"; this.gridColumn52.FieldName = "daa025"; this.gridColumn52.MinWidth = 25; this.gridColumn52.Name = "gridColumn52"; this.gridColumn52.Visible = true; this.gridColumn52.VisibleIndex = 9; this.gridColumn52.Width = 94; // // Frm_Womdaa // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F); @@ -4180,5 +4193,6 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40; private DevExpress.XtraEditors.ComboBoxEdit txt_daa025; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27; private DevExpress.XtraGrid.Columns.GridColumn gridColumn52; } } DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -124,32 +124,37 @@ lbGuid, txt_daa001, gridView1); SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "追溯码"); string strCodeList = ""; string strAction = ""; frm.UpdateParent += (ss, ee) => { strCodeList = ee.StringSingle; strAction = ee.Data; }; frm.ShowDialog(); if (string.IsNullOrEmpty(strCodeList)) return; try if (strAction == "print") { string rptParameter = "rpt_trace{" + "100" + "," + "" + "," + "" + "," + "" + "," + "" + "," + strCodeList + "}"; using (Form rpt = new RptPreview(rowGuid, rptParameter)) try { rpt.ShowDialog(); string rptParameter = "rpt_trace{" + "100" + "," + "" + "," + "" + "," + "" + "," + "" + "," + strCodeList + "}"; using (Form rpt = new RptPreview(rowGuid, rptParameter)) { rpt.ShowDialog(); } frm.Close(); } frm.Close(); } catch (Exception ex) { MsgHelper.ShowError(ex.Message); catch (Exception ex) { MsgHelper.ShowError(ex.Message); } } }; //这是后盖码 @@ -236,6 +241,7 @@ }; frm.ShowDialog(); }; //维护客户模版 this.btnDesign.Click += (s, e) => { EasyRptEdtShow frm = new EasyRptEdtShow(); DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -113,7 +113,6 @@ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.tips = new DevExpress.Utils.ToolTipController(this.components); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); @@ -162,8 +161,6 @@ ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); this.SuspendLayout(); // @@ -682,7 +679,6 @@ this.gcMx1.MainView = this.gvMx1; this.gcMx1.Name = "gcMx1"; this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemDateEdit1, this.repositoryItemDateEdit2, this.repositoryItemButtonEdit1, this.rptJYBZ, @@ -826,7 +822,7 @@ this.gvMx1daa016.Name = "gvMx1daa016"; this.gvMx1daa016.Tag = "edit"; this.gvMx1daa016.Visible = true; this.gvMx1daa016.VisibleIndex = 5; this.gvMx1daa016.VisibleIndex = 6; this.gvMx1daa016.Width = 78; // // repositoryItemDateEdit2 @@ -857,7 +853,7 @@ this.gvMx1daa018.Name = "gvMx1daa018"; this.gvMx1daa018.Tag = "edit"; this.gvMx1daa018.Visible = true; this.gvMx1daa018.VisibleIndex = 6; this.gvMx1daa018.VisibleIndex = 7; this.gvMx1daa018.Width = 50; // // repositoryItemDateEdit3 @@ -880,7 +876,7 @@ this.gvMx1daa008.OptionsColumn.ReadOnly = true; this.gvMx1daa008.Tag = "query_a.daa008"; this.gvMx1daa008.Visible = true; this.gvMx1daa008.VisibleIndex = 7; this.gvMx1daa008.VisibleIndex = 8; this.gvMx1daa008.Width = 50; // // gvMx1daa006 @@ -894,7 +890,7 @@ this.gvMx1daa006.OptionsColumn.ReadOnly = true; this.gvMx1daa006.Tag = "query_a.daa006"; this.gvMx1daa006.Visible = true; this.gvMx1daa006.VisibleIndex = 8; this.gvMx1daa006.VisibleIndex = 9; this.gvMx1daa006.Width = 50; // // gvMx1daa007 @@ -908,7 +904,7 @@ this.gvMx1daa007.OptionsColumn.ReadOnly = true; this.gvMx1daa007.Tag = "query_a.daa007"; this.gvMx1daa007.Visible = true; this.gvMx1daa007.VisibleIndex = 9; this.gvMx1daa007.VisibleIndex = 10; this.gvMx1daa007.Width = 50; // // gvMx1daa009 @@ -922,7 +918,7 @@ this.gvMx1daa009.OptionsColumn.ReadOnly = true; this.gvMx1daa009.Tag = "query_a.daa009"; this.gvMx1daa009.Visible = true; this.gvMx1daa009.VisibleIndex = 10; this.gvMx1daa009.VisibleIndex = 11; this.gvMx1daa009.Width = 50; // // gvMx1daa011 @@ -939,7 +935,7 @@ this.gvMx1daa011.Name = "gvMx1daa011"; this.gvMx1daa011.Tag = "yz_quantity_0_edit"; this.gvMx1daa011.Visible = true; this.gvMx1daa011.VisibleIndex = 11; this.gvMx1daa011.VisibleIndex = 12; this.gvMx1daa011.Width = 60; // // gvMx1daa012 @@ -956,7 +952,7 @@ this.gvMx1daa012.Name = "gvMx1daa012"; this.gvMx1daa012.Tag = "edit"; this.gvMx1daa012.Visible = true; this.gvMx1daa012.VisibleIndex = 12; this.gvMx1daa012.VisibleIndex = 13; this.gvMx1daa012.Width = 153; // // rptJYBZ @@ -982,7 +978,7 @@ this.gvMx1reporttime.Name = "gvMx1reporttime"; this.gvMx1reporttime.Tag = "edit"; this.gvMx1reporttime.Visible = true; this.gvMx1reporttime.VisibleIndex = 13; this.gvMx1reporttime.VisibleIndex = 14; this.gvMx1reporttime.Width = 102; // // gvMx1daa014 @@ -995,7 +991,7 @@ this.gvMx1daa014.OptionsColumn.ReadOnly = true; this.gvMx1daa014.Tag = "query_a.daa014"; this.gvMx1daa014.Visible = true; this.gvMx1daa014.VisibleIndex = 14; this.gvMx1daa014.VisibleIndex = 15; this.gvMx1daa014.Width = 51; // // gridColumn3 @@ -1016,7 +1012,7 @@ this.gvMx1fstatus.OptionsColumn.ReadOnly = true; this.gvMx1fstatus.Tag = "query_a.fstatus"; this.gvMx1fstatus.Visible = true; this.gvMx1fstatus.VisibleIndex = 15; this.gvMx1fstatus.VisibleIndex = 16; this.gvMx1fstatus.Width = 76; // // gridColumn6 @@ -1026,7 +1022,7 @@ this.gridColumn6.MinWidth = 25; this.gridColumn6.Name = "gridColumn6"; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 16; this.gridColumn6.VisibleIndex = 17; this.gridColumn6.Width = 94; // // gvMxDel @@ -1036,7 +1032,7 @@ this.gvMxDel.MinWidth = 80; this.gvMxDel.Name = "gvMxDel"; this.gvMxDel.Visible = true; this.gvMxDel.VisibleIndex = 17; this.gvMxDel.VisibleIndex = 18; this.gvMxDel.Width = 84; // // repositoryItemButtonEdit1 @@ -1062,6 +1058,8 @@ this.gridColumn7.MinWidth = 25; this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.Tag = "edit"; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 5; this.gridColumn7.Width = 94; // // repositoryItemComboBox1 @@ -1070,23 +1068,15 @@ this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.repositoryItemComboBox1.Items.AddRange(new object[] { "F-量产"}); "F-量产", "S-试产", "C-拆机返工", "W-维修返工", "G-返工", "O-外发"}); this.repositoryItemComboBox1.Name = "repositoryItemComboBox1"; this.repositoryItemComboBox1.NullText = "-请选择-"; this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; // // repositoryItemDateEdit1 // this.repositoryItemDateEdit1.AutoHeight = false; this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); this.repositoryItemDateEdit1.DisplayFormat.FormatString = "D"; this.repositoryItemDateEdit1.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; this.repositoryItemDateEdit1.EditFormat.FormatString = "D"; this.repositoryItemDateEdit1.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime; this.repositoryItemDateEdit1.MaskSettings.Set("mask", "D"); this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1"; // // picCheckBox // @@ -1155,8 +1145,6 @@ ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); this.ResumeLayout(false); @@ -1222,7 +1210,6 @@ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ; private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa014; private DevExpress.XtraGrid.Columns.GridColumn gvMx1reporttime; private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1; private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; private DevExpress.XtraGrid.Columns.GridColumn gvMxDel; private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1; DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -339,6 +339,11 @@ if (row != null) { Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString()); if (string.IsNullOrEmpty(row["daa025"].ToString())) { MsgHelper.ShowError("生产类型不能为空！"); return; } string _LineId = row["daa015"].ToString(); if (string.IsNullOrEmpty(_LineId)) { @@ -367,11 +372,11 @@ Guid = _guid, AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["caaGuid"].ToString()), LineId = row["daa015"].ToString(),//产线id Yjkgsj = (row["mesStartProd"].ToString()),//预计开工时间 Hxsj = row["daa025"].ToString(),//生产类型 Bz = row["daa009"].ToString(),//备注 Yjkgsj = (row["mesStartProd"].ToString()),//预计开工时间 Yjwgsj = row["mesEndProd"].ToString(),//预计完工时间 Pcsl = row["daa008"].ToString(),//排产数量 Yjwgsj = row["mesEndProd"].ToString()//预计完工时间 Bz = row["daa009"].ToString(),//备注 }); } } DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.Designer.cs
@@ -76,7 +76,6 @@ this.txt_isTbm = new DevExpress.XtraEditors.CheckEdit(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.Root = new DevExpress.XtraLayout.LayoutControlGroup(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -87,8 +86,9 @@ this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem(); this.tips = new DevExpress.Utils.ToolTipController(this.components); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); @@ -123,7 +123,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_isTbm.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit(); @@ -134,8 +133,9 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -283,7 +283,7 @@ // gv_isBack // this.gv_isBack.AppearanceCell.Options.UseFont = true; this.gv_isBack.Caption = "是否返工点 "; this.gv_isBack.Caption = "是否返工"; this.gv_isBack.FieldName = "isBack"; this.gv_isBack.MinWidth = 50; this.gv_isBack.Name = "gv_isBack"; @@ -313,7 +313,7 @@ this.gv_isStatus.OptionsColumn.AllowEdit = false; this.gv_isStatus.Tag = "query_a.isStatus"; this.gv_isStatus.Visible = true; this.gv_isStatus.VisibleIndex = 5; this.gv_isStatus.VisibleIndex = 6; this.gv_isStatus.Width = 94; // // gv_description @@ -326,7 +326,7 @@ this.gv_description.OptionsColumn.AllowEdit = false; this.gv_description.Tag = "query_a.description"; this.gv_description.Visible = true; this.gv_description.VisibleIndex = 6; this.gv_description.VisibleIndex = 7; this.gv_description.Width = 94; // // gv_createBy @@ -339,7 +339,7 @@ this.gv_createBy.OptionsColumn.AllowEdit = false; this.gv_createBy.Tag = "query_a.createBy"; this.gv_createBy.Visible = true; this.gv_createBy.VisibleIndex = 7; this.gv_createBy.VisibleIndex = 8; this.gv_createBy.Width = 94; // // gv_createDate @@ -352,7 +352,7 @@ this.gv_createDate.OptionsColumn.AllowEdit = false; this.gv_createDate.Tag = "query_a.createDate"; this.gv_createDate.Visible = true; this.gv_createDate.VisibleIndex = 8; this.gv_createDate.VisibleIndex = 9; this.gv_createDate.Width = 94; // // gv_lastUpdateBy @@ -365,7 +365,7 @@ this.gv_lastUpdateBy.OptionsColumn.AllowEdit = false; this.gv_lastUpdateBy.Tag = "query_a.lastUpdateBy"; this.gv_lastUpdateBy.Visible = true; this.gv_lastUpdateBy.VisibleIndex = 9; this.gv_lastUpdateBy.VisibleIndex = 10; this.gv_lastUpdateBy.Width = 94; // // gv_lastUpdateDate @@ -378,7 +378,7 @@ this.gv_lastUpdateDate.OptionsColumn.AllowEdit = false; this.gv_lastUpdateDate.Tag = "query_a.lastUpdateDate"; this.gv_lastUpdateDate.Visible = true; this.gv_lastUpdateDate.VisibleIndex = 10; this.gv_lastUpdateDate.VisibleIndex = 11; this.gv_lastUpdateDate.Width = 94; // // gridColumn2 @@ -387,6 +387,8 @@ this.gridColumn2.FieldName = "isTbm"; this.gridColumn2.MinWidth = 25; this.gridColumn2.Name = "gridColumn2"; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 5; this.gridColumn2.Width = 94; // // pageBar1 @@ -447,11 +449,10 @@ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem12, this.layoutControlItem1, this.layoutControlItem14}); this.layoutControlItem1}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(465, 377, 812, 500); this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(431, 476, 812, 500); this.layoutMx1.Root = this.Root; this.layoutMx1.Size = new System.Drawing.Size(1126, 106); this.layoutMx1.TabIndex = 0; @@ -486,7 +487,7 @@ // // txt_remark // this.txt_remark.Location = new System.Drawing.Point(360, 69); this.txt_remark.Location = new System.Drawing.Point(636, 69); this.txt_remark.Name = "txt_remark"; this.txt_remark.Properties.Appearance.Options.UseFont = true; this.txt_remark.Size = new System.Drawing.Size(200, 24); @@ -561,10 +562,10 @@ // // txt_isStatus // this.txt_isStatus.Location = new System.Drawing.Point(564, 69); this.txt_isStatus.Location = new System.Drawing.Point(840, 69); this.txt_isStatus.Name = "txt_isStatus"; this.txt_isStatus.Properties.Caption = "使用状态"; this.txt_isStatus.Size = new System.Drawing.Size(272, 24); this.txt_isStatus.Size = new System.Drawing.Size(274, 24); this.txt_isStatus.StyleController = this.layoutMx1; this.txt_isStatus.TabIndex = 237; // @@ -579,7 +580,7 @@ // // txt_isTbm // this.txt_isTbm.Location = new System.Drawing.Point(288, 114); this.txt_isTbm.Location = new System.Drawing.Point(288, 69); this.txt_isTbm.Name = "txt_isTbm"; this.txt_isTbm.Properties.Caption = "是否反托板码"; this.txt_isTbm.Size = new System.Drawing.Size(272, 24); @@ -609,18 +610,6 @@ this.layoutControlItem1.Text = "主键GUID"; this.layoutControlItem1.TextSize = new System.Drawing.Size(124, 18); // // layoutControlItem14 // this.layoutControlItem14.Control = this.txt_isTbm; this.layoutControlItem14.Location = new System.Drawing.Point(276, 102); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem14.Size = new System.Drawing.Size(276, 51); this.layoutControlItem14.Text = "是否反托板码"; this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem14.TextVisible = false; // // Root // this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True; @@ -635,8 +624,9 @@ this.layoutControlItem4, this.layoutControlItem9, this.layoutControlItem13, this.layoutControlItem5, this.layoutControlItem11, this.layoutControlItem5}); this.layoutControlItem14}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -760,28 +750,40 @@ this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem13.TextVisible = false; // // layoutControlItem5 // this.layoutControlItem5.Control = this.txt_isStatus; this.layoutControlItem5.Location = new System.Drawing.Point(828, 57); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem5.Size = new System.Drawing.Size(278, 29); this.layoutControlItem5.Text = "状态"; this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem5.TextVisible = false; // // layoutControlItem11 // this.layoutControlItem11.Control = this.txt_remark; this.layoutControlItem11.Location = new System.Drawing.Point(276, 57); this.layoutControlItem11.Location = new System.Drawing.Point(552, 57); this.layoutControlItem11.Name = "layoutControlItem11"; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem11.Size = new System.Drawing.Size(276, 29); this.layoutControlItem11.Text = "工序备注"; this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem5 // layoutControlItem14 // this.layoutControlItem5.Control = this.txt_isStatus; this.layoutControlItem5.Location = new System.Drawing.Point(552, 57); this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem5.Size = new System.Drawing.Size(276, 29); this.layoutControlItem5.Text = "状态"; this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem5.TextVisible = false; this.layoutControlItem14.Control = this.txt_isTbm; this.layoutControlItem14.Location = new System.Drawing.Point(276, 57); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem14.Size = new System.Drawing.Size(276, 29); this.layoutControlItem14.Text = "是否反托板码"; this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem14.TextVisible = false; // // Frm_WorkProcesses // @@ -825,7 +827,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_isTbm.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit(); @@ -836,8 +837,9 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit(); this.ResumeLayout(false); } @@ -892,8 +894,8 @@ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13; private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; private DevExpress.XtraEditors.CheckEdit txt_isTbm; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; } } DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkProcesses.cs
@@ -219,6 +219,7 @@ isStatus = txt_isStatus.Checked ? 1 : 0, description = txt_description.Text.Trim(), isZsm= txt_isZsm.Checked ? 1 : 0, isTbm = txt_isTbm.Checked ? 1 : 0, }; try { DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.Designer.cs
@@ -80,7 +80,6 @@ this.txt_isCheck = new DevExpress.XtraEditors.CheckEdit(); this.btnCopy = new DevExpress.XtraEditors.SimpleButton(); this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem(); @@ -95,10 +94,8 @@ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.tabMx = new DevExpress.XtraTab.XtraTabControl(); this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage(); this.gcMx1 = new DevExpress.XtraGrid.GridControl(); @@ -117,8 +114,11 @@ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit(); this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); this.picCheckBox = new System.Windows.Forms.PictureBox(); this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem(); this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem(); ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit(); this.xtraTabControl1.SuspendLayout(); this.xtraTabPage1.SuspendLayout(); @@ -159,7 +159,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isCheck.Properties)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit(); @@ -174,10 +173,8 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit(); this.tabMx.SuspendLayout(); this.tabMxPage1.SuspendLayout(); @@ -188,8 +185,11 @@ ((System.ComponentModel.ISupportInitialize)(this.rptGx)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit(); this.SuspendLayout(); // // toolBarMenu1 @@ -374,7 +374,7 @@ this.splitMx1.Panel2.Text = "Panel2"; this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True; this.splitMx1.Size = new System.Drawing.Size(775, 632); this.splitMx1.SplitterPosition = 140; this.splitMx1.SplitterPosition = 147; this.splitMx1.TabIndex = 1; // // layoutMx1 @@ -403,16 +403,16 @@ this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill; this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { this.layoutControlItem24, this.layoutControlItem2, this.layoutControlItem16, this.layoutControlItem9, this.layoutControlItem4, this.layoutControlItem7}); this.layoutControlItem7, this.layoutControlItem25}); this.layoutMx1.Location = new System.Drawing.Point(0, 0); this.layoutMx1.Name = "layoutMx1"; this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(131, 442, 812, 500); this.layoutMx1.Root = this.Root; this.layoutMx1.Size = new System.Drawing.Size(775, 140); this.layoutMx1.Size = new System.Drawing.Size(775, 147); this.layoutMx1.TabIndex = 0; this.layoutMx1.Text = "layoutControl1"; // @@ -427,40 +427,40 @@ // // txt_fMaxWeight // this.txt_fMaxWeight.Location = new System.Drawing.Point(524, 12); this.txt_fMaxWeight.Location = new System.Drawing.Point(537, 12); this.txt_fMaxWeight.Name = "txt_fMaxWeight"; this.txt_fMaxWeight.Properties.Appearance.Options.UseFont = true; this.txt_fMaxWeight.Size = new System.Drawing.Size(71, 24); this.txt_fMaxWeight.Size = new System.Drawing.Size(75, 24); this.txt_fMaxWeight.StyleController = this.layoutMx1; this.txt_fMaxWeight.TabIndex = 378; this.txt_fMaxWeight.Tag = "fissueType"; // // txt_fMinWeight // this.txt_fMinWeight.Location = new System.Drawing.Point(524, 43); this.txt_fMinWeight.Location = new System.Drawing.Point(537, 43); this.txt_fMinWeight.Name = "txt_fMinWeight"; this.txt_fMinWeight.Properties.Appearance.Options.UseFont = true; this.txt_fMinWeight.Size = new System.Drawing.Size(71, 24); this.txt_fMinWeight.Size = new System.Drawing.Size(75, 24); this.txt_fMinWeight.StyleController = this.layoutMx1; this.txt_fMinWeight.TabIndex = 370; this.txt_fMinWeight.Tag = "finishRate"; // // txt_itemName // this.txt_itemName.Location = new System.Drawing.Point(84, 74); this.txt_itemName.Location = new System.Drawing.Point(84, 75); this.txt_itemName.Name = "txt_itemName"; this.txt_itemName.Properties.Appearance.Options.UseFont = true; this.txt_itemName.Size = new System.Drawing.Size(217, 27); this.txt_itemName.Size = new System.Drawing.Size(226, 28); this.txt_itemName.StyleController = this.layoutMx1; this.txt_itemName.TabIndex = 216; this.txt_itemName.Tag = "readonly"; // // txt_itemModel // this.txt_itemModel.Location = new System.Drawing.Point(99, 108); this.txt_itemModel.Location = new System.Drawing.Point(84, 107); this.txt_itemModel.Name = "txt_itemModel"; this.txt_itemModel.Properties.Appearance.Options.UseFont = true; this.txt_itemModel.Size = new System.Drawing.Size(215, 28); this.txt_itemModel.Size = new System.Drawing.Size(226, 28); this.txt_itemModel.StyleController = this.layoutMx1; this.txt_itemModel.TabIndex = 219; this.txt_itemModel.Tag = "readonly"; @@ -470,7 +470,7 @@ this.txt_itemNo.Location = new System.Drawing.Point(84, 43); this.txt_itemNo.Name = "txt_itemNo"; this.txt_itemNo.Properties.Appearance.Options.UseFont = true; this.txt_itemNo.Size = new System.Drawing.Size(217, 24); this.txt_itemNo.Size = new System.Drawing.Size(226, 24); this.txt_itemNo.StyleController = this.layoutMx1; this.txt_itemNo.TabIndex = 213; this.txt_itemNo.Tag = "readonly"; @@ -487,20 +487,20 @@ // // txt_fCapacity // this.txt_fCapacity.Location = new System.Drawing.Point(377, 43); this.txt_fCapacity.Location = new System.Drawing.Point(386, 43); this.txt_fCapacity.Name = "txt_fCapacity"; this.txt_fCapacity.Properties.Appearance.Options.UseFont = true; this.txt_fCapacity.Size = new System.Drawing.Size(71, 24); this.txt_fCapacity.Size = new System.Drawing.Size(75, 24); this.txt_fCapacity.StyleController = this.layoutMx1; this.txt_fCapacity.TabIndex = 319; this.txt_fCapacity.Tag = "bomNo"; // // txt_remark // this.txt_remark.Location = new System.Drawing.Point(377, 105); this.txt_remark.Location = new System.Drawing.Point(386, 75); this.txt_remark.Name = "txt_remark"; this.txt_remark.Properties.Appearance.Options.UseFont = true; this.txt_remark.Size = new System.Drawing.Size(218, 24); this.txt_remark.Size = new System.Drawing.Size(226, 24); this.txt_remark.StyleController = this.layoutMx1; this.txt_remark.TabIndex = 258; this.txt_remark.Tag = "lowLimt"; @@ -508,7 +508,7 @@ // txt_fJingDu // this.txt_fJingDu.EditValue = "PSC流"; this.txt_fJingDu.Location = new System.Drawing.Point(377, 12); this.txt_fJingDu.Location = new System.Drawing.Point(386, 12); this.txt_fJingDu.Name = "txt_fJingDu"; this.txt_fJingDu.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); @@ -516,7 +516,7 @@ "PCS流", "LOT流"}); this.txt_fJingDu.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor; this.txt_fJingDu.Size = new System.Drawing.Size(71, 24); this.txt_fJingDu.Size = new System.Drawing.Size(75, 24); this.txt_fJingDu.StyleController = this.layoutMx1; this.txt_fJingDu.TabIndex = 413; // @@ -550,7 +550,7 @@ // this.txt_orgName.Location = new System.Drawing.Point(84, 12); this.txt_orgName.Name = "txt_orgName"; this.txt_orgName.Size = new System.Drawing.Size(217, 24); this.txt_orgName.Size = new System.Drawing.Size(226, 24); this.txt_orgName.StyleController = this.layoutMx1; this.txt_orgName.TabIndex = 417; this.txt_orgName.Tag = "readonly"; @@ -560,7 +560,7 @@ this.btnSelect.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question; this.btnSelect.Appearance.Options.UseBackColor = true; this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.zoom100_16x16; this.btnSelect.Location = new System.Drawing.Point(12, 105); this.btnSelect.Location = new System.Drawing.Point(314, 107); this.btnSelect.Name = "btnSelect"; this.btnSelect.Size = new System.Drawing.Size(96, 27); this.btnSelect.StyleController = this.layoutMx1; @@ -577,46 +577,46 @@ // // txt_lastUpdateBy // this.txt_lastUpdateBy.Location = new System.Drawing.Point(671, 12); this.txt_lastUpdateBy.Location = new System.Drawing.Point(688, 12); this.txt_lastUpdateBy.Name = "txt_lastUpdateBy"; this.txt_lastUpdateBy.Size = new System.Drawing.Size(71, 24); this.txt_lastUpdateBy.Size = new System.Drawing.Size(75, 24); this.txt_lastUpdateBy.StyleController = this.layoutMx1; this.txt_lastUpdateBy.TabIndex = 421; this.txt_lastUpdateBy.Tag = "readonly"; // // txt_lastUpdateDate // this.txt_lastUpdateDate.Location = new System.Drawing.Point(671, 43); this.txt_lastUpdateDate.Location = new System.Drawing.Point(688, 43); this.txt_lastUpdateDate.Name = "txt_lastUpdateDate"; this.txt_lastUpdateDate.Size = new System.Drawing.Size(71, 24); this.txt_lastUpdateDate.Size = new System.Drawing.Size(75, 24); this.txt_lastUpdateDate.StyleController = this.layoutMx1; this.txt_lastUpdateDate.TabIndex = 422; this.txt_lastUpdateDate.Tag = "readonly"; // // txt_checkBy // this.txt_checkBy.Location = new System.Drawing.Point(671, 74); this.txt_checkBy.Location = new System.Drawing.Point(688, 75); this.txt_checkBy.Name = "txt_checkBy"; this.txt_checkBy.Size = new System.Drawing.Size(71, 24); this.txt_checkBy.Size = new System.Drawing.Size(75, 24); this.txt_checkBy.StyleController = this.layoutMx1; this.txt_checkBy.TabIndex = 423; this.txt_checkBy.Tag = "readonly"; // // txt_checkDate // this.txt_checkDate.Location = new System.Drawing.Point(671, 105); this.txt_checkDate.Location = new System.Drawing.Point(688, 107); this.txt_checkDate.Name = "txt_checkDate"; this.txt_checkDate.Size = new System.Drawing.Size(71, 24); this.txt_checkDate.Size = new System.Drawing.Size(75, 24); this.txt_checkDate.StyleController = this.layoutMx1; this.txt_checkDate.TabIndex = 424; this.txt_checkDate.Tag = "readonly"; // // txt_isCheck // this.txt_isCheck.Location = new System.Drawing.Point(452, 74); this.txt_isCheck.Location = new System.Drawing.Point(465, 107); this.txt_isCheck.Name = "txt_isCheck"; this.txt_isCheck.Properties.Caption = "审核状态"; this.txt_isCheck.Size = new System.Drawing.Size(143, 24); this.txt_isCheck.Size = new System.Drawing.Size(147, 24); this.txt_isCheck.StyleController = this.layoutMx1; this.txt_isCheck.TabIndex = 425; this.txt_isCheck.Tag = "readonly"; @@ -626,9 +626,9 @@ this.btnCopy.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary; this.btnCopy.Appearance.Options.UseBackColor = true; this.btnCopy.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.copy_16x16; this.btnCopy.Location = new System.Drawing.Point(158, 105); this.btnCopy.Location = new System.Drawing.Point(465, 107); this.btnCopy.Name = "btnCopy"; this.btnCopy.Size = new System.Drawing.Size(143, 27); this.btnCopy.Size = new System.Drawing.Size(147, 27); this.btnCopy.StyleController = this.layoutMx1; this.btnCopy.TabIndex = 426; this.btnCopy.Text = "复制到其它产品"; @@ -644,17 +644,6 @@ this.layoutControlItem24.Text = "lbGuid"; this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem24.TextVisible = false; // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_itemModel; this.layoutControlItem2.Location = new System.Drawing.Point(0, 96); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem2.Size = new System.Drawing.Size(306, 32); this.layoutControlItem2.Text = "规格型号"; this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18); // // layoutControlItem16 // @@ -716,12 +705,12 @@ this.layoutControlItem23, this.layoutControlItem22, this.layoutControlItem21, this.layoutControlItem15, this.layoutControlItem10, this.layoutControlItem25, this.layoutControlItem12, this.layoutControlItem3, this.layoutControlItem8}); this.layoutControlItem8, this.layoutControlItem12, this.layoutControlItem10, this.layoutControlItem15, this.layoutControlItem2}); this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table; this.Root.Name = "Root"; columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent; @@ -753,17 +742,17 @@ rowDefinition2, rowDefinition3, rowDefinition4}); this.Root.Size = new System.Drawing.Size(754, 144); this.Root.Size = new System.Drawing.Size(775, 147); this.Root.TextVisible = false; // // layoutControlItem1 // this.layoutControlItem1.Control = this.txt_itemName; this.layoutControlItem1.Location = new System.Drawing.Point(0, 62); this.layoutControlItem1.Location = new System.Drawing.Point(0, 63); this.layoutControlItem1.Name = "layoutControlItem1"; this.layoutControlItem1.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem1.Size = new System.Drawing.Size(293, 31); this.layoutControlItem1.Size = new System.Drawing.Size(302, 32); this.layoutControlItem1.Text = "物料名称"; this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18); // @@ -774,7 +763,7 @@ this.layoutControlItem5.Name = "layoutControlItem5"; this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem5.Size = new System.Drawing.Size(293, 31); this.layoutControlItem5.Size = new System.Drawing.Size(302, 32); this.layoutControlItem5.Text = "物料编码"; this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18); // @@ -784,7 +773,7 @@ this.layoutControlItem14.Location = new System.Drawing.Point(0, 0); this.layoutControlItem14.Name = "layoutControlItem14"; this.layoutControlItem14.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem14.Size = new System.Drawing.Size(293, 31); this.layoutControlItem14.Size = new System.Drawing.Size(302, 31); this.layoutControlItem14.Text = "使用组织"; this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18); // @@ -792,116 +781,88 @@ // this.layoutControlItem20.Control = this.txt_lastUpdateBy; this.layoutControlItem20.CustomizationFormText = "更新人员"; this.layoutControlItem20.Location = new System.Drawing.Point(587, 0); this.layoutControlItem20.Location = new System.Drawing.Point(604, 0); this.layoutControlItem20.Name = "layoutControlItem20"; this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 4; this.layoutControlItem20.Size = new System.Drawing.Size(147, 31); this.layoutControlItem20.Size = new System.Drawing.Size(151, 31); this.layoutControlItem20.Text = "更新人员"; this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem18 // this.layoutControlItem18.Control = this.txt_fMaxWeight; this.layoutControlItem18.Location = new System.Drawing.Point(440, 0); this.layoutControlItem18.Location = new System.Drawing.Point(453, 0); this.layoutControlItem18.Name = "layoutControlItem18"; this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem18.Size = new System.Drawing.Size(147, 31); this.layoutControlItem18.Size = new System.Drawing.Size(151, 31); this.layoutControlItem18.Text = "重量上限"; this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem19 // this.layoutControlItem19.Control = this.txt_fMinWeight; this.layoutControlItem19.Location = new System.Drawing.Point(440, 31); this.layoutControlItem19.Location = new System.Drawing.Point(453, 31); this.layoutControlItem19.Name = "layoutControlItem19"; this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem19.Size = new System.Drawing.Size(147, 31); this.layoutControlItem19.Size = new System.Drawing.Size(151, 32); this.layoutControlItem19.Text = "重量下限"; this.layoutControlItem19.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem23 // this.layoutControlItem23.Control = this.txt_checkDate; this.layoutControlItem23.Location = new System.Drawing.Point(587, 93); this.layoutControlItem23.Location = new System.Drawing.Point(604, 95); this.layoutControlItem23.Name = "layoutControlItem23"; this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 4; this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem23.Size = new System.Drawing.Size(147, 31); this.layoutControlItem23.Size = new System.Drawing.Size(151, 32); this.layoutControlItem23.Text = "审核时间"; this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem22 // this.layoutControlItem22.Control = this.txt_checkBy; this.layoutControlItem22.Location = new System.Drawing.Point(587, 62); this.layoutControlItem22.Location = new System.Drawing.Point(604, 63); this.layoutControlItem22.Name = "layoutControlItem22"; this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 4; this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem22.Size = new System.Drawing.Size(147, 31); this.layoutControlItem22.Size = new System.Drawing.Size(151, 32); this.layoutControlItem22.Text = "审核人员"; this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem21 // this.layoutControlItem21.Control = this.txt_lastUpdateDate; this.layoutControlItem21.Location = new System.Drawing.Point(587, 31); this.layoutControlItem21.Location = new System.Drawing.Point(604, 31); this.layoutControlItem21.Name = "layoutControlItem21"; this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 4; this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem21.Size = new System.Drawing.Size(147, 31); this.layoutControlItem21.Size = new System.Drawing.Size(151, 32); this.layoutControlItem21.Text = "更新时间"; this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem15 // layoutControlItem3 // this.layoutControlItem15.Control = this.btnSelect; this.layoutControlItem15.Location = new System.Drawing.Point(0, 93); this.layoutControlItem15.MaxSize = new System.Drawing.Size(100, 31); this.layoutControlItem15.MinSize = new System.Drawing.Size(90, 31); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem15.Size = new System.Drawing.Size(146, 31); this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem15.Text = "选择工序"; this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem15.TextVisible = false; this.layoutControlItem3.Control = this.txt_fJingDu; this.layoutControlItem3.Location = new System.Drawing.Point(302, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem3.Size = new System.Drawing.Size(151, 31); this.layoutControlItem3.Text = "管理精度"; this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem10 // layoutControlItem8 // this.layoutControlItem10.Control = this.btnCopy; this.layoutControlItem10.Location = new System.Drawing.Point(146, 93); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem10.Size = new System.Drawing.Size(147, 31); this.layoutControlItem10.Text = "复制"; this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem10.TextVisible = false; // // layoutControlItem25 // this.layoutControlItem25.Control = this.txt_isCheck; this.layoutControlItem25.Location = new System.Drawing.Point(440, 62); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem25.Size = new System.Drawing.Size(147, 31); this.layoutControlItem25.Text = "审核状态"; this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem25.TextVisible = false; // // layoutControlItem12 // this.layoutControlItem12.Control = this.txt_remark; this.layoutControlItem12.Location = new System.Drawing.Point(293, 93); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem12.Size = new System.Drawing.Size(294, 31); this.layoutControlItem12.Text = "流程描述"; this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); this.layoutControlItem8.Control = this.txt_fCapacity; this.layoutControlItem8.CustomizationFormText = "标准产能"; this.layoutControlItem8.Location = new System.Drawing.Point(302, 31); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem8.Size = new System.Drawing.Size(151, 32); this.layoutControlItem8.Text = "标准产能"; this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); // // tabMx // @@ -909,7 +870,7 @@ this.tabMx.Location = new System.Drawing.Point(0, 0); this.tabMx.Name = "tabMx"; this.tabMx.SelectedTabPage = this.tabMxPage1; this.tabMx.Size = new System.Drawing.Size(775, 480); this.tabMx.Size = new System.Drawing.Size(775, 473); this.tabMx.TabIndex = 4; this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabMxPage1}); @@ -918,7 +879,7 @@ // this.tabMxPage1.Controls.Add(this.gcMx1); this.tabMxPage1.Name = "tabMxPage1"; this.tabMxPage1.Size = new System.Drawing.Size(773, 448); this.tabMxPage1.Size = new System.Drawing.Size(773, 441); this.tabMxPage1.Text = "工序信息"; // // gcMx1 @@ -935,7 +896,7 @@ this.repositoryItemComboBox1, this.repositoryItemComboBox2, this.rptGx}); this.gcMx1.Size = new System.Drawing.Size(773, 448); this.gcMx1.Size = new System.Drawing.Size(773, 441); this.gcMx1.TabIndex = 0; this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gvMx1}); @@ -1146,27 +1107,67 @@ this.picCheckBox.TabStop = false; this.picCheckBox.Visible = false; // // layoutControlItem3 // layoutControlItem25 // this.layoutControlItem3.Control = this.txt_fJingDu; this.layoutControlItem3.Location = new System.Drawing.Point(293, 0); this.layoutControlItem3.Name = "layoutControlItem3"; this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem3.Size = new System.Drawing.Size(147, 31); this.layoutControlItem3.Text = "管理精度"; this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18); this.layoutControlItem25.Control = this.txt_isCheck; this.layoutControlItem25.Location = new System.Drawing.Point(453, 95); this.layoutControlItem25.Name = "layoutControlItem25"; this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem25.Size = new System.Drawing.Size(151, 32); this.layoutControlItem25.Text = "审核状态"; this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem25.TextVisible = false; // // layoutControlItem8 // layoutControlItem12 // this.layoutControlItem8.Control = this.txt_fCapacity; this.layoutControlItem8.CustomizationFormText = "标准产能"; this.layoutControlItem8.Location = new System.Drawing.Point(293, 31); this.layoutControlItem8.Name = "layoutControlItem8"; this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1; this.layoutControlItem8.Size = new System.Drawing.Size(147, 31); this.layoutControlItem8.Text = "标准产能"; this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18); this.layoutControlItem12.Control = this.txt_remark; this.layoutControlItem12.Location = new System.Drawing.Point(302, 63); this.layoutControlItem12.Name = "layoutControlItem12"; this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2; this.layoutControlItem12.Size = new System.Drawing.Size(302, 32); this.layoutControlItem12.Text = "流程描述"; this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18); // // layoutControlItem10 // this.layoutControlItem10.Control = this.btnCopy; this.layoutControlItem10.Location = new System.Drawing.Point(453, 95); this.layoutControlItem10.Name = "layoutControlItem10"; this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3; this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem10.Size = new System.Drawing.Size(151, 32); this.layoutControlItem10.Text = "复制"; this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem10.TextVisible = false; // // layoutControlItem15 // this.layoutControlItem15.Control = this.btnSelect; this.layoutControlItem15.Location = new System.Drawing.Point(302, 95); this.layoutControlItem15.MaxSize = new System.Drawing.Size(100, 31); this.layoutControlItem15.MinSize = new System.Drawing.Size(90, 31); this.layoutControlItem15.Name = "layoutControlItem15"; this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2; this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem15.Size = new System.Drawing.Size(151, 32); this.layoutControlItem15.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom; this.layoutControlItem15.Text = "选择工序"; this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0); this.layoutControlItem15.TextVisible = false; // // layoutControlItem2 // this.layoutControlItem2.Control = this.txt_itemModel; this.layoutControlItem2.Location = new System.Drawing.Point(0, 95); this.layoutControlItem2.Name = "layoutControlItem2"; this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2; this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3; this.layoutControlItem2.Size = new System.Drawing.Size(302, 32); this.layoutControlItem2.Text = "规格型号"; this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18); // // Frm_WorkTechnique // @@ -1218,7 +1219,6 @@ ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.txt_isCheck.Properties)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit(); @@ -1233,10 +1233,8 @@ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit(); this.tabMx.ResumeLayout(false); this.tabMxPage1.ResumeLayout(false); @@ -1247,8 +1245,11 @@ ((System.ComponentModel.ISupportInitialize)(this.rptGx)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit(); this.ResumeLayout(false); } @@ -1291,7 +1292,6 @@ private DevExpress.XtraEditors.DateEdit txt_fBegDate; private DevExpress.XtraEditors.DateEdit txt_fEndDate; private DevExpress.XtraEditors.TextEdit txt_orgName; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14; @@ -1322,11 +1322,12 @@ private DevExpress.XtraEditors.SimpleButton btnCopy; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15; private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2; } } DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
@@ -306,7 +306,7 @@ { guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建 // fType = txt_fType.Text.Trim(), fType = "F-量产", //F - 量产S - 试作 fType = "F-量产", fBegDate = txt_fBegDate.Text.Trim(), fEndDate = txt_fEndDate.Text.Trim(), fJingDu = txt_fJingDu.Text.Trim(),
